Changeset 5021

Timestamp:

Mar 2, 2010, 3:54:22 PM (14 years ago)

Author:

nikrou

Message:

Feature 1451 : localization with gettext
Use php-gettext (developpement version rev43, because of php5.3) as fallback
Use native language (english) instead of key for translation
Keep directory en_UK for english customization
Need some refactoring for plurals

Todo : managing plugins in the same way

Location:

trunk

Files:

• about.php (modified) (1 diff)
• admin/advanced_feature.php (modified) (2 diffs)
• admin/cat_list.php (modified) (2 diffs)
• admin/cat_modify.php (modified) (3 diffs)
• admin/cat_options.php (modified) (5 diffs)
• admin/configuration.php (modified) (5 diffs)
• admin/element_set.php (modified) (3 diffs)
• admin/extend_for_templates.php (modified) (1 diff)
• admin/group_list.php (modified) (6 diffs)
• admin/group_perm.php (modified) (1 diff)
• admin/history.php (modified) (1 diff)
• admin/include/c13y_internal.class.php (modified) (4 diffs)
• admin/include/check_integrity.class.php (modified) (1 diff)
• admin/include/functions.php (modified) (4 diffs)
• admin/include/functions_notification_by_mail.inc.php (modified) (5 diffs)
• admin/include/functions_permalinks.php (modified) (3 diffs)
• admin/include/functions_plugins.inc.php (modified) (1 diff)
• admin/include/functions_upgrade.php (modified) (2 diffs)
• admin/include/functions_waiting.inc.php (modified) (1 diff)
• admin/notification_by_mail.php (modified) (7 diffs)
• admin/picture_modify.php (modified) (1 diff)
• admin/plugins_new.php (modified) (3 diffs)
• admin/plugins_update.php (modified) (2 diffs)
• admin/site_manager.php (modified) (8 diffs)
• admin/site_update.php (modified) (7 diffs)
• admin/tags.php (modified) (3 diffs)
• admin/template/goto/admin.tpl (modified) (4 diffs)
• admin/template/goto/advanced_feature.tpl (modified) (1 diff)
• admin/template/goto/cat_list.tpl (modified) (4 diffs)
• admin/template/goto/cat_modify.tpl (modified) (10 diffs)
• admin/template/goto/cat_options.tpl (modified) (1 diff)
• admin/template/goto/check_integrity.tpl (modified) (5 diffs)
• admin/template/goto/comments.tpl (modified) (1 diff)
• admin/template/goto/configuration.tpl (modified) (7 diffs)
• admin/template/goto/extend_for_templates.tpl (modified) (1 diff)
• admin/template/goto/footer.tpl (modified) (2 diffs)
• admin/template/goto/group_list.tpl (modified) (2 diffs)
• admin/template/goto/history.tpl (modified) (3 diffs)
• admin/template/goto/install.tpl (modified) (8 diffs)
• admin/template/goto/intro.tpl (modified) (1 diff)
• admin/template/goto/maintenance.tpl (modified) (1 diff)
• admin/template/goto/navigation_bar.tpl (modified) (2 diffs)
• admin/template/goto/notification_by_mail.tpl (modified) (9 diffs)
• admin/template/goto/permalinks.tpl (modified) (1 diff)
• admin/template/goto/picture_modify.tpl (modified) (2 diffs)
• admin/template/goto/plugins_list.tpl (modified) (1 diff)
• admin/template/goto/plugins_new.tpl (modified) (1 diff)
• admin/template/goto/plugins_update.tpl (modified) (4 diffs)
• admin/template/goto/profile_content.tpl (modified) (7 diffs)
• admin/template/goto/rating.tpl (modified) (2 diffs)
• admin/template/goto/site_manager.tpl (modified) (5 diffs)
• admin/template/goto/site_update.tpl (modified) (10 diffs)
• admin/template/goto/tags.tpl (modified) (1 diff)
• admin/template/goto/thumbnail.tpl (modified) (6 diffs)
• admin/template/goto/upgrade.tpl (modified) (3 diffs)
• admin/template/goto/upload.tpl (modified) (1 diff)
• admin/template/goto/user_list.tpl (modified) (15 diffs)
• admin/thumbnail.php (modified) (3 diffs)
• admin/user_list.php (modified) (6 diffs)
• admin/user_perm.php (modified) (1 diff)
• identification.php (modified) (3 diffs)
• include/calendar_base.class.php (modified) (2 diffs)
• include/common.inc.php (modified) (3 diffs)
• include/functions.inc.php (modified) (9 diffs)
• include/functions_category.inc.php (modified) (3 diffs)
• include/functions_comment.inc.php (modified) (3 diffs)
• include/functions_html.inc.php (modified) (4 diffs)
• include/functions_mail.inc.php (modified) (1 diff)
• include/functions_notification.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (4 diffs)
• include/menubar.inc.php (modified) (10 diffs)
• include/php-gettext (added)
• include/php-gettext/gettext.inc.php (added)
• include/php-gettext/gettext.php (added)
• include/php-gettext/streams.php (added)
• include/picture_comment.inc.php (modified) (1 diff)
• include/section_init.inc.php (modified) (8 diffs)
• include/ws_functions.inc.php (modified) (1 diff)
• install.php (modified) (5 diffs)
• install/php5_apache_configuration.php (modified) (2 diffs)
• install/upgrade_1.3.1.php (modified) (1 diff)
• language/de_DE/LC_MESSAGES (added)
• language/de_DE/LC_MESSAGES/messages.mo (added)
• language/de_DE/LC_MESSAGES/messages.po (added)
• language/en_UK/LC_MESSAGES (added)
• language/en_UK/LC_MESSAGES/messages.mo (added)
• language/en_UK/LC_MESSAGES/messages.po (added)
• language/es_ES/LC_MESSAGES (added)
• language/es_ES/LC_MESSAGES/messages.mo (added)
• language/es_ES/LC_MESSAGES/messages.po (added)
• language/fr_FR/LC_MESSAGES (added)
• language/fr_FR/LC_MESSAGES/messages.mo (added)
• language/fr_FR/LC_MESSAGES/messages.po (added)
• language/it_IT/LC_MESSAGES (added)
• language/it_IT/LC_MESSAGES/messages.mo (added)
• language/it_IT/LC_MESSAGES/messages.po (added)
• language/nl_NL/LC_MESSAGES (added)
• language/nl_NL/LC_MESSAGES/messages.mo (added)
• language/nl_NL/LC_MESSAGES/messages.po (added)
• language/pl_PL/LC_MESSAGES (added)
• language/pl_PL/LC_MESSAGES/messages.mo (added)
• language/pl_PL/LC_MESSAGES/messages.po (added)
• language/templates (added)
• language/templates/messages.pot (added)
• nbm.php (modified) (2 diffs)
• password.php (modified) (2 diffs)
• picture.php (modified) (2 diffs)
• profile.php (modified) (6 diffs)
• register.php (modified) (1 diff)
• search.php (modified) (2 diffs)
• search_rules.php (modified) (1 diff)
• template-extension/distributed/samples/my-picture.tpl (modified) (6 diffs)
• template-extension/distributed/samples/titling_categories.tpl (modified) (1 diff)
• template/yoga/about.tpl (modified) (1 diff)
• template/yoga/comment_list.tpl (modified) (1 diff)
• template/yoga/comments.tpl (modified) (1 diff)
• template/yoga/footer.tpl (modified) (2 diffs)
• template/yoga/header.tpl (modified) (1 diff)
• template/yoga/identification.tpl (modified) (3 diffs)
• template/yoga/index.tpl (modified) (3 diffs)
• template/yoga/mainpage_categories.tpl (modified) (1 diff)
• template/yoga/menubar_categories.tpl (modified) (2 diffs)
• template/yoga/menubar_identification.tpl (modified) (3 diffs)
• template/yoga/menubar_menu.tpl (modified) (1 diff)
• template/yoga/menubar_specials.tpl (modified) (1 diff)
• template/yoga/menubar_tags.tpl (modified) (1 diff)
• template/yoga/navigation_bar.tpl (modified) (2 diffs)
• template/yoga/nbm.tpl (modified) (1 diff)
• template/yoga/notification.tpl (modified) (3 diffs)
• template/yoga/password.tpl (modified) (1 diff)
• template/yoga/picture.tpl (modified) (9 diffs)
• template/yoga/picture_content.tpl (modified) (1 diff)
• template/yoga/picture_nav_buttons.tpl (modified) (6 diffs)
• template/yoga/profile.tpl (modified) (1 diff)
• template/yoga/profile_content.tpl (modified) (8 diffs)
• template/yoga/redirect.tpl (modified) (1 diff)
• template/yoga/register.tpl (modified) (1 diff)
• template/yoga/search.tpl (modified) (7 diffs)
• template/yoga/search_rules.tpl (modified) (1 diff)
• template/yoga/slideshow.tpl (modified) (1 diff)
• template/yoga/tags.tpl (modified) (1 diff)
• template/yoga/upload.tpl (modified) (6 diffs)
• upgrade.php (modified) (3 diffs)
• upload.php (modified) (16 diffs)

trunk/about.php

@@ -35 +35 @@
 // Start output of page
 //
-$title= l10n('about_page_title');
+$title= l10n('About Piwigo');
 $page['body_id'] = 'theAboutPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');

trunk/admin/advanced_feature.php

@@ -67 +67 @@
   array
   (
-    'CAPTION' => l10n('Elements_not_linked'),
+    'CAPTION' => l10n('Not linked elements'),
     'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked'
   ));
@@ -74 +74 @@
   array
   (
-    'CAPTION' => l10n('Duplicates'),
+    'CAPTION' => l10n('Files with same name in more than one physical category'),
     'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates'
   ));

trunk/admin/cat_list.php

@@ -69 +69 @@
 $base_url = get_root_url().'admin.php?page=cat_list';
 $navigation = '<a href="'.$base_url.'">';
-$navigation.= l10n('home');
+$navigation.= l10n('Home');
 $navigation.= '</a>';
 
@@ -79 +79 @@
 {
   delete_categories(array($_GET['delete']));
-  array_push($page['infos'], l10n('cat_virtual_deleted'));
+  array_push($page['infos'], l10n('Virtual category deleted'));
   update_global_rank();
 }

trunk/admin/cat_modify.php

@@ -111 +111 @@
   }
 
-  array_push($page['infos'], l10n('editcat_confirm'));
+  array_push($page['infos'], l10n('Category informations updated successfully.'));
 }
 elseif (isset($_POST['set_random_representant']))
@@ -317 +317 @@
   'date_available' => l10n('Post date'),
   'average_rate' => l10n('Average rate'),
-  'hit' => l10n('most_visited_cat'),
+  'hit' => l10n('Most visited'),
   'file' => l10n('File name'),
   'id' => 'Id',
@@ -517 +517 @@
     $page['infos'],
     sprintf(
-      l10n('An information email was sent to group "%s"'),
+      l10n('An information email was sent to group \"%s\"'),
       $group_name
       )

trunk/admin/cat_options.php

@@ -161 +161 @@
 // TabSheet initialization
 $opt_link = $link_start.'cat_options&section=';
-$tabsheet->add('status', l10n('cat_security'), $opt_link.'status');
-$tabsheet->add('visible', l10n('lock'), $opt_link.'visible');
-$tabsheet->add('upload', l10n('upload'), $opt_link.'upload');
-$tabsheet->add('comments', l10n('comments'), $opt_link.'comments');
+$tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
+$tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
+$tabsheet->add('Upload', l10n('Upload'), $opt_link.'Upload');
+$tabsheet->add('Comments', l10n('Comments'), $opt_link.'Comments');
 if ($conf['allow_random_representative'])
 {
@@ -209 +209 @@
     $template->assign(
       array(
-        'L_SECTION' => l10n('cat_upload_title'),
-        'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
-        'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
+        'L_SECTION' => l10n('Select uploadable categories'),
+        'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
+        'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
         )
       );
@@ -230 +230 @@
     $template->assign(
       array(
-        'L_SECTION' => l10n('cat_comments_title'),
-        'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
-        'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
+        'L_SECTION' => l10n('Authorize users to add comments on selected categories'),
+        'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
+        'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
         )
       );
@@ -251 +251 @@
     $template->assign(
       array(
-        'L_SECTION' => l10n('cat_lock_title'),
-        'L_CAT_OPTIONS_TRUE' => l10n('unlocked'),
-        'L_CAT_OPTIONS_FALSE' => l10n('locked'),
+        'L_SECTION' => l10n('Lock categories'),
+        'L_CAT_OPTIONS_TRUE' => l10n('Unlocked'),
+        'L_CAT_OPTIONS_FALSE' => l10n('Locked'),
         )
       );
@@ -272 +272 @@
     $template->assign(
       array(
-        'L_SECTION' => l10n('cat_status_title'),
-        'L_CAT_OPTIONS_TRUE' => l10n('cat_public'),
-        'L_CAT_OPTIONS_FALSE' => l10n('cat_private'),
+        'L_SECTION' => l10n('Manage authorizations for selected categories'),
+        'L_CAT_OPTIONS_TRUE' => l10n('Public category'),
+        'L_CAT_OPTIONS_FALSE' => l10n('Private category'),
         )
       );

trunk/admin/configuration.php

@@ -87 +87 @@
       if ( !url_is_remote($_POST['gallery_url']) )
       {
-        array_push($page['errors'], l10n('conf_gallery_url_error'));
+        array_push($page['errors'], l10n('The gallery URL is not valid.'));
       }
       foreach( $main_checkboxes as $checkbox)
@@ -111 +111 @@
            or $_POST['nb_comment_page'] > 50)
       {
-        array_push($page['errors'], l10n('conf_nb_comment_page_error'));
+        array_push($page['errors'], l10n('The number of comments a page must be between 5 and 50 included.'));
       }
       foreach( $comments_checkboxes as $checkbox)
@@ -161 +161 @@
       }
     }
-    array_push($page['infos'], l10n('conf_confirmation'));
+    array_push($page['infos'], l10n('Information data registered in database'));
   }
 
@@ -174 +174 @@
 $tabsheet = new tabsheet();
 // TabSheet initialization
-$tabsheet->add('main', l10n('conf_main_title'), $conf_link.'main');
-$tabsheet->add('history', l10n('conf_history_title'), $conf_link.'history');
-$tabsheet->add('comments', l10n('conf_comments_title'), $conf_link.'comments');
-$tabsheet->add('upload', l10n('conf_upload_title'), $conf_link.'upload');
-$tabsheet->add('default', l10n('conf_display'), $conf_link.'default');
+$tabsheet->add('main', l10n('Main'), $conf_link.'main');
+$tabsheet->add('history', l10n('History'), $conf_link.'history');
+$tabsheet->add('comments', l10n('Comments'), $conf_link.'comments');
+$tabsheet->add('upload', l10n('Upload'), $conf_link.'upload');
+$tabsheet->add('default', l10n('Default display'), $conf_link.'default');
 // TabSheet selection
 $tabsheet->select($page['section']);
@@ -286 +286 @@
         // Reload user
         $edit_user = build_user($conf['default_user_id'], false);
-        array_push($page['infos'], l10n('conf_confirmation'));
+        array_push($page['infos'], l10n('Information data registered in database'));
       }
     }

trunk/admin/element_set.php

@@ -133 +133 @@
 else if ('not_linked' == $_GET['cat'])
 {
-  $page['title'] = l10n('Elements_not_linked');
+  $page['title'] = l10n('Not linked elements');
   $template->assign(array('U_ACTIVE_MENU' => 5 ));
 
@@ -164 +164 @@
 else if ('duplicates' == $_GET['cat'])
 {
-  $page['title'] = l10n('Duplicates');
+  $page['title'] = l10n('Files with same name in more than one physical category');
   $template->assign(array('U_ACTIVE_MENU' => 5 ));
 
@@ -190 +190 @@
 elseif ('recent'== $_GET['cat'])
 {
-  $page['title'] = l10n('recent_pics_cat');
+  $page['title'] = l10n('Recent pictures');
   $query = 'SELECT MAX(date_available) AS date
   FROM '.IMAGES_TABLE;

trunk/admin/extend_for_templates.php

@@ -147 +147 @@
   {
     array_push($page['infos'], 
-      l10n('Templates recorded.'));
+      l10n('Templates configuration has been recorded.'));
   }
 }

trunk/admin/group_list.php

@@ -73 +73 @@
   array_push(
     $page['infos'],
-    sprintf(l10n('group "%s" deleted'), $groupname)
+    sprintf(l10n('group \"%s\" deleted'), $groupname)
     );
 }
@@ -85 +85 @@
   if (empty($_POST['groupname']))
   {
-    array_push($page['errors'], l10n('group_add_error1'));
+    array_push($page['errors'], l10n('The name of a group must not contain \" or \' or be empty.'));
   }
   if (count($page['errors']) == 0)
@@ -98 +98 @@
     if ($count != 0)
     {
-      array_push($page['errors'], l10n('group_add_error2'));
+      array_push($page['errors'], l10n('This name is already used by another group.'));
     }
   }
@@ -114 +114 @@
     array_push(
       $page['infos'],
-      sprintf(l10n('group "%s" added'), $_POST['groupname'])
+      sprintf(l10n('group \"%s\" added'), $_POST['groupname'])
       );
   }
@@ -142 +142 @@
   array_push(
     $page['infos'],
-    sprintf(l10n('group "%s" updated'), $groupname)
+    sprintf(l10n('group \"%s\" updated'), $groupname)
     );
 }
@@ -189 +189 @@
     array(
       'NAME' => $row['name'],
-      'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''),
+      'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('default').']' : ''),
       'MEMBERS' => l10n_dec('%d member', '%d members', $counter),
       'U_MEMBERS' => $members_url.$row['id'],

trunk/admin/group_perm.php

@@ -133 +133 @@
     'TITLE' =>
       sprintf(
-        l10n('Manage permissions for group "%s"'),
+        l10n('Manage permissions for group \"%s\"'),
         get_groupname($page['group']
           )
         ),
-    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
-    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
+    'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'),
+    'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'),
 
     'F_ACTION' =>

trunk/admin/history.php

@@ -145 +145 @@
   else
   {
-    array_push($page['errors'], l10n('search_one_clause_at_least'));
+    array_push($page['errors'], l10n('Empty query. No criteria has been entered.'));
   }
 }

trunk/admin/include/c13y_internal.class.php

@@ -56 +56 @@
       {
         $c13y->add_anomaly(
-          sprintf(l10n('c13y_version_anomaly'), $elem['type'], $elem['current'], $elem['required']),
-          null,
-          null,
-          l10n('c13y_version_correction')
+          sprintf(l10n('The version of %s [%s] installed is not compatible with the version required [%s]'), $elem['type'], $elem['current'], $elem['required']),
+          null,
+          null,
+          l10n('You need to upgrade your system to take full advantage of the application else the application will not work correctly, or not at all')
           .'<br>'.
           $c13y->get_htlm_links_more_info());
@@ -81 +81 @@
       {
         $c13y->add_anomaly(
-          sprintf(l10n('c13y_exif_anomaly'), '$conf[\''.$value.'\']'),
-          null,
-          null,
-          sprintf(l10n('c13y_exif_correction'), '$conf[\''.$value.'\']')
+          sprintf(l10n('%s value is not correct file because exif are not supported'), '$conf[\''.$value.'\']'),
+          null,
+          null,
+          sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']')
           .'<br>'.
           $c13y->get_htlm_links_more_info());
@@ -209 +209 @@
             create_user_infos($id);
 
-            $page['infos'][] = sprintf(l10n('c13y_user_created'), $name, $password);
+            $page['infos'][] = sprintf(l10n('User \"%s\" created with \"%s\" like password'), $name, $password);
 
             $result = true;
@@ -240 +240 @@
               $updates);
 
