diff --git a/htdocs/application/language/chinese-simplified/stikked_lang.php b/htdocs/application/language/chinese-simplified/stikked_lang.php
index 7baef24..8e0da0f 100644
--- a/htdocs/application/language/chinese-simplified/stikked_lang.php
+++ b/htdocs/application/language/chinese-simplified/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] = '我们应该什么时候删除这张便签？';
 $lang['paste_recent'] = '最近的便签';
 $lang['paste_trending'] = '便签趋势';
 $lang['paste_from'] = '来自';
-$lang['paste_ago'] = '前';
+$lang['paste_ago'] = '%s 前';
 $lang['paste_writtenin'] = '写在';
 $lang['paste_viewed'] = '查看';
 $lang['paste_times'] = '次';
diff --git a/htdocs/application/language/chinese-traditional/stikked_lang.php b/htdocs/application/language/chinese-traditional/stikked_lang.php
index 19e2785..731a7b1 100644
--- a/htdocs/application/language/chinese-traditional/stikked_lang.php
+++ b/htdocs/application/language/chinese-traditional/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] = '我們應該什麼時候刪除這張程式碼？';
 $lang['paste_recent'] = '最近的程式碼';
 $lang['paste_trending'] = '程式碼趨勢';
 $lang['paste_from'] = '來自';
-$lang['paste_ago'] = '前';
+$lang['paste_ago'] = '%s 前';
 $lang['paste_writtenin'] = '寫在';
 $lang['paste_viewed'] = '查看';
 $lang['paste_times'] = '次';
diff --git a/htdocs/application/language/english/stikked_lang.php b/htdocs/application/language/english/stikked_lang.php
index af28829..c102b89 100644
--- a/htdocs/application/language/english/stikked_lang.php
+++ b/htdocs/application/language/english/stikked_lang.php
@@ -22,7 +22,7 @@ $lang['paste_recent'] = 'Recent Pastes';
 $lang['paste_trending'] = 'Trending Pastes';
 $lang['paste_search'] = 'Search';
 $lang['paste_from'] = 'From';
-$lang['paste_ago'] = 'ago';
+$lang['paste_ago'] = '%s ago';
 $lang['paste_writtenin'] = 'written in';
 $lang['paste_viewed'] = 'viewed';
 $lang['paste_times'] = 'times';
diff --git a/htdocs/application/language/french/stikked_lang.php b/htdocs/application/language/french/stikked_lang.php
index c5d32cd..1a4323c 100644
--- a/htdocs/application/language/french/stikked_lang.php
+++ b/htdocs/application/language/french/stikked_lang.php
@@ -47,7 +47,11 @@ $lang['paste_spam'] = 'Protection anti spam';
 $lang['paste_spam_desc'] = 'Entrez les lettres pour nous assurer que vous êtes humain';
 $lang['exp_forever'] = 'Garder pour toujours';
 $lang['exp_30min'] = '30 Minutes';
+$lang['exp_burn'] = 'Détruit à la lecture';
+$lang['exp_5min'] = '5 Minutes';
 $lang['exp_1h'] = '1 Heure';
+$lang['exp_1m'] = '1 Mois';
+$lang['exp_1y'] = '1 An';
 $lang['exp_6h'] = '5 Heures';
 $lang['exp_12h'] = '12 Heures';
 $lang['exp_1d'] = '1 Jour';
@@ -68,4 +72,6 @@ $lang['table_lang'] = 'Langages';
 $lang['table_hits'] = 'Vues';
 $lang['table_time'] = 'Quand';
 $lang['powered_by'] = 'Propulsé par';
+$lang['paste_create_shorturl'] = 'Créez une URL courte';
+$lang['paste_search'] = 'Recherche'; 
 
