12 files changed, 46 insertions, 35 deletions
diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php
index 481641e45..bb05c316b 100644
--- a/admin/include/c13y_internal.class.php
+++ b/admin/include/c13y_internal.class.php
@@ -103,20 +103,20 @@ class c13y_internal
     $c13y_users = array();
     $c13y_users[$conf['guest_id']] = array(
       'status' => 'guest',
-      'l10n_non_existent' => 'c13y_guest_non_existent',
-      'l10n_bad_status' => 'c13y_bad_guest_status');
+      'l10n_non_existent' => 'Main "guest" user does not exist',
+      'l10n_bad_status' => 'Main "guest" user status is incorrect');
 
     if ($conf['guest_id'] != $conf['default_user_id'])
     {
       $c13y_users[$conf['default_user_id']] = array(
         'password' => null,
-        'l10n_non_existent' => 'c13y_default_non_existent');
+        'l10n_non_existent' => 'Default user does not exist');
     }
 
     $c13y_users[$conf['webmaster_id']] = array(
       'status' => 'webmaster',
-      'l10n_non_existent' => 'c13y_webmaster_non_existent',
-      'l10n_bad_status' => 'c13y_bad_webmaster_status');
+      'l10n_non_existent' => 'Main "webmaster" user does not exist',
+      'l10n_bad_status' => 'Main "webmaster" user status is incorrect');
 
       $query = '
   select u.'.$conf['user_fields']['id'].' as id, ui.status
diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php
index e102dce59..4dccabb69 100644
--- a/admin/include/functions_notification_by_mail.inc.php
+++ b/admin/include/functions_notification_by_mail.inc.php
@@ -405,7 +405,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su
         // set env nbm user
         set_user_on_env_nbm($nbm_user, true);
 
-        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Unsubscribe from notification by mail'): l10n('Unsubscribe from notification by mail'));
+        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Subscribe to notification by mail'): l10n('Unsubscribe from notification by mail'));
 
         // Assign current var for nbm mail
         assign_vars_nbm_mail_content($nbm_user);
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 0dbe00d8a..e9823d7d2 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -67,8 +67,6 @@ $lang['Caddie management'] = "Caddie management";
 $lang['Caddie'] = "Caddie";
 $lang['Categories authorized thanks to group associations'] = "Categories authorized thanks to group associations";
 $lang['Categories manual order was saved'] = "Categories manual order has been saved";
-$lang['Categories ascending alphanumerically ordered'] = "Categories ascending alphanumerically ordered";
-$lang['Categories descending alphanumerically ordered'] = "Categories descending alphanumerically ordered";
 $lang['Category elements associated to the following categories: %s'] = "Category elements associated to the following categories: %s";
 $lang['Check for upgrade failed for unknown reasons.'] = "Check for upgrade failed for unknown reasons.";
 $lang['Check for upgrade'] = "Check for upgrade";
@@ -99,7 +97,6 @@ $lang['Empty caddie'] = "Empty caddie";
 $lang['Environment'] = "Environment";
 $lang['Form'] = "Form";
 $lang['Gallery URL'] = "Gallery URL";
-$lang['Gallery description'] = "Gallery description";
 $lang['Gallery title'] = "Gallery title";
 $lang['Grant selected groups'] = "Grant selected groups";
 $lang['Grant selected users'] = "Grant selected users";
@@ -132,8 +129,6 @@ $lang['Number of thumbnails to create'] = "Number of thumbnails to create";
 $lang['Only private categories are listed'] = "Only private categories are listed";
 $lang['Operating system'] = "Operating system";
 $lang['Options'] = "Options";
-$lang['Categories sorted in ascending order &dArr;'] = "Categories sorted in ascending order &dArr;";
-$lang['Categories sorted in descending order &uArr;'] = "Categories sorted in descending order &uArr;";
 $lang['Other private categories'] = "Other private categories";
 $lang['Page banner'] = "Page banner";
 $lang['Parent category'] = "Parent category";
@@ -177,7 +172,6 @@ $lang['Tag "%s" already exists'] = "Tag \"%s\" already exists";
 $lang['Tag "%s" was added'] = "Tag \"%s\" has been added";
 $lang['Tag selection'] = "Tags selection";
 $lang['Take selected elements out of caddie'] = "Take selected elements out of the caddie";
-$lang['The following tag were deleted'] = "The following tag has been deleted";
 $lang['The %d following tags were deleted'] = "The following %d tags have been deleted";
 $lang['Unable to check for upgrade.'] = "Unable to check for upgrade.";
 $lang['Uninstall'] = "Uninstall";