-            $page['infos'][] = sprintf(l10n('c13y_user_status_updated'), get_username($id));
+            $page['infos'][] = sprintf(l10n('Status of user \"%s\" updated'), get_username($id));
 
             $result = true;

trunk/admin/include/check_integrity.class.php

@@ -335 +335 @@
       sprintf
       (
-        l10n('c13y_more_info'),
-        sprintf($link_fmt, $pwg_links['FORUM'], l10n('c13y_more_info_forum')),
-        sprintf($link_fmt, $pwg_links['WIKI'], l10n('c13y_more_info_wiki'))
+        l10n('Go to %s or %s for more informations'),
+        sprintf($link_fmt, $pwg_links['FORUM'], l10n('the forum')),
+        sprintf($link_fmt, $pwg_links['WIKI'], l10n('the wiki'))
       );
   }

trunk/admin/include/functions.php

@@ -1183 +1183 @@
   if (preg_match('/^\s*$/', $category_name))
   {
-    return array('error' => l10n('cat_error_name'));
+    return array('error' => l10n('The name of a category should not be empty'));
   }
 
@@ -1269 +1269 @@
 
   return array(
-    'info' => l10n('cat_virtual_added'),
+    'info' => l10n('Virtual category added'),
     'id'   => $inserted_id,
     );
@@ -1667 +1667 @@
     return array(
       'info' => sprintf(
-        l10n('Tag "%s" was added'),
+        l10n('Tag \"%s\" was added'),
         stripslashes($tag_name)
         ),
@@ -1677 +1677 @@
     return array(
       'error' => sprintf(
-        l10n('Tag "%s" already exists'),
+        l10n('Tag \"%s\" already exists'),
         stripslashes($tag_name)
         )

trunk/admin/include/functions_notification_by_mail.inc.php

@@ -205 +205 @@
     $env_nbm['sent_mail_count'] = 0;
     // Save sendmail message info and error in the original language
-    $env_nbm['msg_info'] = l10n('nbm_msg_mail_sent_to');
-    $env_nbm['msg_error'] = l10n('nbm_msg_error_sending_email_to');
+    $env_nbm['msg_info'] = l10n('Mail sent to %s [%s].');
+    $env_nbm['msg_error'] = l10n('Error when sending email to %s [%s].');
   }
 }
@@ -323 +323 @@
   {
     if ($env_nbm['sent_mail_count'] == 0)
-      array_push($page['infos'], l10n('nbm_no_mail_to_send'));
+      array_push($page['infos'], l10n('No mail to send.'));
     else
       array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
@@ -370 +370 @@
   if ($is_subscribe)
   {
-    $msg_info = l10n('nbm_user_change_enabled_true');
-    $msg_error = l10n('nbm_user_not_change_enabled_true');
+    $msg_info = l10n('User %s [%s] was added to the subscription list.');
+    $msg_error = l10n('User %s [%s] was not added to the subscription list.');
   }
   else
   {
-    $msg_info = l10n('nbm_user_change_enabled_false');
-    $msg_error = l10n('nbm_user_not_change_enabled_false');
+    $msg_info = l10n('User %s [%s] was removed from the subscription list.');
+    $msg_error = l10n('User %s [%s] was not removed from the subscription list.');
   }
 
@@ -386 +386 @@
 
     // Prepare message after change language
-    $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
+    $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.');
 
     // Begin nbm users environment
@@ -409 +409 @@
         set_user_on_env_nbm($nbm_user, true);
 
-        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe'));
+        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Unsubscribe from notification by mail'): l10n('Unsubscribe from notification by mail'));
 
         // Assign current var for nbm mail

trunk/admin/include/functions_permalinks.php

@@ -88 +88 @@
       $page['errors'][] = 
         sprintf( 
-          l10n('Permalink_%s_histo_used_by_%s'),
+          l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
           $permalink, $old_cat_id
         );
@@ -141 +141 @@
       or preg_match( '#^(\d)+(-.*)?$#', $permalink) )
   {
-    $page['errors'][] = l10n('Permalink_name_rule');
+    $page['errors'][] = l10n('The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or start with number followed by \"-\"');
     return false;
   }
@@ -170 +170 @@
     $page['errors'][] = 
       sprintf( 
-        l10n('Permalink_%s_histo_used_by_%s'),
+        l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
         $permalink, $old_cat_id
       );

trunk/admin/include/functions_plugins.inc.php

@@ -56 +56 @@
 
   $tabsheet = new tabsheet();
-  $tabsheet->add('plugins_list', l10n('plugins_tab_list'), $link.'plugins_list');
-  $tabsheet->add('plugins_update', l10n('plugins_tab_update'), $link.'plugins_update');
-  $tabsheet->add('plugins_new', l10n('plugins_tab_new'), $link.'plugins_new');
+  $tabsheet->add('plugins_list', l10n('Plugin list'), $link.'plugins_list');
+  $tabsheet->add('plugins_update', l10n('Check for updates'), $link.'plugins_update');
+  $tabsheet->add('plugins_new', l10n('Other plugins'), $link.'plugins_new');
   $tabsheet->select($selected);
   $tabsheet->assign();

trunk/admin/include/functions_upgrade.php

@@ -128 +128 @@
 
     array_push($page['infos'],
-      l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
+      l10n('As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:').'<p><i>'.implode(', ', $plugins).'</i></p>');
   }
 }
@@ -175 +175 @@
   if ($row['password'] != $conf['pass_convert']($password))
   {
-    array_push($page['errors'], l10n('invalid_pwd'));
+    array_push($page['errors'], l10n('Invalid password!'));
   }
   elseif ($row['status'] != 'admin' and $row['status'] != 'webmaster')

trunk/admin/include/functions_waiting.inc.php

@@ -31 +31 @@
   $tabsheet = new tabsheet();
   // TabSheet initialization
-  $tabsheet->add('comments', l10n('comments'), $link_start.'comments');
+  $tabsheet->add('Comments', l10n('Comments'), $link_start.'Comments');
   $tabsheet->add('upload', l10n('Pictures'), $link_start.'upload');
   // TabSheet selection

trunk/admin/notification_by_mail.php

@@ -175 +175 @@
         $page['infos'],
         sprintf(
-          l10n('nbm_user_x_added'),
+          l10n('User %s [%s] added.'),
           stripslashes($nbm_user['username']),
           get_email_address_as_display_text($nbm_user['mail_address'])
@@ -201 +201 @@
         $result = pwg_query($query);
 
-        redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg'));
+        redirect($base_url.get_query_string_diff(array(), false), l10n('Processing treatment.
+
+Please wait...'));
       }
     }
@@ -268 +270 @@
         if ($is_action_send)
         {
-          $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
+          $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.');
         }
         else
         {
-          $msg_break_timeout = l10n('nbm_break_timeout_list_user');
+          $msg_break_timeout = l10n('Prepared time for list of users to send mail is limited. Others users are not listed.');
         }
 
@@ -314 +316 @@
             if ($exist_data)
             {
-              $subject = '['.$conf['gallery_title'].']: '.l10n('nbm_object_news');
+              $subject = '['.$conf['gallery_title'].']: '.l10n('New elements added');
 
               // Assign current var for nbm mail
@@ -450 +452 @@
         if ($is_action_send)
         {
-          array_push($page['errors'], l10n('nbm_no_user_to send_notifications_by_mail'));
+          array_push($page['errors'], l10n('No user to send notifications by mail.'));
         }
       }
@@ -594 +596 @@
   $tabsheet = new tabsheet();
   // TabSheet initialization
-  $tabsheet->add('param', l10n('nbm_param_mode'),
+  $tabsheet->add('param', l10n('Parameter'),
     add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
         array('mode' => 'param')));
-  $tabsheet->add('subscribe', l10n('nbm_subscribe_mode'),
+  $tabsheet->add('subscribe', l10n('Subscribe'),
     add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
       array('mode' => 'subscribe')));
-  $tabsheet->add('send', l10n('nbm_send_mode'),
+  $tabsheet->add('send', l10n('Send'),
     add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
       array('mode' => 'send')));
@@ -651 +653 @@
     $template->assign(
       array(
-        'L_CAT_OPTIONS_TRUE' => l10n('nbm_subscribe_col'),
-        'L_CAT_OPTIONS_FALSE' => l10n('nbm_unsubscribe_col')
+        'L_CAT_OPTIONS_TRUE' => l10n('Subscribed'),
+        'L_CAT_OPTIONS_FALSE' => l10n('Unsubscribed')
         )
       );

trunk/admin/picture_modify.php

@@ -63 +63 @@
     )
   {
-    array_push($page['errors'], l10n('err_date'));
+    array_push($page['errors'], l10n('wrong date'));
   }
 }

trunk/admin/plugins_new.php

@@ -51 +51 @@
     case 'ok':
       array_push($page['infos'],
-        l10n('plugins_install_ok'),
-        l10n('plugins_install_need_activate'));
+        l10n('Plugin has been successfully copied'),
+        l10n('You might go to plugin list to install and activate it.'));
       break;
 
     case 'temp_path_error':
-      array_push($page['errors'], l10n('plugins_temp_path_error'));
+      array_push($page['errors'], l10n('Can\'t create temporary file.'));
       break;
 
     case 'dl_archive_error':
-      array_push($page['errors'], l10n('plugins_dl_archive_error'));
+      array_push($page['errors'], l10n('Can\'t download archive.'));
       break;
 
     case 'archive_error':
-      array_push($page['errors'], l10n('plugins_archive_error'));
+      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
       break;
 
     default:
       array_push($page['errors'],
-        sprintf(l10n('plugins_extract_error'), $_GET['installstatus']),
-        l10n('plugins_check_chmod'));
+        sprintf(l10n('An error occured during extraction (%s).'), $_GET['installstatus']),
+        l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).'));
   }  
 }
@@ -82 +82 @@
   array(
     $link.'date' => l10n('Post date'),
-    $link.'revision' => l10n('plugins_revisions'),
+    $link.'revision' => l10n('Last revisions'),
     $link.'name' => l10n('Name'),
     $link.'author' => l10n('Author'),
@@ -127 +127 @@
 else
 {
-  array_push($page['errors'], l10n('plugins_server_error'));
+  array_push($page['errors'], l10n('Can\'t connect to server.'));
 }
 

trunk/admin/plugins_update.php

@@ -69 +69 @@
       array_push($page['infos'],
          sprintf(
-            l10n('plugins_upgrade_ok'),
+            l10n('%s has been successfully upgraded.'),
             $plugins->fs_plugins[$_GET['plugin']]['name']));
       break;
 
     case 'temp_path_error':
-      array_push($page['errors'], l10n('plugins_temp_path_error'));
+      array_push($page['errors'], l10n('Can\'t create temporary file.'));
       break;
 
     case 'dl_archive_error':
-      array_push($page['errors'], l10n('plugins_dl_archive_error'));
+      array_push($page['errors'], l10n('Can\'t download archive.'));
       break;
 
     case 'archive_error':
-      array_push($page['errors'], l10n('plugins_archive_error'));
+      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
       break;
 
     default:
       array_push($page['errors'],
-        sprintf(l10n('plugins_extract_error'), $_GET['upgradestatus']),
-        l10n('plugins_check_chmod'));
+        sprintf(l10n('An error occured during extraction (%s).'), $_GET['upgradestatus']),
+        l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).'));
   }  
 }
@@ -158 +158 @@
 else
 {
-  array_push($page['errors'], l10n('plugins_server_error'));
+  array_push($page['errors'], l10n('Can\'t connect to server.'));
 }
 

trunk/admin/site_manager.php

@@ -66 +66 @@
   else
   {
-    array_push($page['errors'], l10n('site_err_remote_file_not_found'));
+    array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found'));
   }
 }
@@ -103 +103 @@
   {
     array_push($page['errors'],
-      l10n('site_already_exists').' ['.$url.']');
+      l10n('This site already exists').' ['.$url.']');
   }
   if (count($page['errors']) == 0)
@@ -121 +121 @@
           {
             array_push($page['errors'],
-                       l10n('site_err').' : '.$first_line);
+                       l10n('an error happened').' : '.$first_line);
           }
         }
         else
         {
-          array_push($page['errors'], l10n('site_err_remote_file_not_found') );
+          array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found') );
         }
       }
@@ -150 +150 @@
     pwg_query($query);
     array_push($page['infos'],
-               $url.' '.l10n('site_created'));
+               $url.' '.l10n('created'));
   }
 }
@@ -173 +173 @@
     case 'generate' :
     {
-      $title = $galleries_url.' : '.l10n('remote_site_generate');
+      $title = $galleries_url.' : '.l10n('generate listing');
       remote_output($galleries_url.'create_listing_file.php?action=generate');
       break;
@@ -179 +179 @@
     case 'test' :
     {
-      $title = $galleries_url.' : '.l10n('remote_site_test');
+      $title = $galleries_url.' : '.l10n('test');
       remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION);
       break;
@@ -185 +185 @@
     case 'clean' :
     {
-      $title = $galleries_url.' : '.l10n('remote_site_clean');
+      $title = $galleries_url.' : '.l10n('clean');
       remote_output($galleries_url.'create_listing_file.php?action=clean');
       break;
@@ -193 +193 @@
       delete_site($page['site']);
       array_push($page['infos'],
-                 $galleries_url.' '.l10n('site_deleted'));
+                 $galleries_url.' '.l10n('deleted'));
       break;
     }

trunk/admin/site_update.php

@@ -56 +56 @@
 $error_labels = array(
   'PWG-UPDATE-1' => array(
-    l10n('update_wrong_dirname_short'),
-    l10n('update_wrong_dirname_info')
+    l10n('wrong filename'),
+    l10n('The name of directories and files must be composed of letters, numbers, \"-\", \"_\" or \".\"')
     ),
   'PWG-UPDATE-2' => array(
-    l10n('update_missing_tn_short'),
-    l10n('update_missing_tn_info').implode(',', $conf['picture_ext'])
+    l10n('missing thumbnail'),
+    l10n('a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :').implode(',', $conf['picture_ext'])
     ),
   'PWG-ERROR-NO-FS' => array(
-    l10n('update_missing_file_or_dir'),
-    l10n('update_missing_file_or_dir_info')
+    l10n('File/directory read error'),
+    l10n('The file or directory cannot be accessed (either it does not exist or the access is denied)')
     ),
   'PWG-ERROR-VERSION' => array(
-    l10n('update_err_pwg_version_differs'),
-    l10n('update_err_pwg_version_differs_info')
+    l10n('Piwigo version differs on the remote site'),
+    l10n('Version of create_listing_file.php on the remote site and Piwigo must be the same')
     ),
   'PWG-ERROR-NOLISTING' => array(
-    l10n('update_err_remote_listing_not_found'),
-    l10n('update_err_remote_listing_not_found_info')
+    l10n('listing.xml file was not found'),
+    l10n('listing.xml file was not found on the remote site. This file is generated by choosing the \"generate listing\" command in the Site manager')
     )
   );
@@ -279 +279 @@
         array(
           'path' => $fulldir,
-          'info' => l10n('update_research_added')
+          'info' => l10n('added')
           )
         );
@@ -328 +328 @@
     unset($db_fulldirs[$fulldir]);
     array_push($infos, array('path' => $fulldir,
-                             'info' => l10n('update_research_deleted')));
+                             'info' => l10n('deleted')));
   }
   if (count($to_delete) > 0)
@@ -474 +474 @@
         array(
           'path' => $insert['path'],
-          'info' => l10n('update_research_added')
+          'info' => l10n('added')
           )
         );
@@ -515 +515 @@
     array_push($to_delete_elements, array_search($path, $db_elements));
     array_push($infos, array('path' => $path,
-                             'info' => l10n('update_research_deleted')));
+                             'info' => l10n('deleted')));
   }
   if (count($to_delete_elements) > 0)
@@ -829 +829 @@
 if (isset($simulate) and $simulate)
 {
-  $result_title.= l10n('update_simulation_title').' ';
+  $result_title.= l10n('[Simulation]').' ';
 }
 
@@ -844 +844 @@
     'SITE_URL'=>$site_url,
     'U_SITE_MANAGER'=> get_root_url().'admin.php?page=site_manager',
-    'L_RESULT_UPDATE'=>$result_title.l10n('update_part_research'),
-    'L_RESULT_METADATA'=>$result_title.l10n('update_result_metadata'),
+    'L_RESULT_UPDATE'=>$result_title.l10n('Search for new images in the directories'),
+    'L_RESULT_METADATA'=>$result_title.l10n('Metadata synchronization results'),
     'METADATA_LIST' => $used_metadata,
     'U_HELP' => get_root_url().'popuphelp.php?page=synchronize',

trunk/admin/tags.php

@@ -68 +68 @@
           $page['errors'],
           sprintf(
-            l10n('Tag "%s" already exists'),
+            l10n('Tag \"%s\" already exists'),
             $tag_name
             )
@@ -165 +165 @@
       $page['infos'],
       sprintf(
-        l10n('Tag "%s" was added'),
+        l10n('Tag \"%s\" was added'),
         stripslashes($tag_name)
         )
@@ -175 +175 @@
       $page['errors'],
       sprintf(
-        l10n('Tag "%s" already exists'),
+        l10n('Tag \"%s\" already exists'),
         stripslashes($tag_name)
         )

trunk/admin/template/goto/admin.tpl

@@ -17 +17 @@
     <dd>
       <ul>
-        <li><a href="{$U_RETURN}">{'home'|@translate}</a></li>
-        <li><a href="{$U_FAQ}">{'instructions'|@translate}</a></li>
-        <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
-        <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
+        <li><a href="{$U_RETURN}">{'Home'|@translate}</a></li>
+        <li><a href="{$U_FAQ}">{'Instructions'|@translate}</a></li>
+        <li><a href="{$U_ADMIN}" title="{'Administration'|@translate}">{'Administration'|@translate}</a></li>
+        <li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>
 {if isset($pwgmenu)}
         <li class="external"><a class="external" href="{$pwgmenu.WIKI}" onclick="window.open(this.href, ''); 
-          return false;">{'WIKI / DOC'|@translate}</a></li>
+          return false;">{'Documentation'|@translate}</a></li>
         <li class="external"><a class="external" href="{$pwgmenu.FORUM}" onclick="window.open(this.href, '');
-          return false;">{'FORUM'|@translate}</a></li>
+          return false;">{'Support'|@translate}</a></li>
 {/if}
         
@@ -32 +32 @@
   </dl>
   <dl>
-    <dt class="rdion"><span>{'config'|@translate}&nbsp;</span></dt>
+    <dt class="rdion"><span>{'Configuration'|@translate}&nbsp;</span></dt>
     <dd>
       <ul>
