Fix missing keys: some keys have been removed by mistake during the massive

key conversion.

Remove some language keys that are really obsolete. I've updated the script
to convert language files to 2.1, I will apply "obsolete keys removal" process
in a 2nd step on other languages.

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

2 files changed, 6 insertions, 6 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);