@@ -238,7 +232,6 @@ $lang['File'] = "File";
 $lang['Filesize'] = "Filesize";
 $lang['first element added on %s'] = "first element added on %s";
 $lang['Forbidden'] = "Forbidden";
-$lang['General'] = "General";
 $lang['global mode'] = "global mode";
 $lang['group "%s" added'] = "group \"%s\" added";
 $lang['group "%s" deleted'] = "group \"%s\" deleted";
@@ -247,7 +240,6 @@ $lang['group'] = "group";
 $lang['The name of a group must not contain " or \' or be empty.'] = "The name of a group must not contain \" or ' or be empty.";
 $lang['This name is already used by another group.'] = "This name is already used by another group.";
 $lang['Groups'] = "Groups";
-$lang['Instructions'] = "Instructions";
 $lang[''] = "";
 $lang['High definition'] = "High definition";
 $lang['jump to category'] = "jump to category";
@@ -342,7 +334,6 @@ $lang['Purge never used notification feeds'] = "Purge never used notification fe
 $lang['Purge sessions'] = "Purge sessions";
 $lang['randomly represented'] = "random representative";
 $lang['registration date'] = "registration date";
-$lang['Remote site'] = "Remote site";
 $lang['clean'] = "clean up";
 $lang['remove remote listing.xml file'] = "remove remote listing.xml file";
 $lang['generate listing'] = "generate listing";
@@ -408,7 +399,6 @@ $lang['for this file format'] = "for this file format";
 $lang['unit mode'] = "single mode";
 $lang['Unlocked'] = "Unlocked";
 $lang['unset'] = "unset";
-$lang['Move up'] = "Move up";
 $lang['Update categories informations'] = "Update categories information";
 $lang['Update images informations'] = "Update images information";
 $lang['Synchronize'] = "Synchronize";
@@ -563,7 +553,6 @@ $lang['Plugin versions can\'t be checked'] = "Plugin which version cannot be che
 $lang['Current<br>version'] = "Current<br>version";
 $lang['Available<br>version'] = "Available<br>version";
 $lang['Automatic upgrade'] = "Automatic upgrade";
-$lang['Automatic installation'] = "Automatic installation";
 $lang['Download file'] = "Download file";
 $lang['Plugin list'] = "Plugins list";
 $lang['Check for updates'] = "Check for updates";
@@ -593,11 +582,7 @@ $lang['ACCESS_2'] = "Access to registered users";
 $lang['ACCESS_3'] = "Access to administrators";
 $lang['ACCESS_4'] = "Access to webmasters";
 $lang['ACCESS_5'] = "No access";
-$lang['Demo'] = "Demo";
-$lang['Piwigo home'] = "Piwigo home";
 $lang['Support'] = "Support";
-$lang['Bugs'] = "Bugs";
-$lang['Extensions'] = "Extensions";
 $lang['Documentation'] = "Documentation";
 $lang['A new version of Piwigo is available.'] = "A new version of Piwigo is available.";
 $lang['Piwigo Administration'] = "Piwigo Administration";