-        <li><a href="{$U_CONFIG_GENERAL}">{'conf_general'|@translate}</a></li>
-        <li><a href="{$U_CONFIG_DISPLAY}">{'conf_display'|@translate}</a></li>
-        <li><a href="{$U_CONFIG_MENUBAR}">{'title_menu'|@translate}</a></li>
-        <li><a href="{$U_CONFIG_EXTENTS}">{'conf_extents'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_GENERAL}">{'General'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_DISPLAY}">{'Default display'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
       </ul>
     </dd>
@@ -47 +47 @@
       <ul>
         <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
-        <li><a href="{$U_CAT_UPDATE}">{'update'|@translate}</a></li>
-        <li><a href="{$U_CATEGORIES}">{'manage'|@translate}</a></li>
+        <li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
+        <li><a href="{$U_CATEGORIES}">{'Manage'|@translate}</a></li>
         <li><a href="{$U_MOVE}">{'Move'|@translate}</a></li>
-        <li><a href="{$U_CAT_OPTIONS}">{'cat_options_title'|@translate}</a></li>
+        <li><a href="{$U_CAT_OPTIONS}">{'Properties'|@translate}</a></li>
         <li><a href="{$U_PERMALINKS}">{'Permalinks'|@translate}</a></li>
       </ul>
@@ -59 +59 @@
     <dd>
       <ul>
-        <li><a href="{$U_WAITING}">{'waiting'|@translate}</a></li>
-        <li><a href="{$U_THUMBNAILS}">{'thumbnails'|@translate}</a></li>
+        <li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
+        <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
         <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
         <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
         <li><a href="{$U_CADDIE}">{'Caddie'|@translate}</a></li>
-        <li><a href="{$U_RECENT_SET}">{'recent_pics_cat'|@translate}</a></li>
+        <li><a href="{$U_RECENT_SET}">{'Recent pictures'|@translate}</a></li>
       </ul>
     </dd>
   </dl>
   <dl>
-    <dt class="rdion"><span>{'identification'|@translate}&nbsp;</span></dt>
+    <dt class="rdion"><span>{'Identification'|@translate}&nbsp;</span></dt>
     <dd>
       <ul>
-        <li><a href="{$U_USERS}">{'users'|@translate}</a></li>
-        <li><a href="{$U_GROUPS}">{'groups'|@translate}</a></li>
-        <li><a href="{$U_NOTIFICATION_BY_MAIL}">{'nbm_item_notification'|@translate}</a></li>
+        <li><a href="{$U_USERS}">{'Users'|@translate}</a></li>
+        <li><a href="{$U_GROUPS}">{'Groups'|@translate}</a></li>
+        <li><a href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
       </ul>
     </dd>
   </dl>
   <dl>
-    <dt class="rdion"><span>{'special_admin_menu'|@translate}&nbsp;</span></dt>
+    <dt class="rdion"><span>{'Specials'|@translate}&nbsp;</span></dt>
     <dd>
       <ul>
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
-        <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced_features'|@translate}</a></li>
+        <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced features'|@translate}</a></li>
         <li><a href="{$U_PLUGINS}">{'Plugins'|@translate}</a>
         {if !empty($plugin_menu_items)}

trunk/admin/template/goto/advanced_feature.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'Advanced_features'|@translate}</h2>
+  <h2>{'Advanced features'|@translate}</h2>
 </div>
 

trunk/admin/template/goto/cat_list.tpl

@@ -22 +22 @@
 </script>
 
-<h2>{'title_categories'|@translate}</h2>
+<h2>{'Categories management'|@translate}</h2>
 
 <h3>{$CATEGORIES_NAV}</h3>
@@ -28 +28 @@
 <form id="addVirtual" action="{$F_ACTION}" method="post">
   <p>
-    {'cat_add'|@translate} : <input type="text" name="virtual_name">
+    {'Add a virtual category'|@translate} : <input type="text" name="virtual_name">
     <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}>
     {if count($categories)>9 }
@@ -52 +52 @@
         <li><a href="{$category.U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}"></a></li>
         {/if}
-        <li><a href="{$category.U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
+        <li><a href="{$category.U_EDIT}" title="{'edit'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
         {if isset($category.U_MANAGE_ELEMENTS) }
-        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
+        <li><a href="{$category.U_MANAGE_ELEMENTS}" title="{'elements'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
         {/if}
-        <li><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
+        <li><a href="{$category.U_CHILDREN}" title="{'sub-categories'|@translate}"><img src="{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
         {if isset($category.U_MANAGE_PERMISSIONS) }
-        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}"></a></li>
+        <li><a href="{$category.U_MANAGE_PERMISSIONS}" title="{'Permissions'|@translate}" ><img src="{$themeconf.admin_icon_dir}/category_Permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
         {/if}
         {if isset($category.U_DELETE) }
-        <li><a href="{$category.U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li>
+        <li><a href="{$category.U_DELETE}" title="{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li>
         {/if}
       </ul>
@@ -69 +69 @@
       <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}">{$category.NAME}</a></strong>
       {if $category.IS_VIRTUAL}
-      <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'virtual_category'|@translate}">
+      <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'Virtual category'|@translate}">
       {/if}
       </p>

trunk/admin/template/goto/cat_modify.tpl

@@ -4 +4 @@
 
 <div class="titrePage">
-  <h2>{'title_edit_cat'|@translate}</h2>
+  <h2>{'Edit a category'|@translate}</h2>
 </div>
 
@@ -14 +14 @@
   {/if}
   {if isset($U_MANAGE_ELEMENTS) }
-  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
-  <li><a href="{$U_MANAGE_RANKS}" title="{'manage image ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
-  {/if}
-  <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
+  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}"></a></li>
+  <li><a href="{$U_MANAGE_RANKS}" title="{'ranks'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/ranks.png" class="button" alt="{'ranks'|@translate}"></a></li>
+  {/if}
+  <li><a href="{$U_CHILDREN}" title="{'sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}"></a></li>
   {if isset($U_MANAGE_PERMISSIONS) }
-  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}"></a></li>
+  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'Permissions'|@translate}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_Permissions.png" class="button" alt="{'Permissions'|@translate}"></a></li>
   {/if}
   {if isset($U_DELETE) }
-  <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li>
+  <li><a href="{$U_DELETE}" title="{'Are you sure?'|@translate|@escape:'javascript'}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}"></a></li>
   {/if}
 </ul>
@@ -34 +34 @@
     {if isset($CAT_FULL_DIR) }
     <tr>
-      <td><strong>{'storage'|@translate}</strong></td>
+      <td><strong>{'Directory'|@translate}</strong></td>
       <td class="row1">{$CAT_FULL_DIR}</td>
     </tr>
@@ -69 +69 @@
   <table>
     <tr>
-      <td><strong>{'conf_access'|@translate}</strong>
+      <td><strong>{'Access type'|@translate}</strong>
       <td>
         {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
@@ -75 +75 @@
     </tr>
     <tr>
-      <td><strong>{'lock'|@translate}</strong>
+      <td><strong>{'Lock'|@translate}</strong>
       <td>
         {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
@@ -81 +81 @@
     </tr>
     <tr>
-      <td><strong>{'comments'|@translate}</strong>
+      <td><strong>{'Comments'|@translate}</strong>
       <td>
         {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
@@ -88 +88 @@
     {if isset($SHOW_UPLOADABLE) }
     <tr>
-      <td><strong>{'editcat_uploadable'|@translate}</strong>
+      <td><strong>{'Authorize upload'|@translate}</strong>
       <td>
         {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE}
@@ -100 +100 @@
   <legend>{'Sort order'|@translate}</legend>
   <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT}>
-  <label for="image_order_default">{'Use default sort order'|@translate}</label>
+  <label for="image_order_default">{'Use the default image sort order (defined in the configuration file)'|@translate}</label>
   <br>
   <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
@@ -136 +136 @@
       <td>
         {if $representant.ALLOW_SET_RANDOM }
-        <p><input class="submit" type="submit" name="set_random_representant" value="{'cat_representant'|@translate}" {$TAG_INPUT_ENABLED}></p>
+        <p><input class="submit" type="submit" name="set_random_representant" value="{'Find a new representant by random'|@translate}" {$TAG_INPUT_ENABLED}></p>
         {/if}
 
@@ -214 +214 @@
     </tr>
     <tr>
-      <td><strong>{'mail_content'|@translate}</strong></td>
+      <td><strong>{'Mail content'|@translate}</strong></td>
       <td>
         <textarea cols="50" rows="5" name="mail_content" id="mail_content" class="description">{$MAIL_CONTENT}</textarea>

trunk/admin/template/goto/cat_options.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'cat_options_title'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Properties'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 

trunk/admin/template/goto/check_integrity.tpl

@@ -1 +1 @@
 <dl>
-  <dt>{'c13y_title'|@translate}</dt>
+  <dt>{'Check integrity'|@translate}</dt>
   <dd>
     <ul>
@@ -8 +8 @@
           <tr class="throw">
             <th></th>
-            <th>{'c13y_Anomaly'|@translate}</th>
-            <th>{'c13y_Correction'|@translate}</th>
+            <th>{'Anomaly'|@translate}</th>
+            <th>{'Correction'|@translate}</th>
           </tr>
           {if isset($c13y_list)}
@@ -23 +23 @@
                   <label for="c13y_selection-{$c13y.id}">
                     {if $c13y.show_ignore_msg}
-                      {'c13y_ignore_msg1'|@translate}
+                      {'The anomaly will be ignored until next application version'|@translate}
                       <br>
-                      {'c13y_ignore_msg2'|@translate}
+                      {'Correction the anomaly will cancel the fact that it\'s ignored'|@translate}
                     {/if}
                     {if $c13y.show_correction_fct}
-                      {'c13y_Automatic_correction'|@translate}
+                      {'Automatic correction'|@translate}
                     {/if}
                     {if $c13y.show_correction_bad_fct}
-                      {'c13y_Impossible_automatic_correction'|@translate}
+                      {'Impossible automatic correction'|@translate}
                     {/if}
                     {if $c13y.show_correction_success_fct}
-                      {'c13y_Correction_applied_success'|@translate}
+                      {'Correction applied with success'|@translate}
                     {/if}
                     {if !empty($c13y.correction_error_fct)}
-                      {'c13y_Correction_applied_error'|@translate}
+                      {'Correction applied with error'|@translate}
                       <br>
                       {$c13y.c13y.correction_error_fct}
@@ -64 +64 @@
               document.getElementById('c13y_selection-{$ID}').checked = true;
             {/foreach}
-            return false;">{'c13y_check_auto'|@translate}</a>
+            return false;">{'Check automatic corrections'|@translate}</a>
           {/if}
         </p>
@@ -70 +70 @@
         <p>
           {if $c13y_show_submit_automatic_correction}
-            <input class="submit" type="submit" value="{'c13y_submit_correction'|@translate}" name="c13y_submit_correction" {$TAG_INPUT_ENABLED}>
+            <input class="submit" type="submit" value="{'Apply selected corrections'|@translate}" name="Apply selected corrections" {$TAG_INPUT_ENABLED}>
           {/if}
           {if $c13y_show_submit_ignore}
-            <input class="submit" type="submit" value="{'c13y_submit_ignore'|@translate}" name="c13y_submit_ignore" {$TAG_INPUT_ENABLED}>
+            <input class="submit" type="submit" value="{'Ignore selected anomalies'|@translate}" name="Ignore selected anomalies" {$TAG_INPUT_ENABLED}>
           {/if}
-          <input class="submit" type="submit" value="{'c13y_submit_refresh'|@translate}" name="c13y_submit_refresh">
+          <input class="submit" type="submit" value="{'Refresh'|@translate}" name="Refresh">
           </p>
 

trunk/admin/template/goto/comments.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Waiting'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 

trunk/admin/template/goto/configuration.tpl

@@ -3 +3 @@
 
 <div class="titrePage">
-  <h2>{'title_configuration'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Piwigo configuration'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
@@ -70 +70 @@
     <li>
       <label>
-        <span class="property">{'obligatory_user_mail_address'|@translate}</span>
+        <span class="property">{'Mail address is obligatory for all users'|@translate}</span>
         <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if}>
       </label>
@@ -77 +77 @@
     <li>
       <label>
-        <span class="property">{'Email administrators when a new user registers'|@translate}</span>
+        <span class="property">{'Email admins when a new user registers'|@translate}</span>
         <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}>
       </label>
@@ -90 +90 @@
   <ul>
       <li>
-        <label><span class="property">{'conf_history_guest'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if}></label>
+        <label><span class="property">{'Save page visits by guests'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if}></label>
       </li>
 
       <li>
-        <label><span class="property">{'conf_history_user'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if}></label>
+        <label><span class="property">{'Save page visits by users'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if}></label>
       </li>
 
       <li>
-        <label><span class="property">{'conf_history_admin'|@translate}</span><input type="checkbox" name="history_admin" {if ($history.history_admin)}checked="checked"{/if}></label>
+        <label><span class="property">{'Save page visits by administrators'|@translate}</span><input type="checkbox" name="history_admin" {if ($history.history_admin)}checked="checked"{/if}></label>
       </li>
   </ul>
@@ -133 +133 @@
     <li>
       <label>
-        <span class="property">{'Email administrators when a valid comment is entered'|@translate}</span>
+        <span class="property">{'Email admins when a valid comment is entered'|@translate}</span>
         <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if}>
       </label>
@@ -140 +140 @@
     <li>
       <label>
-        <span class="property">{'Email administrators when a comment requires validation'|@translate}</span>
+        <span class="property">{'Email admins when a comment requires validation'|@translate}</span>
         <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if}>
       </label>
@@ -189 +189 @@
     <li>
       <label>
-        <span class="property">{'Email administrators when a picture is uploaded'|@translate}</span>
+        <span class="property">{'Email admins when a picture is uploaded'|@translate}</span>
         <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if}>
       </label>

trunk/admin/template/goto/extend_for_templates.tpl

@@ -1 @@
-<div class="titrePage"><h2>{'extend_for_templates'|@translate}</h2>
+<div class="titrePage"><h2>{'Extend for templates'|@translate}</h2>
 </div>
 {if isset($extents)}
-<h4>{'Replacement of original templates'|@translate}</h4>
+<h4>{'Replacement of original templates by customized templates from template-extension subfolder'|@translate}</h4>
 <form method="post" name="extend_for_templates" id="extend_for_templates" action="">
   <table class="table2">
     <tr class="throw">
-      <th>{'Replacers'|@translate}</th>
+      <th>{'Replacers (customized templates)'|@translate}</th>
       <th>{'Original templates'|@translate}</th>
       <th>{'Optional URL keyword'|@translate}</th>

trunk/admin/template/goto/footer.tpl

@@ -6 +6 @@
  <a name="EoP"></a> <!-- End of ADMIN Page -->
  {if isset($debug.TIME) }
- {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
+ {'SQL queries in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
  {/if}
 
@@ -14 +14 @@
   *}
 
-  {'powered_by'|@translate}
+  {'Powered by'|@translate}
   <a href="{$PHPWG_URL}" class="Piwigo">
   <span class="Piwigo">Piwigo</span></a>
   {$VERSION}
   {if isset($CONTACT_MAIL)}
-  - {'send_mail'|@translate}
+  - {'Contact'|@translate}
   <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
   {/if}

trunk/admin/template/goto/group_list.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'title_groups'|@translate}</h2>
+  <h2>{'Group management'|@translate}</h2>
 </div>
 
@@ -31 +31 @@
     <td style="text-align:center;">
       <a href="{$group.U_PERM}">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
       <a href="{$group.U_DELETE}" onclick="return confirm('{'delete'|@translate|@escape:'javascript'}' + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none" alt="{'delete'|@translate}" title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Delete.png" class="button" style="border:none" alt="{'Delete'|@translate}" title="{'Delete'|@translate}" {$TAG_INPUT_ENABLED}></a>
       <a href="{$group.U_ISDEFAULT}" onclick="return confirm('{'toggle_is_default_group'|@translate|@escape:'javascript'}' +'\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
-        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/toggle_is_default_group.png" class="button" style="border:none" alt="{'toggle_is_default_group'|@translate}" title="{'toggle_is_default_group'|@translate}" {$TAG_INPUT_ENABLED}></a>
+        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Toggle \'default group\' property.png" class="button" style="border:none" alt="{'Toggle \'default group\' property'|@translate}" title="{'Toggle \'default group\' property'|@translate}" {$TAG_INPUT_ENABLED}></a>
     </td>
   </tr>

trunk/admin/template/goto/history.tpl

@@ -17 +17 @@
   <legend>{'Filter'|@translate}</legend>
   <ul>
-    <li><label>{'search_date_from'|@translate}</label></li>
+    <li><label>{'Date'|@translate}</label></li>
     <li>
       <select id="start_day" name="start_day">
@@ -33 +33 @@
   </ul>
   <ul>
-    <li><label>{'search_date_to'|@translate}</label></li>
+    <li><label>{'End-Date'|@translate}</label></li>
     <li>
       <select id="end_day" name="end_day">
@@ -107 +107 @@
 <tr class="throw">
   <th>{'Date'|@translate}</th>
-  <th>{'time'|@translate}</th>
-  <th>{'user'|@translate}</th>
+  <th>{'Time'|@translate}</th>
+  <th>{'User'|@translate}</th>
   <th>{'IP'|@translate}</th>
-  <th>{'image'|@translate}</th>
+  <th>{'Element'|@translate}</th>
   <th>{'Element type'|@translate}</th>
-  <th>{'section'|@translate}</th>
-  <th>{'category'|@translate}</th>
-  <th>{'tags'|@translate}</th>
+  <th>{'Section'|@translate}</th>
+  <th>{'Category'|@translate}</th>
+  <th>{'Tags'|@translate}</th>
 </tr>
 {if !empty($search_results) }

trunk/admin/template/goto/install.tpl

@@ -71 +71 @@
   <table class="table2">
     <tr class="throw">
-      <th colspan="2">{'Initial_config'|@translate}</th>
+      <th colspan="2">{'Basic configuration'|@translate}</th>
     </tr>
     <tr>
-      <td style="width: 30%">{'Default_lang'|@translate}</td>
+      <td style="width: 30%">{'Default gallery language'|@translate}</td>
       <td>
     <select name="language" onchange="document.location = 'install.php?language='+this.options[this.selectedIndex].value;">
@@ -84 +84 @@
   <table class="table2">
     <tr class="throw">
-      <th colspan="3">{'step1_title'|@translate}</th>
+      <th colspan="3">{'Database configuration'|@translate}</th>
     </tr>
     {if count($F_DB_ENGINES)>1}
     <tr>
-      <td style="width: 30%;">{'step1_dbengine'|@translate}</td>
+      <td style="width: 30%;">{'Database type'|@translate}</td>
       <td>
         <select name="dblayer" id="dblayer">
@@ -99 +99 @@
         </select>    
       </td>
-      <td>{'step1_dbengine_info'|@translate}</td>
+      <td>{'The type of database your piwigo data will be store in'|@translate}</td>
     {else}
     <td colspan="3">
@@ -107 +107 @@
     </tr>
     <tr>
-      <td style="width: 30%;">{'step1_host'|@translate}</td>
+      <td style="width: 30%;">{'Host'|@translate}</td>
       <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}"></td>
-      <td>{'step1_host_info'|@translate}</td>
+      <td>{'localhost, sql.multimania.com, toto.freesurf.fr'|@translate}</td>
     </tr>
     <tr>
-      <td>{'step1_user'|@translate}</td>
+      <td>{'User'|@translate}</td>
       <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}"></td>
-      <td>{'step1_user_info'|@translate}</td>
+      <td>{'user login given by your host provider'|@translate}</td>
     </tr>
     <tr>
-      <td>{'step1_pass'|@translate}</td>
+      <td>{'Password'|@translate}</td>
       <td align=center><input type="password" name="dbpasswd" value=""></td>