diff --git a/htdocs/application/language/german/stikked_lang.php b/htdocs/application/language/german/stikked_lang.php
index 81b4983..d496d93 100644
--- a/htdocs/application/language/german/stikked_lang.php
+++ b/htdocs/application/language/german/stikked_lang.php
@@ -22,7 +22,7 @@ $lang['paste_recent'] = 'Aktuelle Pastes';
 $lang['paste_trending'] = 'Oft aufgerufene Pastes';
 $lang['paste_search'] = 'Suche';
 $lang['paste_from'] = 'Von';
-$lang['paste_ago'] = 'vorher';
+$lang['paste_ago'] = '%s vorher';
 $lang['paste_writtenin'] = 'geschrieben in';
 $lang['paste_viewed'] = 'aufgerufen';
 $lang['paste_times'] = 'mal';
diff --git a/htdocs/application/language/japanese/stikked_lang.php b/htdocs/application/language/japanese/stikked_lang.php
index d69ea62..af40b4c 100644
--- a/htdocs/application/language/japanese/stikked_lang.php
+++ b/htdocs/application/language/japanese/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] = 'コピペはいつ消したらいいですか？';
 $lang['paste_recent'] = '最近のコピペ';
 $lang['paste_trending'] = '人気のコピペ';
 $lang['paste_from'] = '作者';
-$lang['paste_ago'] = '前';
+$lang['paste_ago'] = '%s 前';
 $lang['paste_writtenin'] = '書かれた言語は';
 $lang['paste_viewed'] = '閲覧';
 $lang['paste_times'] = '回';
diff --git a/htdocs/application/language/norwegian/stikked_lang.php b/htdocs/application/language/norwegian/stikked_lang.php
index 25a3f0e..3cf1bf5 100644
--- a/htdocs/application/language/norwegian/stikked_lang.php
+++ b/htdocs/application/language/norwegian/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] 	= 'Når skal posten slettes?';
 $lang['paste_recent'] 		= 'Ferske poster';
 $lang['paste_trending'] 	= 'Populære poster';
 $lang['paste_from'] 		= 'Av';
-$lang['paste_ago'] 		= 'siden';
+$lang['paste_ago'] 		= '%s siden';
 $lang['paste_writtenin'] 	= 'skrevet i';
 $lang['paste_viewed'] 		= 'vist';
 $lang['paste_times'] 		= 'gang(er)';
diff --git a/htdocs/application/language/polish/date_lang.php b/htdocs/application/language/polish/date_lang.php
index 5aea7e2..3610517 100644
--- a/htdocs/application/language/polish/date_lang.php
+++ b/htdocs/application/language/polish/date_lang.php
@@ -1,5 +1,4 @@
 <?php
-
 $lang['date_year'] = "rok";
 $lang['date_years'] = "lata";
 $lang['date_month'] = "miesiąc";
@@ -14,7 +13,6 @@ $lang['date_minute'] = "minuta";
 $lang['date_minutes'] = "minuty";
 $lang['date_second'] = "sekunda";
 $lang['date_seconds'] = "sekundy";
-
 $lang['UM12']	= '(UTC -12:00) Baker/Howland Island';
 $lang['UM11']	= '(UTC -11:00) Samoa Time Zone, Niue';
 $lang['UM10']	= '(UTC -10:00) Hawaii-Aleutian Standard Time, Cook Islands, Tahiti';
@@ -55,7 +53,5 @@ $lang['UP12']	= '(UTC +12:00) Fiji, Gilbert Islands, Kamchatka Time, New Zealand
 $lang['UP1275']	= '(UTC +12:45) Chatham Islands Standard Time';
 $lang['UP13']	= '(UTC +13:00) Phoenix Islands Time, Tonga';
 $lang['UP14']	= '(UTC +14:00) Line Islands';
-
-
 /* End of file date_lang.php */
 /* Location: ./system/language/english/date_lang.php */
