From 07999c566178e0804483a8fa7c716dec4bbaee3c Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <oberling@deroberling.de>
Date: Mon, 15 Apr 2013 17:33:05 +0200
Subject: [PATCH 1/4] changed bootstrap theme to support multiple languages

---
 htdocs/themes/bootstrap/views/list.php      | 14 +++++------
 htdocs/themes/bootstrap/views/trends.php    | 16 ++++++------
 htdocs/themes/bootstrap/views/view/view.php | 28 ++++++++++-----------
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/htdocs/themes/bootstrap/views/list.php b/htdocs/themes/bootstrap/views/list.php
index 4646f42..ff35b19 100644
--- a/htdocs/themes/bootstrap/views/list.php
+++ b/htdocs/themes/bootstrap/views/list.php
@@ -1,6 +1,6 @@
 <?php $this->load->view('defaults/header');?>
 	<div class="page-header">
-		<h1>Recent Pastes <a href="<?php echo site_url('lists/rss'); ?>">
+		<h1><?php echo lang('paste_recent'); ?> <a href="<?php echo site_url('lists/rss'); ?>">
 			<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJDSURBVHjajJJNSBRhGMd/887MzrQxRSLbFuYhoUhEKsMo8paHUKFLdBDrUIdunvq4RdClOq8Hb0FBSAVCUhFR1CGD/MrIJYqs1kLUXd382N356plZFOrUO/MMz/vO83+e93n+f+1zF+kQBoOQNLBJg0CTj7z/rvWjGbEOIwKp9O7WkhtQc/wMWrlIkP8Kc1lMS8eyFHpkpo5SgWCCVO7Z5JARhuz1Qg29fh87u6/9VWL1/SPc4Qy6n8c0FehiXin6dcCQaylDMhqGz8ydS2hKkmxNkWxowWnuBLHK6G2C8X6UJkBlxUmNqLYyNbzF74QLDrgFgh9LLE0NsPKxjW1Hz2EdPIubsOFdH2HgbwAlC4S19dT13o+3pS+vcSfvUcq9YnbwA6muW9hNpym/FWBxfh0CZkKGkPBZeJFhcWQAu6EN52QGZ/8prEKW+cdXq0039UiLXhUYzdjebOJQQI30UXp6mZn+Dtam32Afu0iyrgUvN0r+ZQbr8HncSpUVJfwRhBWC0hyGV8CxXBL5SWYf9sYBidYLIG2V87/ifVjTWAX6AlxeK2C0X8e58hOr/Qa2XJ3iLMWxB1h72tHs7bgryzHAN2o2gJorTrLxRHVazd0o4TXiyV2Yjs90uzauGvvppmqcLjwmbZ3V7BO2HOrBnbgrQRqWUgTZ5+Snx4WeKfzCCrmb3axODKNH+vvUyWjqyK4DiKQ0eXSpFsgVvLJQWpH+xSpr4otg/HI0TR/t97cxTUS+QxIMRTLi/9ZYJPI/AgwAoc3W7ZrqR2IAAAAASUVORK5CYII=" alt="rss" title="RSS" /></a>
 		</h1>
 	</div>
@@ -10,11 +10,11 @@
 			<table class="recent table table-striped table-bordered">
 				<thead>
 					<tr>
-						<th class="title">Title</th>
-						<th class="name">Name</th>
-						<th class="lang">Language</th>
+						<th class="title"><?php echo lang('table_title'); ?></th>
+						<th class="name"><?php echo lang('table_name'); ?></th>
+						<th class="lang"><?php echo lang('table_lang'); ?></th>
 						<th class="hidden">UNIX</th>