-      <td>{'step1_pass_info'|@translate}</td>
+      <td>{'user password given by your host provider'|@translate}</td>
     </tr>
     <tr>
-      <td>{'step1_database'|@translate}</td>
+      <td>{'Database name'|@translate}</td>
       <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}"></td>
-      <td>{'step1_database_info'|@translate}</td>
+      <td>{'also given by your host provider'|@translate}</td>
     </tr>
     <tr>
-      <td>{'step1_prefix'|@translate}</td>
+      <td>{'Database table prefix'|@translate}</td>
       <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}"></td>
-      <td>{'step1_prefix_info'|@translate}</td>
+      <td>{'database tables names will be prefixed with it (enables you to manage better your tables)'|@translate}</td>
     </tr>
   </table>
@@ -135 +135 @@
   <table class="table2">
     <tr class="throw">
-      <th colspan="3">{'step2_title'|@translate}</th>
+      <th colspan="3">{'Admin configuration'|@translate}</th>
     </tr>
     <tr>
-      <td style="width: 30%;">{'install_webmaster'|@translate}</td>
+      <td style="width: 30%;">{'Webmaster login'|@translate}</td>
       <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}"></td>
-      <td>{'install_webmaster_info'|@translate}</td>
+      <td>{'It will be shown to the visitors. It is necessary for website administration'|@translate}</td>
     </tr>
     <tr>
-      <td>{'step2_pwd'|@translate}</td>
+      <td>{'Webmaster password'|@translate}</td>
       <td align="center"><input type="password" name="admin_pass1" value=""></td>
-      <td>{'step2_pwd_info'|@translate}</td>
+      <td>{'Keep it confidential, it enables you to access administration panel'|@translate}</td>
     </tr>
     <tr>
-      <td>{'step2_pwd_conf'|@translate}</td>
+      <td>{'Password [confirm]'|@translate}</td>
       <td align="center"><input type="password" name="admin_pass2" value=""></td>
-      <td>{'step2_pwd_conf_info'|@translate}</td>
+      <td>{'verification'|@translate}</td>
     </tr>
     <tr>
-      <td>{'conf_mail_webmaster'|@translate}</td>
+      <td>{'Webmaster mail address'|@translate}</td>
       <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}"></td>
-      <td>{'conf_mail_webmaster_info'|@translate}</td>
+      <td>{'Visitors will be able to contact site administrator with this mail'|@translate}</td>
     </tr>
   </table>
@@ -162 +162 @@
     <tr>
       <td style="text-align: center;">
-        <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}">
+        <input class="submit" type="submit" name="install" value="{'Start Install'|@translate}">
       </td>
     </tr>
@@ -169 +169 @@
 {else}
 <p>
-  <input type="button" name="home" value="{'home'|@translate}" onClick="window.open('index.php');">
-  <input type="button" name="admin" value="{'admin'|@translate}" onClick="window.open('admin.php');">
+  <input type="button" name="Home" value="{'Home'|@translate}" onClick="window.open('index.php');">
+  <input type="button" name="Administration" value="{'Administration'|@translate}" onClick="window.open('Administration.php');">
 </p>
 
@@ -176 +176 @@
 <div class="infos">
   <ul>
-    <li>{'Subscribe to Piwigo Announcements Newsletter'|@translate}</li>
+    <li>{'Keep in touch with Piwigo project, subscribe to Piwigo Announcement Newsletter. You will receive emails when a new release is available (sometimes including a security bug fix, it\'s important to know and upgrade) and when major events happen to the project. Only a few emails a year.'|@translate}</li>
   </ul>
 </div>

trunk/admin/template/goto/intro.tpl

@@ -11 +11 @@
 </script>
 
-<h2>{'title_default'|@translate}</h2>
+<h2>{'Piwigo administration'|@translate}</h2>
 <dl style="padding-top: 30px;">
   <dt>{'Piwigo version'|@translate}</dt>

trunk/admin/template/goto/maintenance.tpl

@@ -4 +4 @@
 
 <ul>
-  <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'update categories informations'|@translate}</a></li>
-  <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'update images informations'|@translate}</a></li>
-  <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'repair and optimize database'|@translate}</a></li>
+  <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update categories informations'|@translate}</a></li>
+  <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'Update images informations'|@translate}</a></li>
+  <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'Repair and optimize database'|@translate}</a></li>
 </ul>
 
 <ul>
-  <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history detail'|@translate}</a></li>
-  <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history summary'|@translate}</a></li>
-  <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'purge sessions'|@translate}</a></li>
-  <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'purge never used notification feeds'|@translate}</a></li>
-  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
+  <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge history detail'|@translate}</a></li>
+  <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge history summary'|@translate}</a></li>
+  <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'Purge sessions'|@translate}</a></li>
+  <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'Purge never used notification feeds'|@translate}</a></li>
+  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
   <li><a href="{$U_MAINT_COMPILED_TEMPLATES}" {$TAG_INPUT_ENABLED}>{'Purge compiled templates'|@translate}</a></li>
 </ul>
 
 <ul>
-  <li><a href="{$U_MAINT_C13Y}" {$TAG_INPUT_ENABLED}>{'c13y_maintenance'|@translate}</a></li>
+  <li><a href="{$U_MAINT_C13Y}" {$TAG_INPUT_ENABLED}>{'Reinitialize check integrity'|@translate}</a></li>
 </ul>

trunk/admin/template/goto/navigation_bar.tpl

@@ -1 +1 @@
 <div class="navigationBar">
   {if isset($navbar.URL_FIRST)}
-  <a href="{$navbar.URL_FIRST}" rel="first">{'first_page'|@translate}</a> |
-  <a href="{$navbar.URL_PREV}" rel="prev">{'previous_page'|@translate}</a> |
+  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
+  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
   {else}
-  {'first_page'|@translate} |
-  {'previous_page'|@translate} |
+  {'First'|@translate} |
+  {'Previous'|@translate} |
   {/if}
 
@@ -20 +20 @@
 
   {if isset($navbar.URL_NEXT)}
-  | <a href="{$navbar.URL_NEXT}" rel="next">{'next_page'|@translate}</a>
-  | <a href="{$navbar.URL_LAST}" rel="last">{'last_page'|@translate}</a>
+  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
+  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
   {else}
-  | {'next_page'|@translate}
-  | {'last_page'|@translate}
+  | {'Next'|@translate}
+  | {'Last'|@translate}
   {/if}
 </div>

trunk/admin/template/goto/notification_by_mail.tpl

@@ -3 +3 @@
 
 <div class="titrePage">
-  <h2>{'nbm_send_mail_to_users'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Send mail to users'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
@@ -10 +10 @@
   <fieldset>
     <div class="infos">
-      <input class="submit" type="submit" value="{'nbm_repost_submit'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" value="{'Continue processing treatment'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}>
     </div>
   </fieldset>
@@ -17 +17 @@
   {if isset($param)}
   <fieldset>
-    <legend>{'nbm_title_param'|@translate}</legend>
+    <legend>{'Parameters'|@translate}</legend>
     <table>
       <tr>
-        <td><label>{'nbm_send_html_mail'|@translate}</label></td>
+        <td><label>{'Send mail on HTML format'|@translate}</label></td>
         <td>
           <label><input type="radio" name="nbm_send_html_mail" value="true"  {if $param.SEND_HTML_MAIL}checked="checked"{/if}>{'Yes'|@translate}</label>
@@ -28 +28 @@
       <tr>
         <td>
-          <label for="send_mail_as">{'nbm_send_mail_as'|@translate}</label>
-          <br><i><small>{'nbm_info_send_mail_as'|@translate}</small></i>
+          <label for="send_mail_as">{'Send mail as'|@translate}</label>
+          <br><i><small>{'With blank value, gallery title will be used'|@translate}</small></i>
         </td>
         <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{$param.SEND_MAIL_AS}"></td>
       </tr>
       <tr>
-        <td><label>{'nbm_send_detailed_content'|@translate}</label></td>
+        <td><label>{'Add detailed content'|@translate}</label></td>
         <td>
           <label><input type="radio" name="nbm_send_detailed_content" value="true"  {if $param.SEND_DETAILED_CONTENT}checked="checked"{/if}>{'Yes'|@translate}</label>
@@ -41 +41 @@
       </tr>
      <tr>
-        <td><label for="complementary_mail_content">{'nbm_complementary_mail_content'|@translate}</label></td>
+        <td><label for="complementary_mail_content">{'Complementary mail content'|@translate}</label></td>
         <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{$param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
       </tr>
       <tr>
         <td>
-          <label>{'nbm_send_recent_post_dates'|@translate}</label>
-          <br><i><small>{'nbm_info_send_recent_post_dates'|@translate}</small></i>
+          <label>{'Include display of recent pictures group by dates'|@translate}</label>
+          <br><i><small>{'Available only with HTML format'|@translate}</small></i>
         </td>
         <td>
@@ -65 +65 @@
   {if isset($subscribe)}
   <fieldset>
-    <legend>{'nbm_title_subscribe'|@translate}</legend>
-    <p><i>{'nbm_warning_subscribe_unsubscribe'|@translate}</i></p>
+    <legend>{'Subscribe/unsubscribe users'|@translate}</legend>
+    <p><i>{'Warning: subscribing or unsubscribing will send mails to users'|@translate}</i></p>
     {$DOUBLE_SELECT}
   </fieldset>
@@ -73 +73 @@
   {if isset($send)}
     {if empty($send.users)}
-    <p>{'nbm_no_user_available_to_send_L1'|@translate}</p>
+    <p>{'There is no available subscribers to mail.'|@translate}</p>
     <p>
-    {'nbm_no_user_available_to_send_L2'|@translate}<br>
-    {'nbm_no_user_available_to_send_L3'|@translate}
+    {'Subscribers could be listed (available) only if there is new elements to notify.'|@translate}<br>
+    {'Anyway only webmasters can see this tab and never administrators.'|@translate}
     </p>
     {else}
     <fieldset>
-      <legend>{'nbm_title_send'|@translate}</legend>
+      <legend>{'Select recipients'|@translate}</legend>
       <table class="table2">
         <tr class="throw">
-          <th>{'nbm_col_user'|@translate}</th>
-          <th>{'nbm_col_mail'|@translate}</th>
-          <th>{'nbm_col_last_send'|@translate}</th>
-          <th>{'nbm_col_check_user_send_mail'|@translate}</th>
+          <th>{'User'|@translate}</th>
+          <th>{'email'|@translate}</th>
+          <th>{'Last send'|@translate}</th>
+          <th>{'To send ?'|@translate}</th>
         </tr>
         {foreach from=$send.users item=u name=user_loop}
@@ -104 +104 @@
 
     <fieldset>
-      <legend>{'nbm_send_options'|@translate}</legend>
+      <legend>{'Options'|@translate}</legend>
       <table>
        <tr>
-          <td><label for="send_customize_mail_content">{'nbm_send_complementary_mail_content'|@translate}</label></td>
+          <td><label for="send_customize_mail_content">{'Complementary mail content'|@translate}</label></td>
           <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{$send.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
         </tr>
@@ -114 +114 @@
 
     <p>
-      <input class="submit" type="submit" value="{'nbm_send_submit'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" value="{'Send'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}>
     </p>
     {/if}

trunk/admin/template/goto/permalinks.tpl

@@ -61 +61 @@
                 <td>{$permalink.last_hit}</td>
                 <td>{$permalink.hit}</td>
-                <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/delete.png" alt="[{'delete'|@translate}]" class="button"></a></td>
+                <td><a href="{$permalink.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Delete.png" alt="[{'Delete'|@translate}]" class="button"></a></td>
         </tr>
 {/foreach}

trunk/admin/template/goto/picture_modify.tpl

@@ -10 +10 @@
 {/literal}
 
-<h2>{'title_picmod'|@translate}</h2>
-
-<img src="{$TN_SRC}" alt="{'thumbnail'|@translate}" class="thumbnail">
+<h2>{'Modify informations about a picture'|@translate}</h2>
+
+<img src="{$TN_SRC}" alt="{'Thumbnail'|@translate}" class="Thumbnail">
 
 <ul class="categoryActions">
@@ -19 +19 @@
   {/if}
   {if !url_is_remote($path)}
-  <li><a href="{$U_SYNC}" title="{'synchronize metadata'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li>
+  <li><a href="{$U_SYNC}" title="{'synchronize'|@translate}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/sync_metadata.png" class="button" alt="{'synchronize'|@translate}"></a></li>
   {/if}
 </ul>

trunk/admin/template/goto/plugins_list.tpl

@@ -71 +71 @@
       <li>
         <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'plugins_confirm_delete'|@translate|@escape:'javascript'}');">
-          <img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}">
+          <img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}">
         </a>
       </li>
     {else}
       <li>
-        <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}">
+        <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}">
       </li>
     {/if}

trunk/admin/template/goto/plugins_new.tpl

@@ -40 +40 @@
     <td>{$plugin.AUTHOR}</td>
     <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a>
-      / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a>
+      / <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a>
     </td>
   </tr>

trunk/admin/template/goto/plugins_update.tpl

@@ -17 +17 @@
 {if isset($plugins_not_uptodate)}
 <br>
-<b>{'plugins_need_update'|@translate}</b>
+<b>{'Plugins which need upgrade'|@translate}</b>
 <table class="table2 plugins">
 <thead>
   <tr class="throw">
     <td>{'Name'|@translate}</td>
-    <td>{'plugins_actual_version'|@translate}</td>
-    <td>{'plugins_new_version'|@translate}</td>
+    <td>{'Current<br>version'|@translate}</td>
+    <td>{'Available<br>version'|@translate}</td>
     <td>{'Actions'|@translate}</td>
   </tr>
@@ -33 +33 @@
     <td style="text-align:center;"><a href="{$plugin.EXT_URL}" onclick="window.open(this.href); return false;" class="cluetip" title="{$plugin.EXT_NAME}|{$plugin.NEW_VER_DESC|htmlspecialchars|nl2br}">{$plugin.NEW_VERSION}</a></td>
     <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a>
-      / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a></td>
+      / <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a></td>
   </tr>
 {/foreach}
@@ -42 +42 @@
 {if isset($plugins_uptodate)}
 <br>
-<b>{'plugins_dontneed_update'|@translate}</b>
+<b>{'Plugins up to date'|@translate}</b>
 <table class="table2 plugins">
 <thead>
@@ -62 +62 @@
 {if isset($plugins_cant_check)}
 <br>
-<b>{'plugins_cant_check'|@translate}</b>
+<b>{'Plugin versions can\'t be checked'|@translate}</b>
 <table class="table2 plugins">
 <thead>

trunk/admin/template/goto/profile_content.tpl

@@ -26 +26 @@
       <li>
         <span class="property">
-          <label for="use_new_pwd">{'new_password'|@translate}</label>
+          <label for="use_new_pwd">{'New password'|@translate}</label>
         </span>
         <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
@@ -41 +41 @@
 
   <fieldset>
-    <legend>{'preferences'|@translate}</legend>
+    <legend>{'Preferences'|@translate}</legend>
 
     <ul>
       <li>
         <span class="property">
-          <label for="nb_image_line">{'nb_image_per_row'|@translate}</label>
+          <label for="nb_image_line">{'Number of images per row'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
@@ -52 +52 @@
       <li>
         <span class="property">
-          <label for="nb_line_page">{'nb_row_per_page'|@translate}</label>
+          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
@@ -58 +58 @@
       <li>
         <span class="property">
-          <label for="template">{'theme'|@translate}</label>
+          <label for="template">{'Interface theme'|@translate}</label>
         </span>
         {html_options id=template name=template options=$template_options selected=$template_selection}
@@ -64 +64 @@
       <li>
         <span class="property">
-          <label for="language">{'language'|@translate}</label>
+          <label for="Language">{'Language'|@translate}</label>
         </span>
         {html_options id=language name=language options=$language_options selected=$language_selection}
@@ -70 +70 @@
       <li>
         <span class="property">
-          <label for="recent_period">{'recent_period'|@translate}</label>
+          <label for="Recent period">{'Recent period'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
       </li>
       <li>
-        <span class="property">{'auto_expand'|@translate}</span>
+        <span class="property">{'Expand all categories'|@translate}</span>
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
       <li>
-        <span class="property">{'show_nb_comments'|@translate}</span>
+        <span class="property">{'Show number of comments'|@translate}</span>
         {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
       </li>
       <li>
-        <span class="property">{'show_nb_hits'|@translate}</span>
+        <span class="property">{'Show number of hits'|@translate}</span>
         {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
       </li>
       <li>
         <span class="property">
-          <label for="maxwidth">{'maxwidth'|@translate}</label>
+          <label for="Maximum width of the pictures">{'Maximum width of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
@@ -94 +94 @@
       <li>
         <span class="property">
-          <label for="maxheight">{'maxheight'|@translate}</label>
+          <label for="Maximum height of the pictures">{'Maximum height of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">

trunk/admin/template/goto/rating.tpl

@@ -1 @@
-<h2>{'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
+<h2>{'elements'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
 
 <form action="{$F_ACTION}" method="GET" id="update" class="filter">
@@ -59 +59 @@
     <td><b>{$rate.USER}</b></td>
     <td><span class="date">{$rate.DATE}</span></td>
-    <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'delete'|@translate}]"></a></td>
+    <td><a href="{$rate.U_DELETE}" {$TAG_INPUT_ENABLED}><img src="{$themeconf.admin_icon_dir}/Delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{'Delete'|@translate}]"></a></td>
 </tr>
 {/foreach} {*rates*}

trunk/admin/template/goto/site_manager.tpl

@@ -14 +14 @@
 
 {if isset($local_listing)}
-{'remote_site_local_found'|@translate} {$local_listing.URL}
+{'A local listing.xml file has been found for '|@translate} {$local_listing.URL}
 {if isset($local_listing.CREATE)}
 <form action="{$F_ACTION}" method="post">
   <p>
-    {'remote_site_local_create'|@translate}:
+    {'Create this site'|@translate}:
     <input type="hidden" name="no_check" value="1">
     <input type="hidden" name="galleries_url" value="{$local_listing.URL}">
@@ -26 +26 @@
 {/if}
 {if isset($local_listing.U_SYNCHRONIZE)}
-&nbsp;<a href="{$local_listing.U_SYNCHRONIZE}" title="{'remote_site_local_update'|@translate}">{'site_synchronize'|@translate}</a>
+&nbsp;<a href="{$local_listing.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>
 <br><br>
 {/if}
@@ -34 +34 @@
 <table class="table2">
         <tr class="throw">
-                <td>{'site_local'|@translate} / {'site_remote'|@translate}</td>
+                <td>{'Remote'|@translate} / {'Remote'|@translate}</td>
                 <td>{'Actions'|@translate}</td>
         </tr>
@@ -41 +41 @@
     <a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})
   </td><td>
-    [<a href="{$site.U_SYNCHRONIZE}" title="{'site_synchronize_hint'|@translate}">{'site_synchronize'|@translate}</a>]
+    [<a href="{$site.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>]
     {if isset($site.U_DELETE)}
       [<a href="{$site.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|escape:'javascript'}');"
-                title="{'site_delete_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'site_delete'|@translate}</a>]
+                title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}>{'delete'|@translate}</a>]
     {/if}
     {if isset($site.remote)}
       <br>
-      [<a href="{$site.remote.U_TEST}" title="{'remote_site_test_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_test'|@translate}</a>]
-      [<a href="{$site.remote.U_GENERATE}" title="{'remote_site_generate_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_generate'|@translate}</a>]
-      [<a href="{$site.remote.U_CLEAN}" title="{'remote_site_clean_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_clean'|@translate}</a>]
+      [<a href="{$site.remote.U_TEST}" title="{'test'|@translate}" {$TAG_INPUT_ENABLED}>{'test'|@translate}</a>]
+      [<a href="{$site.remote.U_GENERATE}" title="{'generate listing'|@translate}" {$TAG_INPUT_ENABLED}>{'generate listing'|@translate}</a>]
+      [<a href="{$site.remote.U_CLEAN}" title="{'clean'|@translate}" {$TAG_INPUT_ENABLED}>{'clean'|@translate}</a>]
     {/if}
     {if not empty($site.plugin_links)}
@@ -65 +65 @@
 <form action="{$F_ACTION}" method="post">
   <p>
-    <label for="galleries_url" >{'site_create'|@translate}</label>
+    <label for="galleries_url" >{'Create a new site : (give its URL to create_listing_file.php)'|@translate}</label>
     <input type="text" name="galleries_url" id="galleries_url">
   </p>

trunk/admin/template/goto/site_update.tpl

@@ -3 +3 @@
 
 <div class="titrePage">
-  <h2>{'title_update'|@translate}: <a href="{$SITE_URL}">{$SITE_URL}</a></h2>
+  <h2>{'Database synchronization with files'|@translate}: <a href="{$SITE_URL}">{$SITE_URL}</a></h2>
 </div>
 
@@ -9 +9 @@
 <h3>{$L_RESULT_UPDATE}</h3>
 <ul>
-  <li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'update_nb_new_categories'|@translate}</li>
-  <li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'update_nb_new_elements'|@translate}</li>
-  <li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'update_nb_del_categories'|@translate}</li>
-  <li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'update_nb_del_elements'|@translate}</li>
-  <li>{$update_result.NB_UPD_ELEMENTS} {'update_nb_upd_elements'|@translate}</li>
-  <li class="update_summary_err">{$update_result.NB_ERRORS} {'update_nb_errors'|@translate}</li>
+  <li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}</li>
+  <li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}</li>
+  <li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}</li>
+  <li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}</li>
+  <li>{$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}</li>
+  <li class="update_summary_err">{$update_result.NB_ERRORS} {'errors during synchronization'|@translate}</li>
 </ul>
 {/if}
