merge 3524 Br2.0 -> trunk

git-svn-id: http://piwigo.org/svn/trunk@3526 68402e56-0260-453c-a942-63ccdbb3a9ee

8 files changed, 8 insertions, 1 deletions

diff --git a/admin/template/goto/menubar.tpl b/admin/template/goto/menubar.tpl
index 58dc50463..8bf9a4a2d 100644
--- a/admin/template/goto/menubar.tpl
+++ b/admin/template/goto/menubar.tpl
@@ -31,7 +31,7 @@ for (var i=0; i<rows.length; i++) {
 	<td>{'Author'|@translate}</td>
 	<td>{'Name'|@translate}</td>
 	<td>{'Position'|@translate}</td>
-	<td>Hide</td>
+	<td>{'Hide'|@translate}</td>
       </tr>
     </thead>
     <tbody>
diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php
index 13cd9f836..22cf44ffe 100644
--- a/language/de_DE/admin.lang.php
+++ b/language/de_DE/admin.lang.php
@@ -648,4 +648,5 @@ $lang['%d photos were deleted'] = '%d Fotos wurden gel&ouml;scht';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
 /*TODO*/$lang['Purge search history'] = 'Purge search history';
+/*TODO*/$lang['Hide'] = 'Hide';
 ?>
\ No newline at end of file
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index b4e810f47..9357321c0 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -653,4 +653,5 @@ $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Keep in touch with Piwi
 $lang['Subscribe %s'] = 'Subscribe %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo Announcements Newsletter';
 $lang['Purge search history'] = 'Purge search history';
+$lang['Hide'] = 'Hide';
 ?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index e4a84ca58..5d3389671 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -650,4 +650,5 @@ $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Quédese en contacto co
 $lang['Subscribe %s'] = 'Abonar a la newsletter inglesa %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonar %s a la newsletter Piwigo';
 $lang['Purge search history'] = 'Purgar la reseña histórica de las búsquedas';
+$lang['Hide'] = 'Enmascarar';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index d0674f46e..91eb380fb 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -656,4 +656,5 @@ $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Restez en contact avec
 $lang['Subscribe %s'] = 'Abonner %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
 $lang['Purge search history'] = 'Purger l\'historique des recherches';
+$lang['Hide'] = 'Masquer';
 ?>
diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php
index d57836619..9be5ad8ed 100644
--- a/language/it_IT/admin.lang.php
+++ b/language/it_IT/admin.lang.php
@@ -652,4 +652,5 @@ $lang['Subscribe to Piwigo Announcements Newsletter'] = 'Rimanete in contatto co
 $lang['Subscribe %s'] = 'Abbonare %s';
 $lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abbonare %s alla newsletter Piwigo';
 /*TODO*/$lang['Purge search history'] = 'Purge search history';
+/*TODO*/$lang['Hide'] = 'Hide';
 ?>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index a4c73397e..c3aee9f15 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -644,4 +644,5 @@ $lang['edit category informations'] = 'bewerk categorie informatie';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
 /*TODO*/$lang['Purge search history'] = 'Purge search history';
+/*TODO*/$lang['Hide'] = 'Hide';
 ?>
diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php
index d9801ca5a..4fe20436c 100644
--- a/language/pl_PL/admin.lang.php
+++ b/language/pl_PL/admin.lang.php
@@ -649,4 +649,5 @@ $lang['Bound template'] = 'Przypisz Szablon';
 /* TODO */ $lang['Number of downloads'] = 'Number of downloads';
 // --------- Starting below: New or revised $lang ---- from Colibri (2.1)
 /*TODO*/$lang['Purge search history'] = 'Purge search history';
+/*TODO*/$lang['Hide'] = 'Hide';
 ?>