-						<th class="time">When</th>
+						<th class="time"><?php echo lang('table_time'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -27,14 +27,14 @@
 			<td><?php echo $paste['name']; ?></td>
 			<td><?php echo $paste['lang']; ?></td>
 			<td class="hidden"><?php echo $paste['created']; ?></td>
-			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> ago.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> <?php echo lang('paste_ago'); ?>.</td>
 		</tr>
 
 		<?php }?>
 				</tbody>
 			</table> 
 		<?php } else { ?>
-			<p>There have been no pastes :(</p>
+			<p><?php echo lang('paste_missing'); ?> :(</p>
 		<?php }?>
 <?php echo $pages; ?>
 <div class="spacer"></div>
diff --git a/htdocs/themes/bootstrap/views/trends.php b/htdocs/themes/bootstrap/views/trends.php
index 58dd7e2..22b5cc1 100644
--- a/htdocs/themes/bootstrap/views/trends.php
+++ b/htdocs/themes/bootstrap/views/trends.php
@@ -1,6 +1,6 @@
 <?php $this->load->view('defaults/header');?>
 	<div class="page-header">
-		<h1>Trending Pastes</h1>
+		<h1><?php echo lang('paste_trending'); ?></h1>
 	</div>
 
 		<?php
@@ -8,12 +8,12 @@
 			<table class="recent table table-striped table-bordered">
 				<thead>
 					<tr>
-						<th class="title">Title</th>
-						<th class="name">Name</th>
-						<th class="lang">Language</th>
-						<th class="hits">Hits</th>
+						<th class="title"><?php echo lang('table_title'); ?></th>
+						<th class="name"><?php echo lang('table_name'); ?></th>
+						<th class="lang"><?php echo lang('table_lang'); ?></th>
+						<th class="hits"><?php echo lang('table_hits'); ?></th>
 						<th class="hidden">UNIX</th>
-						<th class="time">When</th>
+						<th class="time"><?php echo lang('table_time'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
@@ -25,14 +25,14 @@
 			<td><?php echo $paste['lang']; ?></td>
 			<td class="hidden"><?php echo $paste['created']; ?></td>
 			<td><?php echo number_format($paste['hits'], 0, '.', "'"); ?></td>
-			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> ago.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> <?php echo lang('paste_ago'); ?>.</td>
 		</tr>
 
 		<?php }?>
 				</tbody>
 			</table>
 		<?php } else { ?>
-			<p>There have been no pastes :(</p>
+			<p><?php echo lang('paste_missing'); ?> :(</p>
 		<?php }?>
 <?php echo $pages; ?>
 <div class="spacer"></div>
diff --git a/htdocs/themes/bootstrap/views/view/view.php b/htdocs/themes/bootstrap/views/view/view.php
index 7e31798..d9adf41 100644
--- a/htdocs/themes/bootstrap/views/view/view.php
+++ b/htdocs/themes/bootstrap/views/view/view.php
@@ -12,14 +12,14 @@
 			</div>
 			<div class="row">
 				<div class="span12">
-					<div class="detail by">By <?php echo $name; ?>, <?php $p = explode(',', timespan($created, time())); echo $p[0]?> ago, written in <?php echo $lang; ?>.</div>
-					<?php if(isset($inreply)){?><div class="detail by">This paste is a reply to <a href="<?php echo $inreply['url']?>"><?php echo $inreply['title']; ?></a> by <?php echo $inreply['name']; ?></div><?php }?>
-					<div class="detail"><span class="item">URL </span><a href="<?php echo $url; ?>"><?php echo $url; ?></a></div>
+					<div class="detail by"><?php echo lang('paste_from'); ?> <?php echo $name; ?>, <?php $p = explode(',', timespan($created, time())); echo $p[0]?> <?php echo lang('paste_ago'); ?>, <?php echo lang('paste_writtenin'); ?> <?php echo $lang; ?>.</div>
+					<?php if(isset($inreply)){?><div class="detail by"><?php echo ('paste_isareply'); ?> <a href="<?php echo $inreply['url']?>"><?php echo $inreply['title']; ?></a> <?php echo lang('paste_from'); ?> <?php echo $inreply['name']; ?></div><?php }?>
+					<div class="detail"><span class="item"><?php echo lang('paste_url'); ?> </span><a href="<?php echo $url; ?>"><?php echo $url; ?></a></div>
 					<?php if(!empty($snipurl)){?>
-						<div class="detail"><div class="item">Shorturl </div><a href="<?php echo $snipurl; ?>"><?php echo htmlspecialchars($snipurl) ?></a></div>
+						<div class="detail"><div class="item"><?php echo lang('paste_shorturl');?> </div><a href="<?php echo $snipurl; ?>"><?php echo htmlspecialchars($snipurl) ?></a></div>
 					<?php }?>
-					<div class="detail"><span class="item">Embed </span><input id="embed_field" type="text" value="<?php echo htmlspecialchars('<iframe src="' . site_url('view/embed/' . $pid) . '" style="border:none;width:100%"></iframe>'); ?>" /></div>
-					<div class="detail"><a class="control" href="<?php echo site_url("view/download/".$pid); ?>">Download Paste</a> or <a class="control" href="<?php echo site_url("view/raw/".$pid); ?>">View Raw</a> &mdash; <a href="#" class="expand control">Expand paste</a> to full width of browser</div>
+					<div class="detail"><span class="item"><?php echo lang('paste_embed'); ?> </span><input id="embed_field" type="text" value="<?php echo htmlspecialchars('<iframe src="' . site_url('view/embed/' . $pid) . '" style="border:none;width:100%"></iframe>'); ?>" /></div>
+					<div class="detail"><a class="control" href="<?php echo site_url("view/download/".$pid); ?>"><?php echo lang('paste_download'); ?></a> <?php echo lang('paste_or'); ?> <a class="control" href="<?php echo site_url("view/raw/".$pid); ?>"><?php echo lang('paste_viewraw'); ?></a> &mdash; <a href="#" class="expand control"><?php echo lang('paste_expand'); ?></a> <?php echo lang('paste_fullwidth'); ?></div>
 				</div>
 			</div>
 		</div>
@@ -43,16 +43,16 @@ function checkNum($num){
 if(isset($replies) and !empty($replies)){
 	$n = 1;
 ?>
-	<h1>Replies to <?php echo $title; ?> <a href="<?php echo site_url('view/rss/' . $pid); ?>"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJDSURBVHjajJJNSBRhGMd/887MzrQxRSLbFuYhoUhEKsMo8paHUKFLdBDrUIdunvq4RdClOq8Hb0FBSAVCUhFR1CGD/MrIJYqs1kLUXd382N356plZFOrUO/MMz/vO83+e93n+f+1zF+kQBoOQNLBJg0CTj7z/rvWjGbEOIwKp9O7WkhtQc/wMWrlIkP8Kc1lMS8eyFHpkpo5SgWCCVO7Z5JARhuz1Qg29fh87u6/9VWL1/SPc4Qy6n8c0FehiXin6dcCQaylDMhqGz8ydS2hKkmxNkWxowWnuBLHK6G2C8X6UJkBlxUmNqLYyNbzF74QLDrgFgh9LLE0NsPKxjW1Hz2EdPIubsOFdH2HgbwAlC4S19dT13o+3pS+vcSfvUcq9YnbwA6muW9hNpym/FWBxfh0CZkKGkPBZeJFhcWQAu6EN52QGZ/8prEKW+cdXq0039UiLXhUYzdjebOJQQI30UXp6mZn+Dtam32Afu0iyrgUvN0r+ZQbr8HncSpUVJfwRhBWC0hyGV8CxXBL5SWYf9sYBidYLIG2V87/ifVjTWAX6AlxeK2C0X8e58hOr/Qa2XJ3iLMWxB1h72tHs7bgryzHAN2o2gJorTrLxRHVazd0o4TXiyV2Yjs90uzauGvvppmqcLjwmbZ3V7BO2HOrBnbgrQRqWUgTZ5+Snx4WeKfzCCrmb3axODKNH+vvUyWjqyK4DiKQ0eXSpFsgVvLJQWpH+xSpr4otg/HI0TR/t97cxTUS+QxIMRTLi/9ZYJPI/AgwAoc3W7ZrqR2IAAAAASUVORK5CYII=" alt="rss" title="RSS" /></a></h1>
+	<h1><?php echo lang('paste_replies'); ?> <?php echo $title; ?> <a href="<?php echo site_url('view/rss/' . $pid); ?>"><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJDSURBVHjajJJNSBRhGMd/887MzrQxRSLbFuYhoUhEKsMo8paHUKFLdBDrUIdunvq4RdClOq8Hb0FBSAVCUhFR1CGD/MrIJYqs1kLUXd382N356plZFOrUO/MMz/vO83+e93n+f+1zF+kQBoOQNLBJg0CTj7z/rvWjGbEOIwKp9O7WkhtQc/wMWrlIkP8Kc1lMS8eyFHpkpo5SgWCCVO7Z5JARhuz1Qg29fh87u6/9VWL1/SPc4Qy6n8c0FehiXin6dcCQaylDMhqGz8ydS2hKkmxNkWxowWnuBLHK6G2C8X6UJkBlxUmNqLYyNbzF74QLDrgFgh9LLE0NsPKxjW1Hz2EdPIubsOFdH2HgbwAlC4S19dT13o+3pS+vcSfvUcq9YnbwA6muW9hNpym/FWBxfh0CZkKGkPBZeJFhcWQAu6EN52QGZ/8prEKW+cdXq0039UiLXhUYzdjebOJQQI30UXp6mZn+Dtam32Afu0iyrgUvN0r+ZQbr8HncSpUVJfwRhBWC0hyGV8CxXBL5SWYf9sYBidYLIG2V87/ifVjTWAX6AlxeK2C0X8e58hOr/Qa2XJ3iLMWxB1h72tHs7bgryzHAN2o2gJorTrLxRHVazd0o4TXiyV2Yjs90uzauGvvppmqcLjwmbZ3V7BO2HOrBnbgrQRqWUgTZ5+Snx4WeKfzCCrmb3axODKNH+vvUyWjqyK4DiKQ0eXSpFsgVvLJQWpH+xSpr4otg/HI0TR/t97cxTUS+QxIMRTLi/9ZYJPI/AgwAoc3W7ZrqR2IAAAAASUVORK5CYII=" alt="rss" title="RSS" /></a></h1>
 
 	<table cellpadding="0" cellspacing="0" border="0" class="recent table table-striped table-bordered">
 		<thead>
 			<tr>
-				<th class="title">Title</th>
-				<th class="name">Name</th>
-				<th class="lang">Language</th>
+				<th class="title"><?php echo lang('table_title'); ?></th>
+				<th class="name"><?php echo lang('table_name'); ?></th>
+				<th class="lang"><?php echo lang('table_lang'); ?></th>
 				<th class="hidden">UNIX</th>
-				<th class="time">When</th>
+				<th class="time"><?php echo lang('table_time'); ?></th>
 			</tr>
 		</thead>
 		<tbody>
@@ -70,7 +70,7 @@ if(isset($replies) and !empty($replies)){
 			<td><?php echo $reply['name']; ?></td>
 			<td><?php echo $reply['lang']; ?></td>
 			<td class="hidden"><?php echo $reply['created']; ?></td>
-			<td><?php $p = explode(",", timespan($reply['created'], time())); echo $p[0];?> ago.</td>
+			<td><?php $p = explode(",", timespan($reply['created'], time())); echo $p[0];?> <?php echo lang('paste_ago'); ?>.</td>
 		</tr>
 
 	<?php }?>
@@ -80,8 +80,8 @@ if(isset($replies) and !empty($replies)){
 <?php echo $pages;
 }
 
-	$reply_form['page']['title'] = "Reply to \"$title\"";
-	$reply_form['page']['instructions'] = 'Here you can reply to the paste above';
+	$reply_form['page']['title'] = lang('paste_replyto') . ' "' . $title . '"';
+	$reply_form['page']['instructions'] = lang('paste_replyto_desc');
 	$this->load->view('defaults/paste_form', $reply_form); ?>
 
 

From f732fdb105f9bf6f0029cc2d5185e44344062223 Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <oberling@deroberling.de>
Date: Mon, 15 Apr 2013 17:33:47 +0200
Subject: [PATCH 2/4] added german language to README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e075d82..21ca2a4 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ Create you own theme. See doc/CREATING_THEMES.md
 $config['language'] = 'english';
 ```
 
-You can choose between english and swissgerman ;)
+You can choose between english, german and swissgerman ;)
 
 Help translating Stikked into your language! See doc/TRANSLATING_STIKKED.md
 

From 80fc7c525896e27be8580141e868fff22b8b173c Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <oberling@deroberling.de>
Date: Mon, 15 Apr 2013 20:40:52 +0200
Subject: [PATCH 3/4] also applied the language configurability to the defaults
 of the bootstrap theme

---
 .../views/defaults/footer_message.php         |  2 +-
 .../bootstrap/views/defaults/header.php       | 10 +++----
 .../bootstrap/views/defaults/paste_form.php   | 30 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/htdocs/themes/bootstrap/views/defaults/footer_message.php b/htdocs/themes/bootstrap/views/defaults/footer_message.php
index 815e14f..78db813 100644
--- a/htdocs/themes/bootstrap/views/defaults/footer_message.php
+++ b/htdocs/themes/bootstrap/views/defaults/footer_message.php
@@ -1,3 +1,3 @@
 <footer class="footer">
-	Powered By <a href="https://github.com/claudehohl/Stikked">Stikked</a>
+	<?php echo lang('powered_by'); ?> <a href="https://github.com/claudehohl/Stikked">Stikked</a>
 </footer>
diff --git a/htdocs/themes/bootstrap/views/defaults/header.php b/htdocs/themes/bootstrap/views/defaults/header.php
index bc84fb6..eacfedd 100644
--- a/htdocs/themes/bootstrap/views/defaults/header.php
+++ b/htdocs/themes/bootstrap/views/defaults/header.php
@@ -53,13 +53,13 @@ $this->carabiner->display('css');
 						<div class="nav-collapse">
 							<ul class="nav">
 								<?php $l = $this->uri->segment(1)?>
-								<li><a <?php if($l == ""){ echo 'class="active"'; }?> href="<?php echo base_url()?>" title="Create A New Paste">Create</a></li>
+								<li><a <?php if($l == ""){ echo 'class="active"'; }?> href="<?php echo base_url()?>" title="<?php echo lang('menu_create_title'); ?>"><?php echo lang('menu_create'); ?></a></li>
 <?php if(!$this->config->item('private_only')){ ?>
-								<li><a <?php if($l == "lists" || $l == "view" and $this->uri->segment(2) != "options"){ echo 'class="active"'; }?> href="<?php echo site_url('lists'); ?>" title="Recent Pastes">Recent</a></li>
-                                <li><a <?php if($l == "trends"){ echo 'class="active"'; }?> href="<?php echo site_url('trends'); ?>" title="Trending Pastes">Trending</a></li>
+								<li><a <?php if($l == "lists" || $l == "view" and $this->uri->segment(2) != "options"){ echo 'class="active"'; }?> href="<?php echo site_url('lists'); ?>" title="<?php echo lang('menu_recent_title'); ?>"><?php echo lang('menu_recent'); ?></a></li>
+								<li><a <?php if($l == "trends"){ echo 'class="active"'; }?> href="<?php echo site_url('trends'); ?>" title="<?php echo lang('menu_trending_title'); ?>"><?php echo lang('menu_trending'); ?></a></li>
 <?php } ?>
-								<li><a  <?php if($l == "api"){ echo 'class="active"'; }?> href="<?php echo site_url('api'); ?>" title="API">API</a></li>
-								<li><a  <?php if($l == "about"){ echo 'class="active"'; }?> href="<?php echo site_url('about'); ?>" title="About">About</a></li>
+								<li><a  <?php if($l == "api"){ echo 'class="active"'; }?> href="<?php echo site_url('api'); ?>" title="<?php echo lang('menu_api'); ?>"><?php echo lang('menu_api'); ?></a></li>
+								<li><a  <?php if($l == "about"){ echo 'class="active"'; }?> href="<?php echo site_url('about'); ?>" title="<?php echo lang('menu_about'); ?>"><?php echo lang('menu_about'); ?></a></li>
 							</ul>
 						</div>
 					</div>
diff --git a/htdocs/themes/bootstrap/views/defaults/paste_form.php b/htdocs/themes/bootstrap/views/defaults/paste_form.php
index 37351de..aae92dd 100644
--- a/htdocs/themes/bootstrap/views/defaults/paste_form.php
+++ b/htdocs/themes/bootstrap/views/defaults/paste_form.php
@@ -5,7 +5,7 @@
 	<div class="span12">
 		<div class="page-header">
 			<h1><?php if(!isset($page['title'])){ ?>
-			Create a new paste
+			<?php echo lang('paste_create_new'); ?>
 			<?php } else { ?>
 				<?php echo $page['title']; ?>
 			<?php } ?>
@@ -18,7 +18,7 @@
 		<form action="<?php echo base_url(); ?>" method="post" class="form-vertical well">
 			<div class="row">
 				<div class="span3">
-					<label for="name">Author
+					<label for="name"><?php echo lang('paste_author'); ?>
 					</label>
 					
 					<?php $set = array('name' => 'name', 'id' => 'name', 'class' => 'span3', 'value' => $name_set, 'maxlength' => '32', 'tabindex' => '1');
@@ -27,7 +27,7 @@
 				
 				<div class="span3">
 					<label for="title">
-						Title
+						<?php echo lang('paste_title'); ?>
 					</label>
 					
 					<input value="<?php if(isset($title_set)){ echo $title_set; }?>" class="span3" type="text" id="title" name="title" tabindex="2" maxlength="32" />
@@ -35,7 +35,7 @@
 		
 				<div class="span3">
 					<label for="lang">
-						Language
+						<?php echo lang('paste_lang'); ?>
 					</label>
 					<?php $lang_extra = 'id="lang" class="select span3" tabindex="3"'; echo form_dropdown('lang', $languages, $lang_set, $lang_extra); ?>
 				</div>
@@ -43,8 +43,8 @@
 			
 			<div class="row">
 				<div class="span12">
-					<label for="paste">Your paste
-						<span class="instruction">Paste your paste here</span>
+					<label for="paste"><?php echo lang('paste_yourpaste'); ?>
+						<span class="instruction"><?php echo lang('paste_shorturl_desc'); ?></span>
 					</label>
 				</div>
 			</div>
@@ -57,19 +57,19 @@
 			<div class="row">
 				<div class="span8">
 					<div class="control-group">
-						<label class="control-label" for="optionsCheckbox">Create Shorturl</label>
+						<label class="control-label" for="optionsCheckbox"><?php echo long('paste_shorturl'); ?></label>
 						<div class="controls">
 							<label class="checkbox">
 								<?php
 									$set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set);
 									echo form_checkbox($set);
 								?>
-								Create a shorter url that redirects to your paste?
+								<?php echo long('paste_shorturl_desc'); ?>
 							</label>
 						</div>
 					</div>
 					<div class="control-group">
-						<label class="control-label" for="optionsCheckbox">Private</label>
+						<label class="control-label" for="optionsCheckbox"><?php echo lang('paste_private'); ?></label>
 						<div class="controls">
 							<label class="checkbox">
 								<?php
@@ -80,13 +80,13 @@
 											}
 								echo form_checkbox($set);
 							?>
-								Private paste aren't shown in recent listings.
+								<?php echo lang('paste_private_desc'); ?>
 							</label>
 						</div>
 					</div>
 					<div class="item">
-						<label for="expire">Delete After
-							<span class="instruction">When should we delete your paste?</span>
+						<label for="expire"><?php echo lang('paste_delete'); ?>
+							<span class="instruction"><?php echo lang('paste_delete_desc'); ?></span>
 						</label>
 						<?php 
 							$expire_extra = 'id="expire" class="select" tabindex="7"';
@@ -112,8 +112,8 @@
 		<?php if($this->config->item('enable_captcha')){ ?>
 			<div class="item_group">
 				<div class="item item_captcha">
-					<label for="captcha">Spam Protection
-						<span class="instruction">Type in the characters displayed in the picture.</span>
+					<label for="captcha"><?php echo lang('paste_spam'); ?>
+						<span class="instruction"><?php echo lang('paste_spam_desc'); ?></span>
 					</label>
 						<img class="captcha" src="<?php echo site_url('view/captcha'); ?>?<?php echo date('U', mktime()); ?>" alt="captcha" width="110" height="40" />
 						<input value="<?php if(isset($captcha_set)){ echo $captcha_set; }?>" type="text" id="captcha" name="captcha" tabindex="2" maxlength="32" />
@@ -123,7 +123,7 @@
 			<div class="form-actions">
 				<button type="submit" name="submit" value="submit" class="btn-large btn-primary">
 					<i class="icon-pencil icon-white"></i>
-					 Create
+					<?php echo lang('paste_create'); ?>
 				</button>
 			</div>
 		</form>

From b7141a937ecc38889bcb0e65ffe870c11e85565b Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <oberling@deroberling.de>
Date: Mon, 15 Apr 2013 20:45:04 +0200
Subject: [PATCH 4/4] fixed language tag in paste_form for bootstrap

---
 htdocs/themes/bootstrap/views/defaults/paste_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/themes/bootstrap/views/defaults/paste_form.php b/htdocs/themes/bootstrap/views/defaults/paste_form.php
index aae92dd..a7ca65a 100644
--- a/htdocs/themes/bootstrap/views/defaults/paste_form.php
+++ b/htdocs/themes/bootstrap/views/defaults/paste_form.php
@@ -44,7 +44,7 @@
 			<div class="row">
 				<div class="span12">
 					<label for="paste"><?php echo lang('paste_yourpaste'); ?>
-						<span class="instruction"><?php echo lang('paste_shorturl_desc'); ?></span>
+						<span class="instruction"><?php echo lang('paste_yourpaste_desc'); ?></span>
 					</label>
 				</div>
 			</div>