diff --git a/htdocs/application/language/polish/form_validation_lang.php b/htdocs/application/language/polish/form_validation_lang.php
index a59f9c0..876a09a 100644
--- a/htdocs/application/language/polish/form_validation_lang.php
+++ b/htdocs/application/language/polish/form_validation_lang.php
@@ -26,7 +26,7 @@ $lang['matches']		= "Pole %s nie jest takie same jak pole %s.";
 $lang['is_unique']		= "Pole %s musi zawierać unikalną wartość.";
 $lang['is_natural']		= "Pole %s musi zawierać tylko liczby dodatnie.";
 $lang['is_natural_no_zero']	= "Pole %s musi zawierać liczbę większą od zera.";
-$lang['decimal']		= "Pole %s musi zawierać tylko liczby dziesiętne."​​;
+$lang['decimal']		= "Pole %s musi zawierać tylko liczby dziesiętne.";
 $lang['less_than']		= "Liczba w polu %s musi być mniejsza niż %s.";
 $lang['greater_than']		= "Liczba w polu %s musi być większa niż %s.";
 
diff --git a/htdocs/application/language/polish/stikked_lang.php b/htdocs/application/language/polish/stikked_lang.php
index 15483bc..ca4fe10 100644
--- a/htdocs/application/language/polish/stikked_lang.php
+++ b/htdocs/application/language/polish/stikked_lang.php
@@ -1,5 +1,4 @@
 <?php
-
 $lang['paste_create_new']	= 'Utwórz nową wklejkę';
 $lang['paste_create_new_desc']	= 'Tutaj możesz utworzyć nową wklejkę';
 $lang['paste_author']		= 'Autor';
@@ -22,7 +21,7 @@ $lang['paste_recent']		= 'Aktualne wklejki';
 $lang['paste_trending']		= 'Często wyświetlane wklejki';
 $lang['paste_search']		= 'Szukaj';
 $lang['paste_from']		= 'z';
-$lang['paste_ago']		= 'temu';
+$lang['paste_ago']		= '%s temu';
 $lang['paste_writtenin']	= 'napisane w';
 $lang['paste_viewed']		= 'wyświetlone';
 $lang['paste_times']		= 'razy';
@@ -47,9 +46,9 @@ $lang['paste_missing']		= 'Brak podanej wklejki';
 $lang['paste_spam']		= 'Ochrona przed spamem';
 $lang['paste_spam_desc']	= 'Wpisz litery z obrazka';
 $lang['exp_forever']		= 'wieczna';
-$lang['exp_burn']		= 'natychmiast';
+$lang['exp_burn']		= 'spal po przeczytaniu!';
 $lang['exp_5min']		= '5 minut';
-$lang['exp_1h']			= 'jednej godzinie';
+$lang['exp_1h']			= '1 godzina';
 $lang['exp_1d']			= '1 dzień';
 $lang['exp_1w']			= '1 tydzień';
 $lang['exp_1m']			= '1 miesiąc';
@@ -62,11 +61,10 @@ $lang['menu_recent_title']	= 'Nowo utworzone Wklejki';
 $lang['menu_trending']		= 'Popularne';
 $lang['menu_trending_title']	= 'Wklejki często odwiedzane';
 $lang['menu_api']		= "API";
-$lang['menu_about']		= 'O Wklejkach';
+$lang['menu_about']		= 'O wklejkach';
 $lang['table_title']		= 'Tytuł';
 $lang['table_name']		= 'Autor';
 $lang['table_lang']		= 'Język';
 $lang['table_hits']		= 'Wyświetlenia';
 $lang['table_time']		= 'Dodano';
 $lang['powered_by']		= 'Wspierane przez';
-
diff --git a/htdocs/application/language/portuguese/stikked_lang.php b/htdocs/application/language/portuguese/stikked_lang.php
index da14d1b..5dfbf06 100644
--- a/htdocs/application/language/portuguese/stikked_lang.php
+++ b/htdocs/application/language/portuguese/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] = 'Quando devemos eliminar o seu Código?';
 $lang['paste_recent'] = 'Códigos Recentes';
 $lang['paste_trending'] = 'Códigos populares';
 $lang['paste_from'] = 'De';