@@ -21 +21 @@
 <h3>{$L_RESULT_METADATA}</h3>
 <ul>
-  <li>{$metadata_result.NB_ELEMENTS_DONE} {'update_nb_elements_metadata_sync'|@translate}</li>
-  <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'update_nb_elements_metadata_available'|@translate}</li>
-  <li>{'update_used_metadata'|@translate} : {$METADATA_LIST}</li>
+  <li>{$metadata_result.NB_ELEMENTS_DONE} {'elements informations synchronized with files metadata'|@translate}</li>
+  <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'images candidates for metadata synchronization'|@translate}</li>
+  <li>{'Used metadata'|@translate} : {$METADATA_LIST}</li>
 </ul>
 {/if}
@@ -29 +29 @@
 
 {if not empty($sync_errors)}
-<h3>{'update_error_list_title'|@translate}</h3>
+<h3>{'Error list'|@translate}</h3>
 <div class="errors">
 <ul>
@@ -37 +37 @@
 </ul>
 </div>
-<h3>{'update_errors_caption'|@translate}</h3>
+<h3>{'Errors caption'|@translate}</h3>
 <ul>
   {foreach from=$sync_error_captions item=caption}
@@ -46 +46 @@
 
 {if not empty($sync_infos)}
-<h3>{'update_infos_title'|@translate}</h3>
+<h3>{'Detailed informations'|@translate}</h3>
 <div class="infos">
 <ul>
@@ -57 +57 @@
 
 {if isset($introduction)}
-<h4>{'update_default_title'|@translate}</h4>
+<h4>{'Choose an option'|@translate}</h4>
 <form action="" method="post" id="update">
 
         <fieldset id="syncFiles">
-                <legend>{'update_sync_files'|@translate}</legend>
+                <legend>{'synchronize files structure with database'|@translate}</legend>
                 <ul>
                         <li><label><input type="radio" name="sync" value="" {if empty($introduction.sync)}checked="checked"{/if}> {'nothing'|@translate}</label></li>
-                        <li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}> {'update_sync_dirs'|@translate}</label></li>
+                        <li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}> {'only directories'|@translate}</label></li>
 
-                        <li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'update_sync_all'|@translate}</label>
+                        <li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'directories + files'|@translate}</label>
                                 <ul style="padding-left:3em">
-                                        <li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'update_display_info'|@translate}</label></li>
+                                        <li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'display maximum informations (added categories and elements, deleted categories and elements)'|@translate}</label></li>
                                         <li><label><input type="checkbox" name="add_to_caddie" value="1" {if $introduction.add_to_caddie}checked="checked"{/if}> {'add new elements to caddie'|@translate}</label></li>
                                         <li><label>{'Minimum privacy level'|@translate} <select name="privacy_level">{html_options options=$introduction.privacy_level_options selected=$introduction.privacy_level_selected}</select></label></li>
@@ -77 +77 @@
 
         <fieldset id="syncMetadata">
-                <legend>{'update_sync_metadata'|@translate}</legend>
+                <legend>{'synchronize files metadata with database elements informations'|@translate}</legend>
                 <label><input type="checkbox" name="sync_meta" {if $introduction.sync_meta}checked="checked"{/if}> {'synchronize metadata'|@translate} ({$METADATA_LIST})</label>
                 <ul style="padding-left:3em">
                         <li>
-                                <label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'update_sync_metadata_all'|@translate}</label>
+                                <label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'even already synchronized elements'|@translate}</label>
                         </li>
                         <li>
@@ -91 +91 @@
   <fieldset id="syncSimulate">
     <legend></legend>
-    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED}> {'update_simulate'|@translate}</label></li></ul>
+    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED}> {'only perform a simulation (no change in database will be made)'|@translate}</label></li></ul>
   </fieldset>
 
   <fieldset id="catSubset">
-    <legend>{'update_cats_subset'|@translate}</legend>
+    <legend>{'reduce to single existing categories'|@translate}</legend>
     <ul>
     <li>
@@ -103 +103 @@
     </li>
 
-    <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'search_subcats_included'|@translate}</label></li>
+    <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'Search in subcategories'|@translate}</label></li>
     </ul>
   </fieldset>

trunk/admin/template/goto/tags.tpl

@@ -47 +47 @@
     <p>
       <input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}">
-      <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
+      <input class="submit" type="submit" name="delete" value="{'Are you sure?'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
     </p>
   </fieldset>

trunk/admin/template/goto/thumbnail.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'title_thumbnails'|@translate}</h2>
+  <h2>{'Thumbnail creation'|@translate}</h2>
 </div>
 
 {if isset($results) }
-<div class="admin">{'tn_results_title'|@translate}</div>
+<div class="admin">{'Results of miniaturization'|@translate}</div>
 <table style="width:100%;">
   <tr class="throw">
     <td>{'Path'|@translate}</td>
-    <td>{'thumbnail'|@translate}</td>
-    <td>{'tn_results_gen_time'|@translate}</td>
-    <td>{'filesize'|@translate}</td>
+    <td>{'Thumbnail'|@translate}</td>
+    <td>{'generated in'|@translate}</td>
+    <td>{'Filesize'|@translate}</td>
     <td>{'Dimensions'|@translate}</td>
   </tr>
@@ -26 +26 @@
 <table class="table2">
   <tr class="throw">
-    <td colspan="2">{'tn_stats'|@translate}</td>
+    <td colspan="2">{'General statistics'|@translate}</td>
   </tr>
   <tr>
-    <td>{'tn_stats_nb'|@translate}</td>
+    <td>{'number of miniaturized pictures'|@translate}</td>
     <td style="text-align:center;">{$results.TN_NB}</td>
   </tr>
   <tr>
-    <td>{'tn_stats_total'|@translate}</td>
+    <td>{'total time'|@translate}</td>
     <td style="text-align:right;">{$results.TN_TOTAL}</td>
   </tr>
   <tr>
-    <td>{'tn_stats_max'|@translate}</td>
+    <td>{'max time'|@translate}</td>
     <td style="text-align:right;">{$results.TN_MAX}</td>
   </tr>
   <tr>
-    <td>{'tn_stats_min'|@translate}</td>
+    <td>{'min time'|@translate}</td>
     <td style="text-align:right;">{$results.TN_MIN}</td>
   </tr>
   <tr>
-    <td>{'tn_stats_mean'|@translate}</td>
+    <td>{'average time'|@translate}</td>
     <td style="text-align:right;">{$results.TN_AVERAGE}</td>
   </tr>
@@ -56 +56 @@
 
   <fieldset>
-    <legend>{'tn_params_title'|@translate}</legend>
+    <legend>{'Miniaturization parameters'|@translate}</legend>
 
     <ul>
       <li>
-        <span class="property">{'tn_params_GD'|@translate}</span>
+        <span class="property">{'GD version'|@translate}</span>
         <label>
           <input type="radio" name="gd" value="2" {if $params.GD_SELECTED==2}checked="checked"{/if}>2.x
@@ -88 +88 @@
         <label><input type="radio" name="n" value="10"  {if $params.N_SELECTED==10}checked="checked"{/if}> 10</label>
         <label><input type="radio" name="n" value="20"  {if $params.N_SELECTED==20}checked="checked"{/if}> 20</label>
-        <label><input type="radio" name="n" value="all" {if $params.N_SELECTED=='all'}checked="checked"{/if}> {'tn_all'|@translate}</label>
+        <label><input type="radio" name="n" value="all" {if $params.N_SELECTED=='all'}checked="checked"{/if}> {'all'|@translate}</label>
       </li>
     </ul>
@@ -98 +98 @@
 
 {if !empty($remainings) }
-<div class="admin">{$TOTAL_NB_REMAINING} {'tn_alone_title'|@translate}</div>
+<div class="admin">{$TOTAL_NB_REMAINING} {'pictures without thumbnail (jpeg and png only)'|@translate}</div>
 <table style="width:100%;">
   <tr class="throw">
     <td>&nbsp;</td>
     <td style="width:60%;">{'Path'|@translate}</td>
-    <td>{'filesize'|@translate}</td>
+    <td>{'Filesize'|@translate}</td>
     <td>{'Dimensions'|@translate}</td>
   </tr>
@@ -116 +116 @@
 </table>
 {else}
-<div style="text-align:center;font-weight:bold;margin:10px;"> [ {'tn_no_missing'|@translate} ]</div>
+<div style="text-align:center;font-weight:bold;margin:10px;"> [ {'No missing thumbnail'|@translate} ]</div>
 {/if}

trunk/admin/template/goto/upgrade.tpl

@@ -49 +49 @@
 <table>
   <tr>
-    <td>{'language'|@translate}</td>
+    <td>{'Language'|@translate}</td>
     <td>
       <select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;">
@@ -60 +60 @@
 <p>{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p>
 {if isset($login)}
-<p>{'upgrade login message'|@translate}</p>
+<p>{'Only administrator can run upgrade: please sign in below.'|@translate}</p>
 {/if}
 
@@ -107 +107 @@
 
 <form action="index.php" method="post">
-<p><input type="submit" name="submit" value="{'home'|@translate}"></p>
+<p><input type="submit" name="submit" value="{'Home'|@translate}"></p>
 </form>
 {/if}

trunk/admin/template/goto/upload.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2>
+  <h2>{'Waiting'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
-<h3>{'title_upload'|@translate}</h3>
+<h3>{'Pictures waiting for validation'|@translate}</h3>
 
 <form action="{$F_ACTION}" method="post" id="waiting">
   <table style="width:99%;" >
     <tr class="throw">
-      <td style="width:20%;">{'category'|@translate}</td>
+      <td style="width:20%;">{'Category'|@translate}</td>
       <td style="width:20%;">{'Date'|@translate}</td>
-      <td style="width:20%;">{'file'|@translate}</td>
-      <td style="width:20%;">{'thumbnail'|@translate}</td>
+      <td style="width:20%;">{'File'|@translate}</td>
+      <td style="width:20%;">{'Thumbnail'|@translate}</td>
       <td style="width:20%;">{'Author'|@translate}</td>
       <td style="width:1px;">&nbsp;</td>

trunk/admin/template/goto/user_list.tpl

@@ -1 +1 @@
 <div class="titrePage">
-  <h2>{'title_liste_users'|@translate}</h2>
+  <h2>{'User list'|@translate}</h2>
 </div>
 
@@ -63 +63 @@
       <td>&nbsp;</td>
       <td>{'Username'|@translate}</td>
-      <td>{'user_status'|@translate}</td>
+      <td>{'User status'|@translate}</td>
       <td>{'Email address'|@translate}</td>
       <td>{'Groups'|@translate}</td>
-      <td>{'properties'|@translate}</td>
+      <td>{'Properties'|@translate}</td>
       {if not empty($plugin_user_list_column_titles)}
       {foreach from=$plugin_user_list_column_titles item=title}
@@ -88 +88 @@
     {/foreach}
     <td style="text-align:center;">
-      <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
+      <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
       <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}"></a>
       {foreach from=$user.plugin_actions item=data}
@@ -124 +124 @@
     {if isset($adviser)}
     <tr>
-      <td>{'adviser'|@translate}</td>
+      <td>{'Adviser'|@translate}</td>
       <td>
         <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -163 +163 @@
 {* Properties *}
 <fieldset>
-  <legend>{'properties'|@translate}</legend>
+  <legend>{'Properties'|@translate}</legend>
 
   <table>
 
     <tr>
-      <td>{'enabled_high'|@translate}</td>
+      <td>{'High definition enabled'|@translate}</td>
       <td>
         <label><input type="radio" name="enabled_high" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -197 +197 @@
 <table>
   <tr>
-    <td>{'nb_image_per_row'|@translate}</td>
+    <td>{'Number of images per row'|@translate}</td>
     <td>
       <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -207 +207 @@
 
   <tr>
-    <td>{'nb_row_per_page'|@translate}</td>
+    <td>{'Number of rows per page'|@translate}</td>
     <td>
       <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -217 +217 @@
 
   <tr>
-    <td>{'theme'|@translate}</td>
+    <td>{'Interface theme'|@translate}</td>
     <td>
       <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -228 +228 @@
 
   <tr>
-    <td>{'language'|@translate}</td>
+    <td>{'Language'|@translate}</td>
     <td>
       <label><input type="radio" name="language_action" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -239 +239 @@
 
   <tr>
-    <td>{'recent_period'|@translate}</td>
+    <td>{'Recent period'|@translate}</td>
     <td>
       <label><input type="radio" name="recent_period_action" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -249 +249 @@
 
   <tr>
-    <td>{'auto_expand'|@translate}</td>
+    <td>{'Expand all categories'|@translate}</td>
     <td>
       <label><input type="radio" name="expand" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -259 +259 @@
 
   <tr>
-    <td>{'show_nb_comments'|@translate}</td>
+    <td>{'Show number of comments'|@translate}</td>
     <td>
       <label><input type="radio" name="show_nb_comments" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -269 +269 @@
 
   <tr>
-    <td>{'show_nb_hits'|@translate}</td>
+    <td>{'Show number of hits'|@translate}</td>
     <td>
       <label><input type="radio" name="show_nb_hits" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -279 +279 @@
 
   <tr>
-    <td>{'maxwidth'|@translate}</td>
+    <td>{'Maximum width of the pictures'|@translate}</td>
     <td>
       <label><input type="radio" name="maxwidth_action" value="leave" checked="checked"> {'leave'|@translate}</label>
@@ -291 +291 @@
 
   <tr>
-    <td>{'maxheight'|@translate}</td>
+    <td>{'Maximum height of the pictures'|@translate}</td>
     <td>
       <label><input type="radio" name="maxheight_action" value="leave" checked="checked"> {'leave'|@translate}</label>

trunk/admin/thumbnail.php

@@ -116 +116 @@
     if (!is_writable($tndir))
     {
-      array_push($page['errors'], '['.$tndir.'] : '.l10n('no_write_access'));
+      array_push($page['errors'], '['.$tndir.'] : '.l10n('no write access'));
       return false;
     }
@@ -137 +137 @@
   else
   {
-    echo l10n('tn_no_support')." ";
+    echo l10n('Picture unreachable or no support')." ";
     if ( isset( $extenstion ) )
     {
-      echo l10n('tn_format').' '.$extension;
+      echo l10n('for the file format').' '.$extension;
     }
     else
     {
-      echo l10n('tn_thisformat');
+      echo l10n('for this file format');
     }
     exit();
@@ -234 +234 @@
   if (!preg_match('/^[0-9]{2,3}$/', $_POST['width']) or $_POST['width'] < 10)
   {
-    array_push($page['errors'], l10n('tn_err_width').' 10');
+    array_push($page['errors'], l10n('width must be a number superior to').' 10');
   }
   if (!preg_match('/^[0-9]{2,3}$/', $_POST['height']) or $_POST['height'] < 10)
   {
-    array_push($page['errors'], l10n('tn_err_height').' 10');
+    array_push($page['errors'], l10n('height must be a number superior to').' 10');
   }
   

trunk/admin/user_list.php

@@ -169 +169 @@
 
 $page['order_by_items'] = array(
-  'id' => l10n('registration_date'),
+  'id' => l10n('registration date'),
   'username' => l10n('Username'),
   'level' => l10n('Privacy level'),
-  'language' => l10n('language'),
+  'Language' => l10n('Language'),
   );
 
@@ -192 +192 @@
     if(empty($_POST['password']))
     {
-      array_push($page['errors'], l10n('Password is missing'));
+      array_push($page['errors'], l10n('Password is missing. Please enter the password.'));
     }
     else if(empty($_POST['password_conf']))
     {
-      array_push($page['errors'], l10n('Password confirmation is missing'));
+      array_push($page['errors'], l10n('Password confirmation is missing. Please confirm the chosen password.'));
     }
     else if(empty($_POST['email']))
     {
-      array_push($page['errors'], l10n('Email address is missing'));
+      array_push($page['errors'], l10n('Email address is missing. Please specify an email address.'));
     }
     else if ($_POST['password'] != $_POST['password_conf'])
     {
-      array_push($page['errors'], l10n('Password confirmation error'));
+      array_push($page['errors'], l10n('Password confirmation error.'));
     }
     else
@@ -216 +216 @@
           $page['infos'],
           sprintf(
-            l10n('user "%s" added'),
+            l10n('user \"%s\" added'),
             $_POST['login']
           )
@@ -236 +236 @@
         $page['infos'],
         sprintf(
-          l10n('user "%s" added'),
+          l10n('user \"%s\" added'),
           $_POST['login']
           )
@@ -694 +694 @@
   $properties[] =
     (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
-        ? l10n('is_high_enabled') : l10n('is_high_disabled');
+        ? l10n('') : l10n('');
 
   $template->append(
@@ -705 +705 @@
       'USERNAME' => stripslashes($local_user['username'])
         .($local_user['id'] == $conf['guest_id']
-          ? '<br>['.l10n('is_the_guest').']' : '')
+          ? '<br>['.l10n('guest').']' : '')
         .($local_user['id'] == $conf['default_user_id']
-          ? '<br>['.l10n('is_the_default').']' : ''),
+          ? '<br>['.l10n('default values').']' : ''),
       'STATUS' => l10n('user_status_'.
         $local_user['status']).(($local_user['adviser'] == 'true')
-        ? '<br>['.l10n('adviser').']' : ''),
+        ? '<br>['.l10n('Adviser').']' : ''),
       'EMAIL' => get_email_address_as_display_text($local_user['email']),
       'GROUPS' => $groups_string,

trunk/admin/user_perm.php

@@ -127 +127 @@
     'TITLE' =>
       sprintf(
-        l10n('Manage permissions for user "%s"'),
+        l10n('Manage permissions for user \"%s\"'),
         get_username($page['user']
           )
         ),
-    'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
-    'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
+    'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'),
+    'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'),
 
     'F_ACTION' =>

