Merge remote-tracking branch 'origin/master' into FS#2697searchpagereadonly

Conflicts:
	inc/lang/hr/searchpage.txt
	inc/lang/ko/searchpage.txt

2 files changed, 21 insertions, 20 deletions

diff --git a/inc/lang/ia/denied.txt b/inc/lang/ia/denied.txt
index 044e1532d..82f2fc668 100644
--- a/inc/lang/ia/denied.txt
+++ b/inc/lang/ia/denied.txt
@@ -1,3 +1,4 @@
 ====== Permission refusate ======
 
-Pardono, tu non ha le derectos requisite pro continuar. Pote esser que tu ha oblidate de aperir un session.
\ No newline at end of file
+Pardono, tu non ha le derectos requisite pro continuar.
+
diff --git a/inc/lang/ia/lang.php b/inc/lang/ia/lang.php
index 144dfe33b..cabbbab93 100644
--- a/inc/lang/ia/lang.php
+++ b/inc/lang/ia/lang.php
@@ -50,7 +50,7 @@ $lang['btn_recover']           = 'Recuperar version provisori';
 $lang['btn_draftdel']          = 'Deler version provisori';
 $lang['btn_revert']            = 'Restaurar';
 $lang['btn_register']          = 'Crear conto';
-$lang['loggedinas']            = 'Session aperite como';
+$lang['loggedinas']            = 'Session aperite como:';
 $lang['user']                  = 'Nomine de usator';
 $lang['pass']                  = 'Contrasigno';
 $lang['newpass']               = 'Nove contrasigno';
@@ -88,11 +88,11 @@ $lang['license']               = 'Excepte ubi indicate alteremente, le contento
 $lang['licenseok']             = 'Nota ben! Per modificar iste pagina tu accepta que tu contento essera publicate sub le conditiones del licentia sequente:';
 $lang['searchmedia']           = 'Cercar file con nomine:';
 $lang['searchmedia_in']        = 'Cercar in %s';
-$lang['txt_upload']            = 'Selige le file a incargar';
-$lang['txt_filename']          = 'Incargar como (optional)';
+$lang['txt_upload']            = 'Selige le file a incargar:';
+$lang['txt_filename']          = 'Incargar como (optional):';
 $lang['txt_overwrt']           = 'Reimplaciar le file existente';
-$lang['lockedby']              = 'Actualmente serrate per';
-$lang['lockexpire']            = 'Serratura expira le';
+$lang['lockedby']              = 'Actualmente serrate per:';
+$lang['lockexpire']            = 'Serratura expira le:';
 $lang['js']['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
 $lang['js']['notsavedyet']     = 'Le modificationes non salveguardate essera perdite.\nRealmente continuar?';
 $lang['rssfailed']             = 'Un error occurreva durante le obtention de iste syndication:';
@@ -157,9 +157,9 @@ $lang['yours']                 = 'Tu version';
 $lang['diff']                  = 'Monstrar differentias con versiones actual';
 $lang['diff2']                 = 'Monstrar differentias inter le versiones seligite';
 $lang['line']                  = 'Linea';
-$lang['breadcrumb']            = 'Tracia';
-$lang['youarehere']            = 'Tu es hic';
-$lang['lastmod']               = 'Ultime modification';
+$lang['breadcrumb']            = 'Tracia:';
+$lang['youarehere']            = 'Tu es hic:';
+$lang['lastmod']               = 'Ultime modification:';
 $lang['by']                    = 'per';
 $lang['deleted']               = 'removite';
 $lang['created']               = 'create';
@@ -202,17 +202,17 @@ $lang['admin_register']        = 'Adder nove usator';
 $lang['metaedit']              = 'Modificar metadatos';
 $lang['metasaveerr']           = 'Scriptura de metadatos fallite';
 $lang['metasaveok']            = 'Metadatos salveguardate';
-$lang['img_backto']            = 'Retornar a';
-$lang['img_title']             = 'Titulo';
-$lang['img_caption']           = 'Legenda';
-$lang['img_date']              = 'Data';
-$lang['img_fname']             = 'Nomine de file';
-$lang['img_fsize']             = 'Dimension';
-$lang['img_artist']            = 'Photographo';
-$lang['img_copyr']             = 'Copyright';
-$lang['img_format']            = 'Formato';
-$lang['img_camera']            = 'Camera';
-$lang['img_keywords']          = 'Parolas-clave';
+$lang['btn_img_backto']            = 'Retornar a %s';
+$lang['img_title']             = 'Titulo:';
+$lang['img_caption']           = 'Legenda:';
+$lang['img_date']              = 'Data:';
+$lang['img_fname']             = 'Nomine de file:';
+$lang['img_fsize']             = 'Dimension:';
+$lang['img_artist']            = 'Photographo:';
+$lang['img_copyr']             = 'Copyright:';
+$lang['img_format']            = 'Formato:';
+$lang['img_camera']            = 'Camera:';
+$lang['img_keywords']          = 'Parolas-clave:';
 $lang['subscr_subscribe_success'] = '%s addite al lista de subscription de %s';
 $lang['subscr_subscribe_error'] = 'Error durante le addition de %s al lista de subscription de %s';
 $lang['subscr_subscribe_noaddress'] = 'Il non ha un adresse associate con tu conto. Tu non pote esser addite al lista de subscription.';