-$lang['paste_ago'] = 'atrás';
+$lang['paste_ago'] = '%s atrás';
 $lang['paste_writtenin'] = 'escrito em';
 $lang['paste_viewed'] = 'visto';
 $lang['paste_times'] = 'vezes';
diff --git a/htdocs/application/language/russian/stikked_lang.php b/htdocs/application/language/russian/stikked_lang.php
index a436d6a..037e50b 100644
--- a/htdocs/application/language/russian/stikked_lang.php
+++ b/htdocs/application/language/russian/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] = 'Через какое время заметка б
 $lang['paste_recent'] = 'Недавние заметки';
 $lang['paste_trending'] = 'Популярные заметки';
 $lang['paste_from'] = 'Автор:';
-$lang['paste_ago'] = 'назад';
+$lang['paste_ago'] = '%s назад';
 $lang['paste_writtenin'] = 'написана на языке';
 $lang['paste_viewed'] = 'просмотрена';
 $lang['paste_times'] = 'раз(а)';
diff --git a/htdocs/application/language/spanish/stikked_lang.php b/htdocs/application/language/spanish/stikked_lang.php
index 7cd82c2..58cbcc9 100644
--- a/htdocs/application/language/spanish/stikked_lang.php
+++ b/htdocs/application/language/spanish/stikked_lang.php
@@ -21,7 +21,7 @@ $lang['paste_delete_desc'] = '¿Cúando debería de borrar tu código?';
 $lang['paste_recent'] = 'Códigos recientes';
 $lang['paste_trending'] = 'Códigos populares';
 $lang['paste_from'] = 'de';
-$lang['paste_ago'] = 'han pasado desde su publicación';
+$lang['paste_ago'] = '$s han pasado desde su publicación';
 $lang['paste_writtenin'] = 'escrito en';
 $lang['paste_viewed'] = 'visto';
 $lang['paste_times'] = 'veces';
diff --git a/htdocs/application/language/swissgerman/stikked_lang.php b/htdocs/application/language/swissgerman/stikked_lang.php
index 49b6dac..1f7368c 100644
--- a/htdocs/application/language/swissgerman/stikked_lang.php
+++ b/htdocs/application/language/swissgerman/stikked_lang.php
@@ -22,7 +22,7 @@ $lang['paste_recent'] = 'Die nöischtä Pastes';
 $lang['paste_trending'] = 'Die beliäbtischtä Pastes';
 $lang['paste_search'] = 'Suechi';
 $lang['paste_from'] = 'Vom';
-$lang['paste_ago'] = 'vorhär';
+$lang['paste_ago'] = '%s vorhär';
 $lang['paste_writtenin'] = 'gschriibä in';
 $lang['paste_viewed'] = 'aagluegt';
 $lang['paste_times'] = 'mol';
diff --git a/htdocs/application/language/turkish/stikked_lang.php b/htdocs/application/language/turkish/stikked_lang.php
index abb4901..21654b2 100644
--- a/htdocs/application/language/turkish/stikked_lang.php
+++ b/htdocs/application/language/turkish/stikked_lang.php
@@ -22,7 +22,7 @@ $lang['paste_delete_desc'] = 'Pastenizi ne zaman silmeliyiz?';
 $lang['paste_recent'] = 'Şu andaki pasteler';
 $lang['paste_trending'] = 'Gündemdeki Pasteler';
 $lang['paste_from'] = 'Tarafından';
-$lang['paste_ago'] = 'evvel';
+$lang['paste_ago'] = '%s evvel';
 $lang['paste_writtenin'] = 'yazılmış';
 $lang['paste_viewed'] = 'görülmüş';
 $lang['paste_times'] = 'defa';
diff --git a/htdocs/themes/bootstrap/views/list.php b/htdocs/themes/bootstrap/views/list.php
index dc42910..2b5ba18 100644
--- a/htdocs/themes/bootstrap/views/list.php
+++ b/htdocs/themes/bootstrap/views/list.php
@@ -30,7 +30,8 @@
 			<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]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/bootstrap/views/trends.php b/htdocs/themes/bootstrap/views/trends.php