trunk/identification.php

@@ -40 +40 @@
   if ( is_a_guest() )
   {
-    array_push($errors, l10n('access_forbiden'));
+    array_push($errors, l10n('You are not authorized to access the requested page'));
   }
 }
@@ -63 +63 @@
     else
     {
-      array_push( $errors, l10n('invalid_pwd') );
+      array_push( $errors, l10n('Invalid password!') );
     }
   }
@@ -72 +72 @@
 // Start output of page
 //
-$title = l10n('identification');
+$title = l10n('Identification');
 $page['body_id'] = 'theIdentificationPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');

trunk/include/calendar_base.class.php

@@ -96 +96 @@
     elseif ('any' === $date_component )
     {
-      $label = l10n('calendar_any');
+      $label = l10n('All');
     }
     return $label;
@@ -193 +193 @@
           );
       $nav_bar_datas[]=array(
-        'LABEL' => l10n('calendar_any'),
+        'LABEL' => l10n('All'),
         'URL' => $url
       );

trunk/include/common.inc.php

@@ -174 +174 @@
     $user['internal_status']['guest_must_be_guest'] === true)
 {
-  $header_msgs[] = l10n('guest_must_be_guest');
+  $header_msgs[] = l10n('Bad status for user "guest", using default status. Please notify the webmaster.');
 }
 
 if ($conf['gallery_locked'])
 {
-  $header_msgs[] = l10n('gallery_locked_message');
+  $header_msgs[] = l10n('The gallery is locked for maintenance. Please, come back later.');
 
   if ( script_basename() != 'identification' and !is_admin() )
@@ -186 +186 @@
     @header('Retry-After: 900');
     header('Content-Type: text/html; charset='.get_pwg_charset());
-    echo '<a href="'.get_absolute_root_url(false).'identification.php">'.l10n('gallery_locked_message').'</a>';
+    echo '<a href="'.get_absolute_root_url(false).'identification.php">'.l10n('The gallery is locked for maintenance. Please, come back later.').'</a>';
     echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
     exit();
@@ -204 +204 @@
 if (is_adviser())
 {
-  $header_msgs[] = l10n('adviser_mode_enabled');
+  $header_msgs[] = l10n('Adviser mode enabled');
 }
 

trunk/include/functions.inc.php

@@ -31 +31 @@
 include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
+include_once( PHPWG_ROOT_PATH .'include/php-gettext/gettext.inc.php' );
 
 //----------------------------------------------------------- generic functions
@@ -40 +41 @@
                          );
   if (!empty($fields))
-  {
+  { 
     $fields = ','.$fields;
   }
@@ -174 +175 @@
     if ($mkd==false)
     {
-      !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access'));
+      !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access'));
       return false;
     }
@@ -190 +191 @@
   if ( !is_writable($dir) )
   {
-    !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access'));
+    !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access'));
     return false;
   }
@@ -214 +215 @@
   {
     array_push($errors,
-          '['.$dirname.'] : '.l10n('no_write_access'));
+          '['.$dirname.'] : '.l10n('no write access'));
     return false;
   }
@@ -621 +622 @@
   if (empty($msg))
   {
-    $msg = nl2br(l10n('redirect_msg'));
+    $msg = nl2br(l10n('Redirection...'));
   }
 
@@ -867 +868 @@
  * @return string
  */
-function l10n($key)
-{
-  global $lang, $conf;
-
-  if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
-  {
-    trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING);
-  }
-
-  return isset($lang[$key]) ? $lang[$key] : $key;
+function l10n($key, $textdomain='messages')
+{
+  global $user;
+
+  if (empty($user['language']))
+  {
+    $locale = $GLOBALS['language'];
+  } 
+  else 
+  {
+    $locale = $user['language'];
+  }
+
+  T_setlocale(LC_ALL, $locale.'.UTF-8');
+
+  // Specify location of translation tables
+  T_bindtextdomain($textdomain, "./language");
+
+  // Choose domain
+  T_textdomain($textdomain);
+  
+  return T_gettext($key);
 }
 
@@ -888 +901 @@
  * @return string
  */