@@ -607,7 +592,6 @@ $lang['The version of %s [%s] installed is not compatible with the version requi
 $lang['You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all'] = "You should upgrade your system to take full advantage of the application, otherwise the application could work improperly, or not at all";
 $lang['Deleted on'] = "Deleted on";
 $lang['Last hit'] = "Last hit";
-$lang['Hits'] = "Hits";
 $lang['GD library is missing'] = "GD library is missing";
 $lang['Templates'] = "Templates";
 $lang['Extend for templates'] = "Extend templates";
@@ -629,7 +613,6 @@ $lang['No element in this category'] = "No element in this category";
 $lang['Images manual order was saved'] = "Images manual order saved";
 $lang['ranks'] = "ranks";
 $lang['Drag to re-order'] = "Click-and-drag to re-order";
-$lang['Unable to retrieve server informations since allow_url_fopen is disabled.'] = "Unable to retrieve server information since allow_url_fopen is disabled.";
 $lang['Quick Local Synchronization'] = "Quick Local Synchronization";
 $lang['No photo can be deleted'] = "No photo can be deleted";
 $lang['Note: Only deletes photos added with pLoader'] = "Note: Only photos added with pLoader can be deleted";
diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php
index 8f54168ed..998d5b4d5 100644
--- a/language/en_UK/common.lang.php
+++ b/language/en_UK/common.lang.php
@@ -47,7 +47,6 @@ $lang['%d new users'] = "%d new users";
 $lang['%d waiting element'] = "%d waiting element";
 $lang['%d waiting elements'] = "%d waiting elements";
 $lang['About'] = "About";
-$lang['All tags must match'] = "All tags must match";
 $lang['All tags'] = "All tags";
 $lang['Any tag'] = "Any tag";
 $lang['At least one listed rule must be satisfied.'] = "At least one listed criterion must be satisfied.";
@@ -69,7 +68,6 @@ $lang['Current password is wrong'] = "Current password is wrong";
 $lang['Dimensions'] = "Dimensions";
 $lang['Display'] = "Display";
 $lang['Each listed rule must be satisfied.'] = "Each listed criterion must be satisfied.";
-$lang['Email address is missing'] = "Email address is missing";
 $lang['Email address'] = "Email address";
 $lang['Enter your personnal informations'] = "Enter your personnal data";
 $lang['Error sending email'] = "Error when sending email";
@@ -321,7 +319,6 @@ $lang['IP: %s'] = "IP: %s";
 $lang['Browser: %s'] = "Browser: %s";
 $lang['Author: %s'] = "Author: %s";
 $lang['Comment: %s'] = "Comment: %s";
-$lang['Delete: %s'] = "Delete: %s";
 $lang['Comment by %s'] = "Comment by %s";
 $lang['User: %s'] = "User: %s";
 $lang['Email: %s'] = "Email: %s";
diff --git a/language/en_UK/install.lang.php b/language/en_UK/install.lang.php
index a3e4f4a31..a40ce6762 100644
--- a/language/en_UK/install.lang.php
+++ b/language/en_UK/install.lang.php
@@ -32,10 +32,8 @@ $lang['Start Install'] = "Start installation";
 $lang['mail address must be like xxx@yyy.eee (example : jack@altern.org)'] = "mail address must be like xxx@yyy.eee (example : jack@altern.org)";
 $lang['Webmaster login'] = "Webmaster login";
 $lang['It will be shown to the visitors. It is necessary for website administration'] = "It will be shown to the visitors. It is necessary for website administration";
-$lang['Parameters are correct'] = "Parameters are correct";
 $lang['Connection to server succeed, but it was impossible to connect to database'] = "Connection to server successful, but the connection to the database is impossible";
 $lang['Can\'t connect to server'] = "Cannot connect to server";
-$lang['The next step of the installation is now possible'] = "The next step of the installation is now possible";
 $lang['Copy the text in pink between hyphens and paste it into the file "local/config/database.inc.php"(Warning : database.inc.php must only contain what is in pink, no line return or space character)'] = "Copy the text in pink between hyphens and paste it into the file \"local/config/database.inc.php\". (Warning: database.inc.php must only contain the pink text, without additional line return or space character)";
 $lang['Database type'] = "Database type";
 $lang['The type of database your piwigo data will be store in'] = "The type of database your Piwigo data will be store in";
@@ -52,7 +50,6 @@ $lang['database tables names will be prefixed with it (enables you to manage bet
 $lang['enter a login for webmaster'] = "enter a login for webmaster";
 $lang['webmaster login can\'t contain characters \' or "'] = "webmaster login can't contain characters ' or \"";
 $lang['please enter your password again'] = "please enter your password again";
-$lang['Installation finished'] = "Installation finished";
 $lang['Webmaster password'] = "Webmaster password";
 $lang['Keep it confidential, it enables you to access administration panel'] = "Keep it confidential, it enables you to access administration panel";
 $lang['Password [confirm]'] = "Password [confirm]";
diff --git a/language/en_UK/upgrade.lang.php b/language/en_UK/upgrade.lang.php
index 70dcf14bf..a5916ddfd 100644
--- a/language/en_UK/upgrade.lang.php
+++ b/language/en_UK/upgrade.lang.php
@@ -37,8 +37,7 @@ $lang['Perform a maintenance check in [Administration>Specials>Maintenance] if y
 $lang['As a precaution, following plugins have been disabled. You must check for plugins upgrade before reactiving them:'] = "As a precaution, the following plugins have been deactivated. You must check for plugins upgrades before reactivating them:";
 $lang['Only administrator can run upgrade: please sign in below.'] = "Only an administrator can run upgrade: please sign in below.";
 $lang['You do not have access rights to run upgrade'] = "You do not have access rights to run upgrade";
-$lang['In <i>%s</i>, before <b>?></b>, insert:'] = "In <i>%s</i>, before <b>?></b>, insert:";
 $lang['All sub-categories of private categories become private'] = "All sub-categories of private categories become private";
 $lang['User permissions and group permissions have been erased'] = "Users and groups permissions have been erased";
 $lang['Only thumbnails prefix and webmaster mail address have been saved from previous configuration'] = "Only thumbnails prefix and webmaster mail address have been saved from previous configuration";
-?>
-\ No newline at end of file
+?>
diff --git a/themes/default/template/identification.tpl b/themes/default/template/identification.tpl
index 75ce1bb4d..1541fd471 100644
--- a/themes/default/template/identification.tpl
+++ b/themes/default/template/identification.tpl
@@ -2,7 +2,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Identification'|@translate}</h2>
   </div>
diff --git a/themes/default/template/nbm.tpl b/themes/default/template/nbm.tpl
index 57792e4fa..39574881e 100644
--- a/themes/default/template/nbm.tpl
+++ b/themes/default/template/nbm.tpl
@@ -2,7 +2,7 @@
 <div id="content" class="content">
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Notification'|@translate}</h2>
   </div>
diff --git a/themes/default/template/password.tpl b/themes/default/template/password.tpl
index 60685480b..7e3b5ed76 100644
--- a/themes/default/template/password.tpl
+++ b/themes/default/template/password.tpl
@@ -2,7 +2,7 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Go through the gallery as a visitor'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Password forgotten'|@translate}</h2>
   </div>
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 29421e344..90d574f47 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -59,7 +59,7 @@
       <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'set as category representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
     {/if}
     {if isset($U_ADMIN) }
-      <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
+      <a href="{$U_ADMIN}" title="{'Modify information'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     {/if}
     {if isset($U_CADDIE) }{*caddie management BEGIN*}
 <script type="text/javascript">
diff --git a/tools/convert_language_to_2.1.pl b/tools/convert_language_to_2.1.pl
index 535fec217..353e801e4 100644
--- a/tools/convert_language_to_2.1.pl
+++ b/tools/convert_language_to_2.1.pl
@@ -45,6 +45,9 @@ my %remove_keys = (
     common => {
         'You can\'t upload pictures in this category' => '',
         'display pictures added on' => '',
+        'Email address is missing' => '',
+        'Delete: %s' => '',
+        'All tags must match' => '',
     },
     admin => {
         'nbm_content_goto_2' => '',
@@ -55,10 +58,34 @@ my %remove_keys = (
         'No tag defined. Use Administration>Pictures>Tags' => '',
         'Remote site url must start by http or https and must only contain characters among "/", "a-zA-Z0-9", "-" or "_"' => '',
         'path' => '',
+        'Unable to retrieve server informations since allow_url_fopen is disabled.' => '',
+        'The following tag were deleted' => '',
+        'Remote site' => '',
+        'Piwigo home' => '',
+        'Move up' => '',
+        'Instructions' => '',
+        'Hits' => '',
+        'General' => '',
+        'Gallery description' => '',
+        'Extensions' => '',
+        'Demo' => '',
+        'Categories ascending alphanumerically ordered' => '',
+        'Categories descending alphanumerically ordered' => '',
+        'Categories sorted in ascending order ⇓' => '',
+        'Categories sorted in ascending order &dArr;' => '',
+        'Categories sorted in descending order ⇑' => '',
+        'Categories sorted in descending order &uArr;' => '',
+        'Bugs' => '',
+        'Automatic installation' => '',
     },
     upgrade => {
         'Are you sure?' => '',
+        'In <i>%s</i>, before <b>?></b>, insert:' => '',
     },
+    install => {
+        'Parameters are correct' => '',
+        'Installation finished' => '',
+    }
 );
 
 my %to_copy = ();
diff --git a/tools/missing_keys.pl b/tools/missing_keys.pl
index 88c8bdc2f..7f657a41d 100644
--- a/tools/missing_keys.pl
+++ b/tools/missing_keys.pl
@@ -63,6 +63,14 @@ my %ignore_keys = (
     'other' => '',
     'high' => '',
     'Waiting page: %s' => '',
+    'Admin: %s' => '',
+    'Manage this user comment: %s' => '',
+    'Main "guest" user does not exist' => '',
+    'Main "guest" user status is incorrect' => '',
+    'Main "webmaster" user does not exist' => '',
+    'Main "webmaster" user status is incorrect' => '',
+    'Default user does not exist' => '',
+    '(!) This comment requires validation' => '',
 );