index 43bd27c..9dfb83e 100644
--- a/htdocs/themes/bootstrap/views/trends.php
+++ b/htdocs/themes/bootstrap/views/trends.php
@@ -28,7 +28,8 @@
 			<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]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/cleanwhite/views/list.php b/htdocs/themes/cleanwhite/views/list.php
index 3a50094..4a7edce 100644
--- a/htdocs/themes/cleanwhite/views/list.php
+++ b/htdocs/themes/cleanwhite/views/list.php
@@ -28,7 +28,8 @@
 			<td class="first"><a href="<?php echo site_url("view/".$paste['pid']); ?>"><?php echo $paste['title']; ?></a></td>
 			<td><?php echo $paste['name']; ?></td>
 			<td><?php echo $paste['lang']; ?></td>
-			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/cleanwhite/views/trends.php b/htdocs/themes/cleanwhite/views/trends.php
index 7dee877..615a207 100644
--- a/htdocs/themes/cleanwhite/views/trends.php
+++ b/htdocs/themes/cleanwhite/views/trends.php
@@ -30,7 +30,8 @@
 			<td><?php echo $paste['name']; ?></td>
 			<td><?php echo $paste['lang']; ?></td>
 			<td><?php echo number_format($paste['hits'], 0, '.', "'"); ?></td>
-			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/default/views/list.php b/htdocs/themes/default/views/list.php
index fdd564c..0b43312 100644
--- a/htdocs/themes/default/views/list.php
+++ b/htdocs/themes/default/views/list.php
@@ -30,7 +30,8 @@
 			<td class="first"><a href="<?php echo site_url("view/".$paste['pid']); ?>"><?php echo $paste['title']; ?></a></td>
 			<td><?php echo $paste['name']; ?></td>
 			<td><?php echo $paste['lang']; ?></td>
-			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/default/views/trends.php b/htdocs/themes/default/views/trends.php
index 1ec274e..304c623 100644
--- a/htdocs/themes/default/views/trends.php
+++ b/htdocs/themes/default/views/trends.php
@@ -32,7 +32,8 @@
 			<td><?php echo $paste['name']; ?></td>
 			<td><?php echo $paste['lang']; ?></td>
 			<td><?php echo number_format($paste['hits'], 0, '.', "'"); ?></td>
-			<td><?php $p = explode(",", timespan($paste['created'], time())); echo $p[0]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/geocities/views/list.php b/htdocs/themes/geocities/views/list.php
index ff35b19..ad070e2 100644
--- a/htdocs/themes/geocities/views/list.php
+++ b/htdocs/themes/geocities/views/list.php
@@ -27,7 +27,8 @@
 			<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]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/geocities/views/trends.php b/htdocs/themes/geocities/views/trends.php
index 22b5cc1..1c16e0a 100644
--- a/htdocs/themes/geocities/views/trends.php
+++ b/htdocs/themes/geocities/views/trends.php
@@ -25,7 +25,8 @@
 			<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]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/stikkedizr/views/list.php b/htdocs/themes/stikkedizr/views/list.php
index ff35b19..971ff84 100644
--- a/htdocs/themes/stikkedizr/views/list.php
+++ b/htdocs/themes/stikkedizr/views/list.php
@@ -27,7 +27,8 @@
 			<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]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>
diff --git a/htdocs/themes/stikkedizr/views/trends.php b/htdocs/themes/stikkedizr/views/trends.php
index 22b5cc1..1c16e0a 100644
--- a/htdocs/themes/stikkedizr/views/trends.php
+++ b/htdocs/themes/stikkedizr/views/trends.php
@@ -25,7 +25,8 @@
 			<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]; ?> <?php echo lang('paste_ago'); ?>.</td>
+			<td><?php $p = explode(",", timespan($paste['created'], time()));
+			echo sprintf($this->lang->line('paste_ago'),$p[0]); ?>.</td>
 		</tr>
 
 		<?php }?>