-function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
-{
-  global $lang_info;
-
-  return
-    sprintf(
-      l10n((
-        (($decimal > 1) or ($decimal == 0 and $lang_info['zero_plural']))
-          ? $plural_fmt_key
-          : $singular_fmt_key
-        )), $decimal);
-}
+function l10n_dec($singular_fmt_key, $plural_fmt_key, 
+                  $decimal, $textdomain='messages')
+{
+  global $user;
+
+  if (empty($user['language']))
+  {
+    $locale = $GLOBALS['language'];
+  } 
+  else 
+  {
+    $locale = $user['language'];
+  }
+
+  T_setlocale(LC_ALL, $locale.'.UTF-8');
+
+  // Specify location of translation tables
+  T_bindtextdomain($textdomain, "./language");
+
+  // Choose domain
+  T_textdomain($textdomain);
+
+  return sprintf(T_ngettext($singular_fmt_key, 
+                            $plural_fmt_key, 
+                            $decimal),
+                 $decimal
+                 );
+}
+
 /*
  * returns a single element to use with l10n_args
@@ -1436 +1466 @@
   {
     $cache['get_icon']['title'] = sprintf(
-      l10n('elements posted during the last %d days'),
+      l10n('images posted during the last %d days'),
       $user['recent_period']
       );

trunk/include/functions_category.inc.php

@@ -287 +287 @@
   return trigger_event('get_category_preferred_image_orders',
     array(
-    array(l10n('default_sort'), '', true),
+    array(l10n('Default'), '', true),
     array(l10n('Average rate'), 'average_rate DESC', $conf['rate']),
-    array(l10n('most_visited_cat'), 'hit DESC', true),
+    array(l10n('Most visited'), 'hit DESC', true),
     array(l10n('Creation date'), 'date_creation DESC', true),
     array(l10n('Post date'), 'date_available DESC', true),
@@ -298 +298 @@
       ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) )
       ),
-    array( l10n('permissions'), 'level DESC', is_admin() )
+    array( l10n('Permissions'), 'level DESC', is_admin() )
     ));
 }
@@ -480 +480 @@
       if (! $short_message)
       {
-        $display_text.= ' '.l10n('images_available_cpl');
+        $display_text.= ' '.l10n('in this category');
       }
     }

trunk/include/functions_comment.inc.php

@@ -104 +104 @@
       if ( $row['user_exists'] == 1 )
       {
-        array_push($infos, l10n('comment_user_exists') );
+        array_push($infos, l10n('This login is already used by another user') );
         $comment_action='reject';
       }
@@ -141 +141 @@
     if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
     {
-      array_push( $infos, l10n('comment_anti-flood') );
+      array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
       $comment_action='reject';
     }
@@ -269 +269 @@
     if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
     {
-      //?? array_push( $infos, l10n('comment_anti-flood') );
+      //?? array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
       $comment_action='reject';
     }

trunk/include/functions_html.inc.php

@@ -293 +293 @@
   {
     echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
-    echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br>';
-    echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';
-    echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>';
+    echo '<div style="text-align:center;">'.l10n('You are not authorized to access the requested page').'<br>';
+    echo '<a href="'.get_root_url().'Identification.php">'.l10n('Identification').'</a>&nbsp;';
+    echo '<a href="'.make_index_url().'">'.l10n('Home').'</a></div>';
     echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
     exit();
@@ -400 +400 @@
 {
   global $page;
-  $title = count($page['tags']) > 1 ? l10n('Tags') : l10n('Tag');
+  $title = count($page['tags']) > 1 ? l10n('Tag') : l10n('Tag');
   $title.= ' ';
 
@@ -415 +415 @@
         )
       .'" title="'
-      .l10n('See elements linked to this tag only')
+      .l10n('See images linked to this tag only')
       .'">'
       .$page['tags'][$i]['name']
@@ -432 +432 @@
           )
         .'" style="border:none;" title="'
-        .l10n('remove this tag')
+        .l10n('remove this tag from the list')
         .'"><img src="'
         .get_root_url().get_themeconf('icon_dir').'/remove_s.png'

trunk/include/functions_mail.inc.php

@@ -647 +647 @@
           'PHPWG_URL' => PHPWG_URL,
 
-          'TITLE_MAIL' => urlencode(l10n('title_send_mail')),
+          'TITLE_MAIL' => urlencode(l10n('A comment on your site')),
           'MAIL' => get_webmaster_mail_address()
           ));

trunk/include/functions_notification.inc.php

@@ -530 +530 @@
         .' ('
         .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
-          .l10n('recent_pics_cat').'</a>'
+          .l10n('Recent pictures').'</a>'
         .')'
         .'</li><br>';

trunk/include/functions_user.inc.php

@@ -48 +48 @@
   if ( !preg_match( $regex, $mail_address ) )
   {
-    return l10n('reg_err_mail_address');
+    return l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)');
   }
 
@@ -62 +62 @@
     if ($count != 0)
     {
-      return l10n('reg_err_mail_address_dbl');
+      return l10n('a user use already this mail address');
     }
   }
@@ -87 +87 @@
     if ($count > 0)
     {
-      return l10n('reg_err_login5');
+      return l10n('this login is already used');
     }
   }
@@ -99 +99 @@
   if ($login == '')
   {
-    array_push($errors, l10n('reg_err_login1'));
+    array_push($errors, l10n('Please, enter a login'));
   }
   if (preg_match('/^.* $/', $login))
   {
-    array_push($errors, l10n('reg_err_login2'));
+    array_push($errors, l10n('login mustn\'t end with a space character'));
   }
   if (preg_match('/^ .*$/', $login))
   {
-    array_push($errors, l10n('reg_err_login3'));
+    array_push($errors, l10n('login mustn\'t start with a space character'));
   }
   if (get_userid($login))
   {
-    array_push($errors, l10n('reg_err_login5'));
+    array_push($errors, l10n('this login is already used'));
   }
   $mail_error = validate_mail_address(null, $mail_address);

trunk/include/menubar.inc.php

@@ -149 +149 @@
         array(
           'URL' => make_index_url(array('section' => 'favorites')),
-          'TITLE' => l10n('favorite_cat_hint'),
-          'NAME' => l10n('favorite_cat')
+          'TITLE' => l10n('display my favorites pictures'),
+          'NAME' => l10n('My favorites')
           );
     }
@@ -157 +157 @@
       array(
         'URL' => make_index_url(array('section' => 'most_visited')),
-        'TITLE' => l10n('most_visited_cat_hint'),
-        'NAME' => l10n('most_visited_cat')
+        'TITLE' => l10n('display most visited pictures'),
+        'NAME' => l10n('Most visited')
       );
 
@@ -166 +166 @@
         array(
           'URL' => make_index_url(array('section' => 'best_rated')),
-          'TITLE' => l10n('best_rated_cat_hint'),
-          'NAME' => l10n('best_rated_cat')
+          'TITLE' => l10n('display best rated items'),
+          'NAME' => l10n('Best rated')
         );
     }
@@ -174 +174 @@
       array(
         'URL' => get_root_url().'random.php',
-        'TITLE' => l10n('random_cat_hint'),
-        'NAME' => l10n('random_cat'),
+        'TITLE' => l10n('display a set of random pictures'),
+        'NAME' => l10n('Random pictures'),
         'REL'=> 'rel="nofollow"'
       );
@@ -182 +182 @@
       array(
         'URL' => make_index_url(array('section' => 'recent_pics')),
-        'TITLE' => l10n('recent_pics_cat_hint'),
-        'NAME' => l10n('recent_pics_cat'),
+        'TITLE' => l10n('display most recent pictures'),
+        'NAME' => l10n('Recent pictures'),
       );
 
@@ -189 +189 @@
       array(
         'URL' => make_index_url(array('section' => 'recent_cats')),
-        'TITLE' => l10n('recent_cats_cat_hint'),
-        'NAME' => l10n('recent_cats_cat'),
+        'TITLE' => l10n('display recently updated categories'),
+        'NAME' => l10n('Recent categories'),
       );
 
@@ -205 +205 @@
             )
           ),
-        'TITLE' => l10n('calendar_hint'),
-        'NAME' => l10n('calendar'),
+        'TITLE' => l10n('display each day with pictures, month per month'),
+        'NAME' => l10n('Calendar'),
         'REL'=> 'rel="nofollow"'
       );
@@ -231 +231 @@
     $block->data['search'] =
       array(
-        'TITLE'=>l10n('hint_search'),
+        'TITLE'=>l10n('search'),
         'NAME'=>l10n('Search'),
         'URL'=> get_root_url().'search.php',
@@ -240 +240 @@
     $block->data['comments'] =
       array(
-        'TITLE'=>l10n('hint_comments'),
-        'NAME'=>l10n('comments'),
+        'TITLE'=>l10n('See last users comments'),
+        'NAME'=>l10n('Comments'),
         'URL'=> get_root_url().'comments.php',
       );
@@ -248 +248 @@
     $block->data['about'] =
       array(
-        'TITLE'     => l10n('about_page_title'),
+        'TITLE'     => l10n('About Piwigo'),
         'NAME'      => l10n('About'),
         'URL' => get_root_url().'about.php',

trunk/include/picture_comment.inc.php

@@ -59 +59 @@
   {
     case 'moderate':
-      array_push( $infos, l10n('comment_to_validate') );
+      array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') );
     case 'validate':
-      array_push( $infos, l10n('comment_added'));
+      array_push( $infos, l10n('Your comment has been registered'));
       break;
     case 'reject':
       set_status_header(403);
-      array_push($infos, l10n('comment_not_added') );
+      array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
       break;
     default:

trunk/include/section_init.inc.php

@@ -238 +238 @@
   else
   {
-    $page['title'] = l10n('no_category');
+    $page['title'] = l10n('Home');
   }
 
@@ -362 +362 @@
         'items' => $search_result['items'],
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .l10n('search_result').'</a>',
+                  .l10n('Search results').'</a>',
         )
       );
@@ -376 +376 @@
       $page,
       array(
-        'title' => l10n('favorites')
+        'title' => l10n('Favorites')
             )
     );
@@ -457 +457 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .l10n('recent_pics_cat').'</a>',
+                  .l10n('Recent pictures').'</a>',
         'items' => array_from_query($query, 'id'),
         )
@@ -470 +470 @@
       $page,
       array(
-        'title' => l10n('recent_cats_cat'),
+        'title' => l10n('Recent categories'),
         )
       );
@@ -495 +495 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .$conf['top_number'].' '.l10n('most_visited_cat').'</a>',
+                  .$conf['top_number'].' '.l10n('Most visited').'</a>',
         'items' => array_from_query($query, 'id'),
         )
@@ -521 +521 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                  .$conf['top_number'].' '.l10n('best_rated_cat').'</a>',
+                  .$conf['top_number'].' '.l10n('Best rated').'</a>',
         'items' => array_from_query($query, 'id'),
         )
@@ -544 +544 @@
       array(
         'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
-                    .l10n('random_cat').'</a>',
+                    .l10n('Random pictures').'</a>',
         'items' => array_from_query($query, 'id'),
         )

trunk/include/ws_functions.inc.php

@@ -563 +563 @@
   {
     case 'reject':
-      array_push($infos, l10n('comment_not_added') );
+      array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
       return new PwgError(403, implode("\n", $infos) );
     case 'validate':

trunk/install.php

@@ -232 +232 @@
   {
 
-    array_push( $infos, l10n('step1_confirmation') );
+    array_push( $infos, l10n('Parameters are correct') );
 
     $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
@@ -261 +261 @@
   else
   {
-    array_push( $errors, l10n('step1_err_server') );
+    array_push( $errors, l10n('Can\'t connect to server') );
   }
 
   $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
   if ( empty($webmaster))
-    array_push( $errors, l10n('step2_err_login1') );
+    array_push( $errors, l10n('enter a login for webmaster') );
   else if ( preg_match( '/[\'"]/', $webmaster ) )
-    array_push( $errors, l10n('step2_err_login3') );
+    array_push( $errors, l10n('webmaster login can\'t contain characters \' or \"') );
   if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) )
-    array_push( $errors, l10n('step2_err_pass') );
+    array_push( $errors, l10n('please enter your password again') );
   if ( empty($admin_mail))
-    array_push( $errors, l10n('reg_err_mail_address') );
+    array_push( $errors, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
   else
   {
@@ -305 +305 @@
       $html_content = htmlentities( $file_content, ENT_QUOTES );
       $html_content = nl2br( $html_content );
-      $error_copy = l10n('step1_err_copy');
+      $error_copy = l10n('Copy the text in pink between hyphens and paste it into the file \"include/config_database.inc.php\"(Warning : config_database.inc.php must only contain what is in pink, no line return or space character)');
       $error_copy .= '<br>--------------------------------------------------------------------<br>';
       $error_copy .= '<span class="sql_content">' . $html_content . '</span>';
@@ -443 +443 @@
       'F_ADMIN' => $admin_name,
       'F_ADMIN_EMAIL' => $admin_mail,
-      'L_INSTALL_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
+      'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
       ));
 }
@@ -461 +461 @@
 else
 {
-  array_push($infos, l10n('install_end_message'));
+  array_push($infos, l10n('The configuration of Piwigo is finished, here is the next step<br><br>
+* go to the identification page and use the login/password given for webmaster<br>
+* this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories'));
 
   if (isset($error_copy))

trunk/install/php5_apache_configuration.php

@@ -109 +109 @@
   echo '
 </div>
-<div style="text-align: center">'.sprintf(l10n('install_help'), PHPWG_URL.'/forum').'</div>
+<div style="text-align: center">'.sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum').'</div>
 </div>
 </body>
@@ -141 +141 @@
   <table>
   <tr>
-    <td>'.l10n('language').'</td>
+    <td>'.l10n('Language').'</td>
     <td>
       <select name="language" onchange="document.location = \''.$script.'.php?language=\'+this.options[this.selectedIndex].value;">';

trunk/install/upgrade_1.3.1.php

@@ -603 +603 @@
   $page['infos'],
   array(
-    l10n('all sub-categories of private categories become private'),
-    l10n('user permissions and group permissions have been erased'),
-    l10n('only thumbnails prefix and webmaster mail saved')
+    l10n('All sub-categories of private categories become private'),
+    l10n('User permissions and group permissions have been erased'),
+    l10n('Only thumbnails prefix and webmaster mail address have been saved from previous configuration')
     )
   );

trunk/nbm.php

@@ -58 +58 @@
 else
 {
-  array_push($page['errors'], l10n('nbm_unknown_identifier'));
+  array_push($page['errors'], l10n('Unknown identifier'));
 }
 
@@ -64 +64 @@
 // | template initialization                                               |
 // +-----------------------------------------------------------------------+
-$title = l10n('nbm_item_notification');
+$title = l10n('Notification');
 $page['body_id'] = 'theNBMPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');

trunk/password.php

@@ -52 +52 @@
   if (isset($_POST['no_mail_address']) and $_POST['no_mail_address'] == 1)
   {
-    array_push($page['infos'], l10n('Email address is missing'));
+    array_push($page['infos'], l10n('Email address is missing. Please specify an email address.'));
     array_push($page['infos'], $mailto);
   }
@@ -131 +131 @@
     else
     {
-      array_push($page['errors'], l10n('No user matches this email address'));
+      array_push($page['errors'], l10n('No classic user matches this email address'));
       array_push($page['errors'], l10n('Administrator, webmaster and special user cannot use this method'));
       array_push($page['errors'], $mailto);

trunk/picture.php

@@ -777 +777 @@
         'FAVORITE_IMG'  =>
           get_root_url().get_themeconf('icon_dir').'/favorite.png',
-        'FAVORITE_HINT' => l10n('add_favorites_hint'),
+        'FAVORITE_HINT' => l10n('add this image to your favorites'),
         'U_FAVORITE'    => add_url_params(
           $url_self,
@@ -792 +792 @@
         'FAVORITE_IMG'  =>
           get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
-        'FAVORITE_HINT' => l10n('del_favorites_hint'),
+        'FAVORITE_HINT' => l10n('delete this image from your favorites'),
         'U_FAVORITE'    => add_url_params(
           $url_self,

trunk/profile.php

@@ -62 +62 @@
   save_profile_from_post($userdata, $errors);
 
-  $title= l10n('customize_page_title');
+  $title= l10n('Your Gallery Customization ');
   $page['body_id'] = 'theProfilePage';
   include(PHPWG_ROOT_PATH.'include/page_header.php');
@@ -109 +109 @@
       or (!preg_match($int_pattern, $_POST['nb_image_line'])))
   {
-    $errors[] = l10n('nb_image_line_error');
+    $errors[] = l10n('The number of images per row must be a not null scalar');
   }
 
@@ -115 +115 @@
       or (!preg_match($int_pattern, $_POST['nb_line_page'])))
   {
-    $errors[] = l10n('nb_line_page_error');
+    $errors[] = l10n('The number of rows per page must be a not null scalar');
   }
 
@@ -122 +122 @@
            or $_POST['maxwidth'] < 50))
   {
-    $errors[] = l10n('maxwidth_error');
+    $errors[] = l10n('Maximum width must be a number superior to 50');
   }
   if ($_POST['maxheight']
@@ -128 +128 @@
              or $_POST['maxheight'] < 50))
   {
-    $errors[] = l10n('maxheight_error');
+    $errors[] = l10n('Maximum height must be a number superior to 50');
   }
   // periods must be integer values, they represents number of days
@@ -134 +134 @@
       or $_POST['recent_period'] <= 0)
   {
-    $errors[] = l10n('periods_error') ;
+    $errors[] = l10n('Recent period must be a positive integer value') ;
   }
 

trunk/register.php

@@ -43 +43 @@
   if ($_POST['password'] != $_POST['password_conf'])
   {
-    array_push($errors, l10n('reg_err_pass'));
+    array_push($errors, l10n('please enter your password again'));
   }
 

trunk/search.php

@@ -153 +153 @@
   else
   {
-    array_push($errors, l10n('search_one_clause_at_least'));
+    array_push($errors, l10n('Empty query. No criteria has been entered.'));
   }
 }
@@ -173 +173 @@
 // Start output of page
 //
-$title= l10n('search_title');
+$title= l10n('Search');
 $page['body_id'] = 'theSearchPage';
 

trunk/search_rules.php

@@ -31 +31 @@
 function inc_exc_str($is_included)
 {
-  return $is_included ? l10n('included') : l10n('excluded');
+  return $is_excluded ? l10n('excluded') : l10n('excluded');
 }
 

trunk/template-extension/distributed/samples/my-picture.tpl

@@ -22 +22 @@
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
+    <a href="{$U_HOME}" rel="Home">{'Home'|@translate}</a>
     {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
     {$LEVEL_SEPARATOR}{$current.TITLE}
@@ -39 +39 @@
     {/if}
     {if isset($U_SLIDESHOW_STOP) }
-      <a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a>
+      <a href="{$U_SLIDESHOW_STOP}" title="{'stop the slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'stop the slideshow'|@translate}"></a>
     {/if}
-      <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
+      <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
     {if isset($current.U_DOWNLOAD) }
-      <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
+      <a href="{$current.U_DOWNLOAD}" title="{'download'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
     {/if}
     {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
@@ -50 +50 @@
     {/if}
     {if !empty($U_SET_AS_REPRESENTATIVE) }
-      <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>
+      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'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="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
+      <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     {/if}
     {if isset($U_CADDIE) }{*caddie management BEGIN*}
@@ -72 +72 @@
 }{/literal}
 </script>
-      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
+      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
     {/if}{*caddie management END*}
   </div>
@@ -87 +87 @@
 {if isset($U_SLIDESHOW_STOP) }
 <p>
-  [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
+  [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
 </p>
 {/if}
@@ -94 +94 @@
 
 {if isset($previous) }
-<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
+<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
   <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
 </a>
 {/if}
 {if isset($next) }
-<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
+<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
   <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
 </a>

trunk/template-extension/distributed/samples/titling_categories.tpl

@@ -29 +29 @@
           <a href="{$cat.URL}">
             <img src="{$cat.TN_SRC}" alt="{$cat.ALT}" 
-            title="{'hint_category'|@translate}">
+            title="{'shows images at the root of this category'|@translate}">
           </a>
         </div>

trunk/template/yoga/about.tpl

@@ -4 +4 @@
       <li>
         <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
-          <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
+          <img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}">
         </a>
       </li>

trunk/template/yoga/comment_list.tpl

@@ -43 +43 @@
         <fieldset>
           <legend>{'Edit a comment'|@translate}</legend>
-          <label>{'comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
+          <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$Comment.CONTENT|@escape}</textarea></label>
           <input type="hidden" name="key" value="{$comment.KEY}">
           <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">

trunk/template/yoga/comments.tpl

@@ -3 +3 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'User comments'|@translate}</h2>

trunk/template/yoga/footer.tpl

@@ -2 +2 @@
  <a name="EoP"></a> <!-- End of Page -->
  {if isset($debug.TIME) }
- {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
+ {'SQL queries in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
  {/if}
 
@@ -10 +10 @@
   *}
 
-  {'powered_by'|@translate}
+  {'Powered by'|@translate}
   <a href="{$PHPWG_URL}" class="Piwigo">
   <span class="Piwigo">Piwigo</span></a>
   {$VERSION}
   {if isset($CONTACT_MAIL)}
-  - {'send_mail'|@translate}
+  - {'Contact'|@translate}
   <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
   {/if}

trunk/template/yoga/header.tpl

@@ -23 +23 @@
 <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
 
-<link rel="start" title="{'home'|@translate}" href="{$U_HOME}" >
+<link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
 <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
-{if isset($first.U_IMG)   }<link rel="first" title="{'first_page'|@translate}" href="{$first.U_IMG}" >{/if}
-{if isset($previous.U_IMG)}<link rel="prev" title="{'previous_page'|@translate}" href="{$previous.U_IMG}" >{/if}
-{if isset($next.U_IMG)    }<link rel="next" title="{'next_page'|@translate}" href="{$next.U_IMG}" >{/if}
-{if isset($last.U_IMG)    }<link rel="last" title="{'last_page'|@translate}" href="{$last.U_IMG}" >{/if}
-{if isset($U_UP)          }<link rel="up" title="{'thumbnails'|@translate}" href="{$U_UP}" >{/if}
+{if isset($first.U_IMG)   }<link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >{/if}
+{if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >{/if}
+{if isset($next.U_IMG)    }<link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >{/if}
+{if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
+{if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
 
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/layout.css">

trunk/template/yoga/identification.tpl

@@ -5 +5 @@
       <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
       {if isset($U_REGISTER) }
-      <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
+      <li><a href="{$U_REGISTER}" title="{'Register'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
       {/if}
-      <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>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Identification'|@translate}</h2>
@@ -46 +46 @@
       <li>
         <span class="property">
-          <label for="remember_me">{'remember_me'|@translate}</label>
+          <label for="Auto login">{'Auto login'|@translate}</label>
         </span>
         <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
@@ -58 +58 @@
   <p>
     {if isset($U_REGISTER) }
-    <a href="{$U_REGISTER}" title="{'Create a new account'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
+    <a href="{$U_REGISTER}" title="{'Register'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
     {/if}
     <a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"> {'Forgot your password?'|@translate}</a>

trunk/template/yoga/index.tpl

@@ -16 +16 @@
 
       {if isset($favorite) }
-      <li><a href="{$favorite.U_FAVORITE}" title="{'del_all_favorites_hint'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'del_all_favorites_hint'|@translate}"></a></li>
+      <li><a href="{$favorite.U_FAVORITE}" title="{'delete all images from your favorites'|@translate}"><img src="{$favorite.FAVORITE_IMG}" class="button" alt="favorite" title="{'delete all images from your favorites'|@translate}"></a></li>
       {/if}
 
       {if isset($U_CADDIE) }
-      <li><a href="{$U_CADDIE}" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a></li>
+      <li><a href="{$U_CADDIE}" title="{'caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a></li>
       {/if}
 
       {if isset($U_EDIT) }
-      <li><a href="{$U_EDIT}" title="{'edit category informations'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
+      <li><a href="{$U_EDIT}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_edit.png" class="button" alt="{'edit'|@translate}"></a></li>
       {/if}
 
@@ -36 +36 @@
 
       {if isset($U_MODE_FLAT) }
-      <li><a href="{$U_MODE_FLAT}" title="{'mode_flat_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'mode_flat_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_FLAT}" title="{'display all elements in all sub-categories'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/flat.png" class="button" alt="{'display all elements in all sub-categories'|@translate}"></a></li>
       {/if}
 
       {if isset($U_MODE_NORMAL) }
-      <li><a href="{$U_MODE_NORMAL}" title="{'mode_normal_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'mode_normal_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_NORMAL}" title="{'return to normal view mode'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/normal_mode.png" class="button" alt="{'return to normal view mode'|@translate}"></a></li>
       {/if}
 
       {if isset($U_MODE_POSTED) }
-      <li><a href="{$U_MODE_POSTED}" title="{'mode_posted_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'mode_posted_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_POSTED}" title="{'display a calendar by posted date'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar.png" class="button" alt="{'display a calendar by posted date'|@translate}"></a></li>
       {/if}
       
       {if isset($U_MODE_CREATED) }
-      <li><a href="{$U_MODE_CREATED}" title="{'mode_created_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'mode_created_hint'|@translate}"></a></li>
+      <li><a href="{$U_MODE_CREATED}" title="{'display a calendar by creation date'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/calendar_created.png" class="button" alt="{'display a calendar by creation date'|@translate}"></a></li>
       {/if}
       
@@ -57 +57 @@
 
   {if isset($chronology_views) }
-  <div class="calendarViews">{'calendar_view'|@translate}:
+  <div class="calendarViews">{'View'|@translate}:
     <select onchange="document.location = this.options[this.selectedIndex].value;">
       {foreach from=$chronology_views item=view}

trunk/template/yoga/mainpage_categories.tpl

@@ -6 +6 @@
                         <div class="illustration">
                         <a href="{$cat.URL}">
-                                <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'hint_category'|@translate}">
+                                <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'shows images at the root of this category'|@translate}">
                         </a>
                         </div>

trunk/template/yoga/menubar_categories.tpl

@@ -1 +1 @@
 <dt>
   {if isset($U_START_FILTER)}
-  <a href="{$U_START_FILTER}" title="{'start_filter_hint'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
+  <a href="{$U_START_FILTER}" title="{'display only recently posted images'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_filter.png" class="button" alt="start filter"></a>
   {/if}
   {if isset($U_STOP_FILTER)}
-  <a href="{$U_STOP_FILTER}" title="{'stop_filter_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
+  <a href="{$U_STOP_FILTER}" title="{'return to the display of all images'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_filter.png" class="button" alt="stop filter"></a>
   {/if}
         <a href="{$block->data.U_CATEGORIES}">{'Categories'|@translate}</a>
@@ -32 +32 @@
         <ul>
                 <li>
-                        <a href="{$block->data.U_UPLOAD}">{'upload_picture'|@translate}</a>
+                        <a href="{$block->data.U_UPLOAD}">{'Upload a picture'|@translate}</a>
                 </li>
         </ul>

trunk/template/yoga/menubar_identification.tpl

@@ -1 @@
-<dt>{'identification'|@translate}</dt>
+<dt>{'Identification'|@translate}</dt>
 <dd>
         {if isset($USERNAME)}
-        <p>{'hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
+        <p>{'Hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
         {/if}
 
         <ul>
         {if isset($U_REGISTER)}
-        <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
+        <li><a href="{$U_REGISTER}" title="{'Register'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
         {/if}
 
         {if isset($U_LOGIN)}
-        <li><a href="{$U_LOGIN}" rel="nofollow">{'Connection'|@translate}</a></li>
+        <li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>
         {/if}
 
         {if isset($U_LOGOUT)}
-        <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
+        <li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>
         {/if}
 
         {if isset($U_PROFILE)}
-        <li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'customize'|@translate}</a></li>
+        <li><a href="{$U_PROFILE}" title="{'Customize'|@translate}">{'Customize'|@translate}</a></li>
         {/if}
 
         {if isset($U_ADMIN)}
-        <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
+        <li><a href="{$U_ADMIN}" title="{'Administration'|@translate}">{'Administration'|@translate}</a></li>
         {/if}
         </ul>
@@ -43 +43 @@
         {if $AUTHORIZE_REMEMBERING}
         <div><label for="remember_me">
-        {'remember_me'|@translate}
+        {'Auto login'|@translate}
         <input type="checkbox" name="remember_me" id="remember_me" value="1">
         </label></div>
@@ -53 +53 @@
                 <li><a href="{$U_LOST_PASSWORD}" title="{'Forgot your password?'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/lost_password.png" class="button" alt="{'Forgot your password?'|@translate}"></a></li>
                 {if isset($U_REGISTER)}
-                <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
+                <li><a href="{$U_REGISTER}" title="{'Register'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
                 {/if}
         </ul>

trunk/template/yoga/menubar_menu.tpl

@@ -1 @@
-<dt>{'title_menu'|@translate}</dt>
+<dt>{'Menu'|@translate}</dt>
 <dd>
   {if isset($block->data.qsearch) and  $block->data.qsearch==true}

trunk/template/yoga/menubar_specials.tpl

@@ -1 @@
-<dt>{'special_categories'|@translate}</dt>
+<dt>{'Specials'|@translate}</dt>
 <dd>
         <ul>

trunk/template/yoga/menubar_tags.tpl

@@ -11 +11 @@
                         </a>
                         {/if}
-                        <a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See elements linked to this tag only'|@translate}">{$tag.name}</a>{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}</span>
+                        <a href="{$tag.URL}" class="tagLevel{$tag.level}" title="{'See images linked to this tag only'|@translate}">{$tag.name}</a>{* there should be no space between end of a and span elements to avoid IE8 bug https://connect.microsoft.com/IE/feedback/ViewFeedback.aspx?FeedbackID=366567 *}</span>
                 {/foreach}
         </div>

trunk/template/yoga/navigation_bar.tpl

@@ -1 +1 @@
 <div class="navigationBar">
   {if isset($navbar.URL_FIRST)}
-  <a href="{$navbar.URL_FIRST}" rel="first">{'first_page'|@translate}</a> |
-  <a href="{$navbar.URL_PREV}" rel="prev">{'previous_page'|@translate}</a> |
+  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
+  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
   {else}
-  {'first_page'|@translate} |
-  {'previous_page'|@translate} |
+  {'First'|@translate} |
+  {'Previous'|@translate} |
   {/if}
 
@@ -20 +20 @@
 
   {if isset($navbar.URL_NEXT)}
-  | <a href="{$navbar.URL_NEXT}" rel="next">{'next_page'|@translate}</a>
-  | <a href="{$navbar.URL_LAST}" rel="last">{'last_page'|@translate}</a>
+  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
+  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
   {else}
-  | {'next_page'|@translate}
-  | {'last_page'|@translate}
+  | {'Next'|@translate}
+  | {'Last'|@translate}
   {/if}
 </div>

trunk/template/yoga/nbm.tpl

@@ -3 +3 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <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>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
-    <h2>{'nbm_item_notification'|@translate}</h2>
+    <h2>{'Notification'|@translate}</h2>
   </div>
 

trunk/template/yoga/notification.tpl

@@ -1 +1 @@
 {html_head}
 <link rel="alternate" type="application/rss+xml" title="{'Image only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}">
-<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed'|@translate}" href="{$U_FEED}">
+<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (images, comments)'|@translate}" href="{$U_FEED}">
 {/html_head}
 <div id="content" class="content">
@@ -7 +7 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Notification'|@translate}</h2>
@@ -19 +19 @@
     </dt>
     <dt>
-      <a href="{$U_FEED}">{'Complete RSS feed'|@translate}</a>
+      <a href="{$U_FEED}">{'Complete RSS feed (images, comments)'|@translate}</a>
     </dt>
   </dl>

trunk/template/yoga/password.tpl

@@ -3 +3 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <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>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Password forgotten'|@translate}</h2>

trunk/template/yoga/picture.tpl

@@ -29 +29 @@
 <div id="imageHeaderBar">
   <div class="browsePath">
-    <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
+    <a href="{$U_HOME}" rel="Home">{'Home'|@translate}</a>
     {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
     {$LEVEL_SEPARATOR}{$current.TITLE}
@@ -45 +45 @@
     {/if}
     {if isset($U_SLIDESHOW_STOP) }
-      <a href="{$U_SLIDESHOW_STOP}" title="{'slideshow_stop'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'slideshow_stop'|@translate}"></a>
-    {/if}
-      <a href="{$U_METADATA}" title="{'picture_show_metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
+      <a href="{$U_SLIDESHOW_STOP}" title="{'stop the slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'stop the slideshow'|@translate}"></a>
+    {/if}
+      <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
     {if isset($current.U_DOWNLOAD) }
-      <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
+      <a href="{$current.U_DOWNLOAD}" title="{'download'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
     {/if}
     {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
@@ -56 +56 @@
     {/if}
     {if !empty($U_SET_AS_REPRESENTATIVE) }
-      <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>
+      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'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="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
+      <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     {/if}
     {if isset($U_CADDIE) }{*caddie management BEGIN*}
@@ -78 +78 @@
 }{/literal}
 </script>
-      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'add to caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
+      <a href="{$U_CADDIE}" onclick="addToCadie(this, '{$ROOT_URL|@escape:'javascript'}', {$current.id}); return false;" title="{'caddie'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/caddie_add.png" class="button" alt="{'caddie'|@translate}"></a>
     {/if}{*caddie management END*}
   </div>
@@ -93 +93 @@
 {if isset($U_SLIDESHOW_STOP) }
 <p>
-  [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
+  [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
 </p>
 {/if}
@@ -100 +100 @@
 
 {if isset($previous) }
-<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
+<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
   <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
 </a>
 {/if}
 {if isset($next) }
-<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
+<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
   <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
 </a>
@@ -169 +169 @@
                         {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) }
                 {else}
-                        {'no_rate'|@translate}
+                        {'no rate'|@translate}
                 {/if}
                 </td>
@@ -178 +178 @@
         <tr>
                 <td class="label">
-                        <span id="updateRate">{if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if}</span>
+                        <span id="updateRate">{if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
                 </td>
                 <td class="value">
@@ -265 +265 @@
         <form  method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment">
         <fieldset>
-                <legend>{'comments_add'|@translate}</legend>
+                <legend>{'Add a comment'|@translate}</legend>
                 {if $comment_add.SHOW_AUTHOR}
-                <label>{'upload_author'|@translate}<input type="text" name="author"></label>
+                <label>{'Author'|@translate}<input type="text" name="author"></label>
                 {/if}
-                <label>{'comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
+                <label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$Comment_add.CONTENT}</textarea></label>
                 <input type="hidden" name="key" value="{$comment_add.KEY}">
                 <input class="submit" type="submit" value="{'Submit'|@translate}">

trunk/template/yoga/picture_content.tpl

@@ -8 +8 @@
 {if isset($high) }
 </a>
-  <p>{'picture_high'|@translate}</p>
+  <p>{'Click on the picture to see it in high definition'|@translate}</p>
 {/if}

trunk/template/yoga/picture_nav_buttons.tpl

@@ -2 +2 @@
   
 {if isset($last)}
-  <a class="navButton" href="{$last.U_IMG}" title="{'last_page'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'last_page'|@translate}"></a>
+  <a class="navButton" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'Last'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
@@ -8 +8 @@
   
 {if isset($next)}
-  <a class="navButton" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'next_page'|@translate}"></a>
+  <a class="navButton" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right.png" class="button" alt="{'Next'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
@@ -14 +14 @@
 
 {if isset($slideshow.U_START_PLAY)}
-  <a class="navButton" href="{$slideshow.U_START_PLAY}" title="{'start_play'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'start_play'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_START_PLAY}" title="{'Play of slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/play.png" class="button" alt="{'Play of slideshow'|@translate}"></a>
 {/if}
 
 {if isset($slideshow.U_STOP_PLAY)}
-  <a class="navButton" href="{$slideshow.U_STOP_PLAY}" title="{'stop_play'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'stop_play'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_STOP_PLAY}" title="{'Pause of slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/pause.png" class="button" alt="{'Pause of slideshow'|@translate}"></a>
 {/if}
 
 {if isset($U_UP) and !isset($slideshow)}
-  <a class="navButton" href="{$U_UP}" title="{'thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'thumbnails'|@translate}"></a>
+  <a class="navButton" href="{$U_UP}" title="{'Thumbnails'|@translate}" rel="up"><img src="{$ROOT_URL}{$themeconf.icon_dir}/up.png" class="button" alt="{'Thumbnails'|@translate}"></a>
 {/if}
   
 {if isset($previous)}
-  <a class="navButton" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'previous_page'|@translate}"></a>
+  <a class="navButton" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left.png" class="button" alt="{'Previous'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
@@ -32 +32 @@
   
 {if isset($first)}
-  <a class="navButton" href="{$first.U_IMG}" title="{'first_page'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'first_page'|@translate}"></a>
+  <a class="navButton" href="{$first.U_IMG}" title="{'First'|@translate} : {$first.TITLE}" rel="first"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first.png" class="button" alt="{'First'|@translate}"></a>
 {else}
   <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
@@ -39 +39 @@
 
 {if isset($slideshow.U_START_REPEAT)}
-  <a class="navButton" href="{$slideshow.U_START_REPEAT}" title="{'start_repeat'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/start_repeat.png" class="button" alt="{'start_repeat'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_START_REPEAT}" title="{'Repeat the slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Repeat the slideshow.png" class="button" alt="{'Repeat the slideshow'|@translate}"></a>
 {/if}
 
 {if isset($slideshow.U_STOP_REPEAT)}
-  <a class="navButton" href="{$slideshow.U_STOP_REPEAT}" title="{'stop_repeat'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_repeat.png" class="button" alt="{'stop_repeat'|@translate}"></a>
+  <a class="navButton" href="{$slideshow.U_STOP_REPEAT}" title="{'Not repeat the slideshow'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Not repeat the slideshow.png" class="button" alt="{'Not repeat the slideshow'|@translate}"></a>
 {/if}
 
 {if isset($slideshow)}
   {if isset($slideshow.U_DEC_PERIOD)}
-    <a class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'dec_period'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period.png" class="button" alt="{'dec_period'|@translate}"></a>
+    <a class="navButton" href="{$slideshow.U_DEC_PERIOD}" title="{'Accelerate diaporama speed'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Accelerate diaporama speed.png" class="button" alt="{'Accelerate diaporama speed'|@translate}"></a>
   {else}
     <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
@@ -54 +54 @@
 
   {if isset($slideshow.U_INC_PERIOD)}
-    <a class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'inc_period'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period.png" class="button" alt="{'inc_period'|@translate}"></a>
+    <a class="navButton" href="{$slideshow.U_INC_PERIOD}" title="{'Reduce diaporama speed'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Reduce diaporama speed.png" class="button" alt="{'Reduce diaporama speed'|@translate}"></a>
   {else}
     <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>

trunk/template/yoga/profile.tpl

@@ -13 +13 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Profile'|@translate}</h2>

trunk/template/yoga/profile_content.tpl

@@ -26 +26 @@
       <li>
         <span class="property">
-          <label for="use_new_pwd">{'new_password'|@translate}</label>
+          <label for="use_new_pwd">{'New password'|@translate}</label>
         </span>
         <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
@@ -41 +41 @@
 
   <fieldset>
-    <legend>{'preferences'|@translate}</legend>
+    <legend>{'Preferences'|@translate}</legend>
 
     <ul>
       <li>
         <span class="property">
-          <label for="nb_image_line">{'nb_image_per_row'|@translate}</label>
+          <label for="nb_image_line">{'Number of images per row'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
@@ -52 +52 @@
       <li>
         <span class="property">
-          <label for="nb_line_page">{'nb_row_per_page'|@translate}</label>
+          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
@@ -58 +58 @@
       <li>
         <span class="property">
-          <label for="template">{'theme'|@translate}</label>
+          <label for="template">{'Interface theme'|@translate}</label>
         </span>
         {html_options name=template options=$template_options selected=$template_selection}
@@ -64 +64 @@
       <li>
         <span class="property">
-          <label for="language">{'language'|@translate}</label>
+          <label for="Language">{'Language'|@translate}</label>
         </span>
         {html_options name=language options=$language_options selected=$language_selection}
@@ -70 +70 @@
       <li>
         <span class="property">
-          <label for="recent_period">{'recent_period'|@translate}</label>
+          <label for="Recent period">{'Recent period'|@translate}</label>
         </span>
         <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
       </li>
       <li>
-        <span class="property">{'auto_expand'|@translate}</span>
+        <span class="property">{'Expand all categories'|@translate}</span>
         {html_radios name='expand' options=$radio_options selected=$EXPAND}
       </li>
       <li>
-        <span class="property">{'show_nb_comments'|@translate}</span>
+        <span class="property">{'Show number of comments'|@translate}</span>
         {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
       </li>
       <li>
-        <span class="property">{'show_nb_hits'|@translate}</span>
+        <span class="property">{'Show number of hits'|@translate}</span>
         {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
       </li>
       <li>
         <span class="property">
-          <label for="maxwidth">{'maxwidth'|@translate}</label>
+          <label for="Maximum width of the pictures">{'Maximum width of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
@@ -94 +94 @@
       <li>
         <span class="property">
-          <label for="maxheight">{'maxheight'|@translate}</label>
+          <label for="Maximum height of the pictures">{'Maximum height of the pictures'|@translate}</label>
         </span>
         <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
@@ -104 +104 @@
     <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
     <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
-    <input class="submit" type="submit" name="reset_to_default" value="{'Reset_To_Default'|@translate}">
+    <input class="submit" type="submit" name="reset_to_default" value="{'Reset to default values'|@translate}">
   </p>
 

trunk/template/yoga/redirect.tpl

@@ -9 +9 @@
 <p style="margin: 2em">
         <a href="{$page_refresh.U_REFRESH}">
-                {'click_to_redirect'|@translate}
+                {'Click here if your browser does not automatically forward you'|@translate}
         </a>
 </p>

trunk/template/yoga/register.tpl

@@ -5 +5 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Registration'|@translate}</h2>

trunk/template/yoga/search.tpl

@@ -23 +23 @@
     <ul class="categoryActions">
       <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}" rel="Home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
     <h2>{'Search'|@translate}</h2>
@@ -41 +41 @@
 <fieldset>
   <legend>{'Filter'|@translate}</legend>
-  <label>{'search_keywords'|@translate}
+  <label>{'Search for words'|@translate}
     <input type="text" style="width: 300px" name="search_allwords" size="30">
   </label>
   <ul>
     <li><label>
-      <input type="radio" name="mode" value="AND" checked="checked">{'search_mode_and'|@translate}
+      <input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms '|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="mode" value="OR">{'search_mode_or'|@translate}
+      <input type="radio" name="mode" value="OR">{'Search for any terms'|@translate}
     </label></li>
   </ul>
-  <label>{'search_author'|@translate}
+  <label>{'Search for Author'|@translate}
     <input type="text" style="width: 300px" name="search_author" size="30">
   </label>
@@ -67 +67 @@
 
 <fieldset>
-  <legend>{'search_date'|@translate}</legend>
+  <legend>{'Search by Date'|@translate}</legend>
   <ul>
-    <li><label>{'search_date_type'|@translate}</label></li>
+    <li><label>{'Kind of date'|@translate}</label></li>
     <li><label>
       <input type="radio" name="date_type" value="date_creation" checked="checked">{'Creation date'|@translate}
@@ -78 +78 @@
   </ul>
   <ul>
-    <li><label>{'search_date_from'|@translate}</label></li>
+    <li><label>{'Date'|@translate}</label></li>
     <li>
       <select id="start_day" name="start_day">
@@ -97 +97 @@
   </ul>
   <ul>
-    <li><label>{'search_date_to'|@translate}</label></li>
+    <li><label>{'End-Date'|@translate}</label></li>
     <li>
       <select id="end_day" name="end_day">
@@ -118 +118 @@
 
 <fieldset>
-  <legend>{'search_options'|@translate}</legend>
-  <label>{'search_categories'|@translate}
+  <legend>{'Search Options'|@translate}</legend>
+  <label>{'Search in Categories'|@translate}
     <select class="categoryList" name="cat[]" multiple="multiple" >
       {html_options options=$category_options selected=$category_options_selected}
@@ -125 +125 @@
   </label>
   <ul>
-    <li><label>{'search_subcats_included'|@translate}</label></li>
+    <li><label>{'Search in subcategories'|@translate}</label></li>
     <li><label>
       <input type="radio" name="subcats-included" value="1" checked="checked">{'Yes'|@translate}

trunk/template/yoga/search_rules.tpl

@@ -16 +16 @@
   {if isset($SEARCH_TAGS_MODE) }
   <li>
-    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'All tags must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
+    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'At least one tag must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
     <ul>
       {foreach from=$search_tags item=v}

trunk/template/yoga/slideshow.tpl

@@ -2 +2 @@
   <div class="browsePath">
     {if isset($U_SLIDESHOW_STOP) }
-    [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
+    [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
     {/if}
   </div>

trunk/template/yoga/tags.tpl

@@ -4 +4 @@
                 <ul class="categoryActions">
                 {if $display_mode == 'letters'}
-                        <li><a href="{$U_CLOUD}" title="{'show tag cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"></a></li>
+                        <li><a href="{$U_CLOUD}" title="{'cloud'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_cloud.png" class="button" alt="{'cloud'|@translate}"></a></li>
                 {/if}
 
                 {if $display_mode == 'cloud'}
-                        <li><a href="{$U_LETTERS}" title="{'group by letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"></a></li>
+                        <li><a href="{$U_LETTERS}" title="{'letters'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/tag_letters.png" class="button" alt="{'letters'|@translate}"></a></li>
                 {/if}
 
-                        <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+                        <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
                 </ul>
                 <h2>{'Tags'|@translate}</h2>

trunk/template/yoga/upload.tpl

@@ -9 +9 @@
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
+      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
     </ul>
-    <h2>{'upload_title'|@translate}</h2>
+    <h2>{'Upload a picture'|@translate}</h2>
   </div>
 
@@ -61 +61 @@
     <!-- mail address -->
     <tr>
-      <td>{'mail_address'|@translate} <span style="color:red;">*</span></td>
+      <td>{'E-mail address'|@translate} <span style="color:red;">*</span></td>
       <td>
       <input name="mail_address" type="text" value="{$EMAIL}">
@@ -68 +68 @@
     <!-- name of the picture -->
     <tr>
-      <td>{'upload_name'|@translate}</td>
+      <td>{'Name of the picture'|@translate}</td>
       <td>
       <input name="name" type="text" value="{$NAME_IMG}">
@@ -75 +75 @@
     <!-- author -->
     <tr>
-      <td>{'upload_author'|@translate}</td>
+      <td>{'Author'|@translate}</td>
       <td>
       <input name="author" type="text" value="{$AUTHOR_IMG}">
@@ -89 +89 @@
     <!-- comment -->
     <tr>
-      <td>{'comment'|@translate}</td>
+      <td>{'Comment'|@translate}</td>
       <td>
        <textarea name="comment" id="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
@@ -103 +103 @@
   </form>
   {else}
-  {'upload_successful'|@translate}<br>
+  {'Picture uploaded with success, an administrator will validate it as soon as possible'|@translate}<br>
   <div style="text-align:center;">
-    <a href="{$U_RETURN}">[ {'home'|@translate} ]</a>
+    <a href="{$U_RETURN}">[ {'Home'|@translate} ]</a>
   </div>
   {/if}
   
   {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
-  <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'mandatory'|@translate}</div>
+  <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'obligatory'|@translate}</div>
   {/if}
 </div> <!-- content -->

trunk/upgrade.php

@@ -195 +195 @@
 $template->assign(array(
   'RELEASE' => PHPWG_VERSION,
-  'L_UPGRADE_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
+  'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on <a href=\"%s\">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
   )
 );
@@ -279 +279 @@
       {
         array_push($page['infos'],
-          l10n('in include/config_database.inc.php, before ?>, insert:') . '
-<p><textarea rows="4" cols="40">'.implode("\r\n" , $mysql_changes).'</textarea></p>'
-          );
+                   l10n_args('in <i>%s</i>, before <b>?></b>, insert:', 
+                             'include/config_database.inc.php') . 
+                   '<p><textarea rows="4" cols="40">' .
+                   implode("\r\n" , $mysql_changes).'</textarea></p>'
+                   );
       }
     }
@@ -315 +317 @@
 
     array_push($page['infos'],
-      l10n('perform a maintenance check')
+      l10n('Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.')
       );
 

trunk/upload.php

@@ -62 +62 @@
   if (!in_array($extension, $conf['picture_ext']))
   {
-    array_push( $result['error'], l10n('upload_advise_filetype') );
+    array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
     return $result;
   }
@@ -73 +73 @@
   {
     array_push( $result['error'],
-                l10n('upload_advise_filesize').$my_max_file_size.' KB' );
+                l10n('the filesize of the picture must not exceed : ').$my_max_file_size.' KB' );
   }
   else
@@ -81 +81 @@
     if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) )
     {
-      array_push( $result['error'], l10n('upload_cannot_upload') );
+      array_push( $result['error'], l10n('can\'t upload the picture on the server') );
     }
     else
@@ -91 +91 @@
       {
         array_push( $result['error'],
-                    l10n('upload_advise_width').$image_max_width.' px' );
+                    l10n('the width of the picture must not exceed : ').$image_max_width.' px' );
       }
       if ( isset( $image_max_height )
@@ -98 +98 @@
       {
         array_push( $result['error'],
-                    l10n('upload_advise_height').$image_max_height.' px' );
+                    l10n('the height of the picture must not exceed : ').$image_max_height.' px' );
       }
       // $size[2] == 1 means GIF
@@ -109 +109 @@
       case 3 : $result['type'] = 'png'; break;
       default :
-        array_push( $result['error'], l10n('upload_advise_filetype') );
+        array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
       }
     }
@@ -182 +182 @@
   if ( @is_file( $path ) )
   {
-    array_push( $error, l10n('upload_file_exists') );
+    array_push( $error, l10n('A picture\'s name already used') );
   }
   // test de la présence des champs obligatoires
   if ( empty($_FILES['picture']['name']))
   {
-    array_push( $error, l10n('upload_filenotfound') );
+    array_push( $error, l10n('You must choose a picture fileformat for the image') );
   }
   if ( !preg_match( '/([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)/',
              $_POST['mail_address'] ) )
   {
-    array_push( $error, l10n('reg_err_mail_address') );
+    array_push( $error, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
   }
   if ( empty($_POST['username']) )
   {
-    array_push( $error, l10n('upload_err_username') );
+    array_push( $error, l10n('the username must be given') );
   }
 
@@ -210 +210 @@
     else
     {
-      array_push( $error, l10n('err_date') );
+      array_push( $error, l10n('wrong date') );
     }
   }
@@ -225 +225 @@
   if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) )
   {
-    array_push( $error, l10n('update_wrong_dirname') );
+    array_push( $error, l10n('wrong filename') );
   }
 
@@ -319 +319 @@
 // Start output of page
 //
-$title= l10n('upload_title');
+$title= l10n('Upload a picture');
 $page['body_id'] = 'theUploadPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
@@ -351 +351 @@
 if ( isset( $page['waiting_id'] ) )
 {
-  $advise_title = l10n('upload_advise_thumbnail').$_FILES['picture']['name'];
+  $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to ').$_FILES['picture']['name'];
 }
 else
@@ -382 +382 @@
   if ( !empty($conf['upload_maxfilesize']) )
   {
-    $content = l10n('upload_advise_filesize');
+    $content = l10n('the filesize of the picture must not exceed : ');
     $content.= $conf['upload_maxfilesize'].' KB';
     $template->append('advises', $content);
@@ -391 +391 @@
     if ( $conf['upload_maxwidth_thumbnail'] != '' )
     {
-      $content = l10n('upload_advise_width');
+      $content = l10n('the width of the picture must not exceed : ');
       $content.= $conf['upload_maxwidth_thumbnail'].' px';
       $template->append('advises', $content);
@@ -397 +397 @@
     if ( $conf['upload_maxheight_thumbnail'] != '' )
     {
-      $content = l10n('upload_advise_height');
+      $content = l10n('the height of the picture must not exceed : ');
       $content.= $conf['upload_maxheight_thumbnail'].' px';
       $template->append('advises', $content);
@@ -406 +406 @@
     if ( $conf['upload_maxwidth'] != '' )
     {
-      $content = l10n('upload_advise_width');
+      $content = l10n('the width of the picture must not exceed : ');
       $content.= $conf['upload_maxwidth'].' px';
       $template->append('advises', $content);
@@ -412 +412 @@
     if ( $conf['upload_maxheight'] != '' )
     {
-      $content = l10n('upload_advise_height');
+      $content = l10n('the height of the picture must not exceed : ');
       $content.= $conf['upload_maxheight'].' px';
       $template->append('advises', $content);
     }
   }
-  $template->append('advises', l10n('upload_advise_filetype'));
+  $template->append('advises', l10n('the picture must be to the fileformat jpg, gif or png'));
 
 //----------------------------------------- optionnal username and mail address