Changeset 5021


Ignore:
Timestamp:
Mar 2, 2010, 3:54:22 PM (10 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:
27 added
117 edited

Legend:

Unmodified
Added
Removed
  • trunk/about.php

    r5014 r5021  
    3535// Start output of page
    3636//
    37 $title= l10n('about_page_title');
     37$title= l10n('About Piwigo');
    3838$page['body_id'] = 'theAboutPage';
    3939include(PHPWG_ROOT_PATH.'include/page_header.php');
  • trunk/admin/advanced_feature.php

    r3282 r5021  
    6767  array
    6868  (
    69     'CAPTION' => l10n('Elements_not_linked'),
     69    'CAPTION' => l10n('Not linked elements'),
    7070    'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked'
    7171  ));
     
    7474  array
    7575  (
    76     'CAPTION' => l10n('Duplicates'),
     76    'CAPTION' => l10n('Files with same name in more than one physical category'),
    7777    'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates'
    7878  ));
  • trunk/admin/cat_list.php

    r4325 r5021  
    6969$base_url = get_root_url().'admin.php?page=cat_list';
    7070$navigation = '<a href="'.$base_url.'">';
    71 $navigation.= l10n('home');
     71$navigation.= l10n('Home');
    7272$navigation.= '</a>';
    7373
     
    7979{
    8080  delete_categories(array($_GET['delete']));
    81   array_push($page['infos'], l10n('cat_virtual_deleted'));
     81  array_push($page['infos'], l10n('Virtual category deleted'));
    8282  update_global_rank();
    8383}
  • trunk/admin/cat_modify.php

    r4385 r5021  
    111111  }
    112112
    113   array_push($page['infos'], l10n('editcat_confirm'));
     113  array_push($page['infos'], l10n('Category informations updated successfully.'));
    114114}
    115115elseif (isset($_POST['set_random_representant']))
     
    317317  'date_available' => l10n('Post date'),
    318318  'average_rate' => l10n('Average rate'),
    319   'hit' => l10n('most_visited_cat'),
     319  'hit' => l10n('Most visited'),
    320320  'file' => l10n('File name'),
    321321  'id' => 'Id',
     
    517517    $page['infos'],
    518518    sprintf(
    519       l10n('An information email was sent to group "%s"'),
     519      l10n('An information email was sent to group \"%s\"'),
    520520      $group_name
    521521      )
  • trunk/admin/cat_options.php

    r3282 r5021  
    161161// TabSheet initialization
    162162$opt_link = $link_start.'cat_options&amp;section=';
    163 $tabsheet->add('status', l10n('cat_security'), $opt_link.'status');
    164 $tabsheet->add('visible', l10n('lock'), $opt_link.'visible');
    165 $tabsheet->add('upload', l10n('upload'), $opt_link.'upload');
    166 $tabsheet->add('comments', l10n('comments'), $opt_link.'comments');
     163$tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
     164$tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
     165$tabsheet->add('Upload', l10n('Upload'), $opt_link.'Upload');
     166$tabsheet->add('Comments', l10n('Comments'), $opt_link.'Comments');
    167167if ($conf['allow_random_representative'])
    168168{
     
    209209    $template->assign(
    210210      array(
    211         'L_SECTION' => l10n('cat_upload_title'),
    212         'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
    213         'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
     211        'L_SECTION' => l10n('Select uploadable categories'),
     212        'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
     213        'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
    214214        )
    215215      );
     
    230230    $template->assign(
    231231      array(
    232         'L_SECTION' => l10n('cat_comments_title'),
    233         'L_CAT_OPTIONS_TRUE' => l10n('authorized'),
    234         'L_CAT_OPTIONS_FALSE' => l10n('forbidden'),
     232        'L_SECTION' => l10n('Authorize users to add comments on selected categories'),
     233        'L_CAT_OPTIONS_TRUE' => l10n('Authorized'),
     234        'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'),
    235235        )
    236236      );
     
    251251    $template->assign(
    252252      array(
    253         'L_SECTION' => l10n('cat_lock_title'),
    254         'L_CAT_OPTIONS_TRUE' => l10n('unlocked'),
    255         'L_CAT_OPTIONS_FALSE' => l10n('locked'),
     253        'L_SECTION' => l10n('Lock categories'),
     254        'L_CAT_OPTIONS_TRUE' => l10n('Unlocked'),
     255        'L_CAT_OPTIONS_FALSE' => l10n('Locked'),
    256256        )
    257257      );
     
    272272    $template->assign(
    273273      array(
    274         'L_SECTION' => l10n('cat_status_title'),
    275         'L_CAT_OPTIONS_TRUE' => l10n('cat_public'),
    276         'L_CAT_OPTIONS_FALSE' => l10n('cat_private'),
     274        'L_SECTION' => l10n('Manage authorizations for selected categories'),
     275        'L_CAT_OPTIONS_TRUE' => l10n('Public category'),
     276        'L_CAT_OPTIONS_FALSE' => l10n('Private category'),
    277277        )
    278278      );
  • trunk/admin/configuration.php

    r4325 r5021  
    8787      if ( !url_is_remote($_POST['gallery_url']) )
    8888      {
    89         array_push($page['errors'], l10n('conf_gallery_url_error'));
     89        array_push($page['errors'], l10n('The gallery URL is not valid.'));
    9090      }
    9191      foreach( $main_checkboxes as $checkbox)
     
    111111           or $_POST['nb_comment_page'] > 50)
    112112      {
    113         array_push($page['errors'], l10n('conf_nb_comment_page_error'));
     113        array_push($page['errors'], l10n('The number of comments a page must be between 5 and 50 included.'));
    114114      }
    115115      foreach( $comments_checkboxes as $checkbox)
     
    161161      }
    162162    }
    163     array_push($page['infos'], l10n('conf_confirmation'));
     163    array_push($page['infos'], l10n('Information data registered in database'));
    164164  }
    165165
     
    174174$tabsheet = new tabsheet();
    175175// TabSheet initialization
    176 $tabsheet->add('main', l10n('conf_main_title'), $conf_link.'main');
    177 $tabsheet->add('history', l10n('conf_history_title'), $conf_link.'history');
    178 $tabsheet->add('comments', l10n('conf_comments_title'), $conf_link.'comments');
    179 $tabsheet->add('upload', l10n('conf_upload_title'), $conf_link.'upload');
    180 $tabsheet->add('default', l10n('conf_display'), $conf_link.'default');
     176$tabsheet->add('main', l10n('Main'), $conf_link.'main');
     177$tabsheet->add('history', l10n('History'), $conf_link.'history');
     178$tabsheet->add('comments', l10n('Comments'), $conf_link.'comments');
     179$tabsheet->add('upload', l10n('Upload'), $conf_link.'upload');
     180$tabsheet->add('default', l10n('Default display'), $conf_link.'default');
    181181// TabSheet selection
    182182$tabsheet->select($page['section']);
     
    286286        // Reload user
    287287        $edit_user = build_user($conf['default_user_id'], false);
    288         array_push($page['infos'], l10n('conf_confirmation'));
     288        array_push($page['infos'], l10n('Information data registered in database'));
    289289      }
    290290    }
  • trunk/admin/element_set.php

    r4367 r5021  
    133133else if ('not_linked' == $_GET['cat'])
    134134{
    135   $page['title'] = l10n('Elements_not_linked');
     135  $page['title'] = l10n('Not linked elements');
    136136  $template->assign(array('U_ACTIVE_MENU' => 5 ));
    137137
     
    164164else if ('duplicates' == $_GET['cat'])
    165165{
    166   $page['title'] = l10n('Duplicates');
     166  $page['title'] = l10n('Files with same name in more than one physical category');
    167167  $template->assign(array('U_ACTIVE_MENU' => 5 ));
    168168
     
    190190elseif ('recent'== $_GET['cat'])
    191191{
    192   $page['title'] = l10n('recent_pics_cat');
     192  $page['title'] = l10n('Recent pictures');
    193193  $query = 'SELECT MAX(date_available) AS date
    194194  FROM '.IMAGES_TABLE;
  • trunk/admin/extend_for_templates.php

    r3665 r5021  
    147147  {
    148148    array_push($page['infos'],
    149       l10n('Templates recorded.'));
     149      l10n('Templates configuration has been recorded.'));
    150150  }
    151151}
  • trunk/admin/group_list.php

    r4325 r5021  
    7373  array_push(
    7474    $page['infos'],
    75     sprintf(l10n('group "%s" deleted'), $groupname)
     75    sprintf(l10n('group \"%s\" deleted'), $groupname)
    7676    );
    7777}
     
    8585  if (empty($_POST['groupname']))
    8686  {
    87     array_push($page['errors'], l10n('group_add_error1'));
     87    array_push($page['errors'], l10n('The name of a group must not contain \" or \' or be empty.'));
    8888  }
    8989  if (count($page['errors']) == 0)
     
    9898    if ($count != 0)
    9999    {
    100       array_push($page['errors'], l10n('group_add_error2'));
     100      array_push($page['errors'], l10n('This name is already used by another group.'));
    101101    }
    102102  }
     
    114114    array_push(
    115115      $page['infos'],
    116       sprintf(l10n('group "%s" added'), $_POST['groupname'])
     116      sprintf(l10n('group \"%s\" added'), $_POST['groupname'])
    117117      );
    118118  }
     
    142142  array_push(
    143143    $page['infos'],
    144     sprintf(l10n('group "%s" updated'), $groupname)
     144    sprintf(l10n('group \"%s\" updated'), $groupname)
    145145    );
    146146}
     
    189189    array(
    190190      'NAME' => $row['name'],
    191       'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''),
     191      'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('default').']' : ''),
    192192      'MEMBERS' => l10n_dec('%d member', '%d members', $counter),
    193193      'U_MEMBERS' => $members_url.$row['id'],
  • trunk/admin/group_perm.php

    r4325 r5021  
    133133    'TITLE' =>
    134134      sprintf(
    135         l10n('Manage permissions for group "%s"'),
     135        l10n('Manage permissions for group \"%s\"'),
    136136        get_groupname($page['group']
    137137          )
    138138        ),
    139     'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
    140     'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
     139    'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'),
     140    'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'),
    141141
    142142    'F_ACTION' =>
  • trunk/admin/history.php

    r4892 r5021  
    145145  else
    146146  {
    147     array_push($page['errors'], l10n('search_one_clause_at_least'));
     147    array_push($page['errors'], l10n('Empty query. No criteria has been entered.'));
    148148  }
    149149}
  • trunk/admin/include/c13y_internal.class.php

    r4385 r5021  
    5656      {
    5757        $c13y->add_anomaly(
    58           sprintf(l10n('c13y_version_anomaly'), $elem['type'], $elem['current'], $elem['required']),
    59           null,
    60           null,
    61           l10n('c13y_version_correction')
     58          sprintf(l10n('The version of %s [%s] installed is not compatible with the version required [%s]'), $elem['type'], $elem['current'], $elem['required']),
     59          null,
     60          null,
     61          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')
    6262          .'<br>'.
    6363          $c13y->get_htlm_links_more_info());
     
    8181      {
    8282        $c13y->add_anomaly(
    83           sprintf(l10n('c13y_exif_anomaly'), '$conf[\''.$value.'\']'),
    84           null,
    85           null,
    86           sprintf(l10n('c13y_exif_correction'), '$conf[\''.$value.'\']')
     83          sprintf(l10n('%s value is not correct file because exif are not supported'), '$conf[\''.$value.'\']'),
     84          null,
     85          null,
     86          sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']')
    8787          .'<br>'.
    8888          $c13y->get_htlm_links_more_info());
     
    209209            create_user_infos($id);
    210210
    211             $page['infos'][] = sprintf(l10n('c13y_user_created'), $name, $password);
     211            $page['infos'][] = sprintf(l10n('User \"%s\" created with \"%s\" like password'), $name, $password);
    212212
    213213            $result = true;
     
    240240              $updates);
    241241
    242             $page['infos'][] = sprintf(l10n('c13y_user_status_updated'), get_username($id));
     242            $page['infos'][] = sprintf(l10n('Status of user \"%s\" updated'), get_username($id));
    243243
    244244            $result = true;
  • trunk/admin/include/check_integrity.class.php

    r3282 r5021  
    335335      sprintf
    336336      (
    337         l10n('c13y_more_info'),
    338         sprintf($link_fmt, $pwg_links['FORUM'], l10n('c13y_more_info_forum')),
    339         sprintf($link_fmt, $pwg_links['WIKI'], l10n('c13y_more_info_wiki'))
     337        l10n('Go to %s or %s for more informations'),
     338        sprintf($link_fmt, $pwg_links['FORUM'], l10n('the forum')),
     339        sprintf($link_fmt, $pwg_links['WIKI'], l10n('the wiki'))
    340340      );
    341341  }
  • trunk/admin/include/functions.php

    r4892 r5021  
    11831183  if (preg_match('/^\s*$/', $category_name))
    11841184  {
    1185     return array('error' => l10n('cat_error_name'));
     1185    return array('error' => l10n('The name of a category should not be empty'));
    11861186  }
    11871187
     
    12691269
    12701270  return array(
    1271     'info' => l10n('cat_virtual_added'),
     1271    'info' => l10n('Virtual category added'),
    12721272    'id'   => $inserted_id,
    12731273    );
     
    16671667    return array(
    16681668      'info' => sprintf(
    1669         l10n('Tag "%s" was added'),
     1669        l10n('Tag \"%s\" was added'),
    16701670        stripslashes($tag_name)
    16711671        ),
     
    16771677    return array(
    16781678      'error' => sprintf(
    1679         l10n('Tag "%s" already exists'),
     1679        l10n('Tag \"%s\" already exists'),
    16801680        stripslashes($tag_name)
    16811681        )
  • trunk/admin/include/functions_notification_by_mail.inc.php

    r4325 r5021  
    205205    $env_nbm['sent_mail_count'] = 0;
    206206    // Save sendmail message info and error in the original language
    207     $env_nbm['msg_info'] = l10n('nbm_msg_mail_sent_to');
    208     $env_nbm['msg_error'] = l10n('nbm_msg_error_sending_email_to');
     207    $env_nbm['msg_info'] = l10n('Mail sent to %s [%s].');
     208    $env_nbm['msg_error'] = l10n('Error when sending email to %s [%s].');
    209209  }
    210210}
     
    323323  {
    324324    if ($env_nbm['sent_mail_count'] == 0)
    325       array_push($page['infos'], l10n('nbm_no_mail_to_send'));
     325      array_push($page['infos'], l10n('No mail to send.'));
    326326    else
    327327      array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count']));
     
    370370  if ($is_subscribe)
    371371  {
    372     $msg_info = l10n('nbm_user_change_enabled_true');
    373     $msg_error = l10n('nbm_user_not_change_enabled_true');
     372    $msg_info = l10n('User %s [%s] was added to the subscription list.');
     373    $msg_error = l10n('User %s [%s] was not added to the subscription list.');
    374374  }
    375375  else
    376376  {
    377     $msg_info = l10n('nbm_user_change_enabled_false');
    378     $msg_error = l10n('nbm_user_not_change_enabled_false');
     377    $msg_info = l10n('User %s [%s] was removed from the subscription list.');
     378    $msg_error = l10n('User %s [%s] was not removed from the subscription list.');
    379379  }
    380380
     
    386386
    387387    // Prepare message after change language
    388     $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
     388    $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.');
    389389
    390390    // Begin nbm users environment
     
    409409        set_user_on_env_nbm($nbm_user, true);
    410410
    411         $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe'));
     411        $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Unsubscribe from notification by mail'): l10n('Unsubscribe from notification by mail'));
    412412
    413413        // Assign current var for nbm mail
  • trunk/admin/include/functions_permalinks.php

    r4833 r5021  
    8888      $page['errors'][] =
    8989        sprintf(
    90           l10n('Permalink_%s_histo_used_by_%s'),
     90          l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
    9191          $permalink, $old_cat_id
    9292        );
     
    141141      or preg_match( '#^(\d)+(-.*)?$#', $permalink) )
    142142  {
    143     $page['errors'][] = l10n('Permalink_name_rule');
     143    $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 \"-\"');
    144144    return false;
    145145  }
     
    170170    $page['errors'][] =
    171171      sprintf(
    172         l10n('Permalink_%s_histo_used_by_%s'),
     172        l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'),
    173173        $permalink, $old_cat_id
    174174      );
  • trunk/admin/include/functions_plugins.inc.php

    r3282 r5021  
    5656
    5757  $tabsheet = new tabsheet();
    58   $tabsheet->add('plugins_list', l10n('plugins_tab_list'), $link.'plugins_list');
    59   $tabsheet->add('plugins_update', l10n('plugins_tab_update'), $link.'plugins_update');
    60   $tabsheet->add('plugins_new', l10n('plugins_tab_new'), $link.'plugins_new');
     58  $tabsheet->add('plugins_list', l10n('Plugin list'), $link.'plugins_list');
     59  $tabsheet->add('plugins_update', l10n('Check for updates'), $link.'plugins_update');
     60  $tabsheet->add('plugins_new', l10n('Other plugins'), $link.'plugins_new');
    6161  $tabsheet->select($selected);
    6262  $tabsheet->assign();
  • trunk/admin/include/functions_upgrade.php

    r4325 r5021  
    128128
    129129    array_push($page['infos'],
    130       l10n('deactivated plugins').'<p><i>'.implode(', ', $plugins).'</i></p>');
     130      l10n('As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:').'<p><i>'.implode(', ', $plugins).'</i></p>');
    131131  }
    132132}
     
    175175  if ($row['password'] != $conf['pass_convert']($password))
    176176  {
    177     array_push($page['errors'], l10n('invalid_pwd'));
     177    array_push($page['errors'], l10n('Invalid password!'));
    178178  }
    179179  elseif ($row['status'] != 'admin' and $row['status'] != 'webmaster')
  • trunk/admin/include/functions_waiting.inc.php

    r3282 r5021  
    3131  $tabsheet = new tabsheet();
    3232  // TabSheet initialization
    33   $tabsheet->add('comments', l10n('comments'), $link_start.'comments');
     33  $tabsheet->add('Comments', l10n('Comments'), $link_start.'Comments');
    3434  $tabsheet->add('upload', l10n('Pictures'), $link_start.'upload');
    3535  // TabSheet selection
  • trunk/admin/notification_by_mail.php

    r4325 r5021  
    175175        $page['infos'],
    176176        sprintf(
    177           l10n('nbm_user_x_added'),
     177          l10n('User %s [%s] added.'),
    178178          stripslashes($nbm_user['username']),
    179179          get_email_address_as_display_text($nbm_user['mail_address'])
     
    201201        $result = pwg_query($query);
    202202
    203         redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg'));
     203        redirect($base_url.get_query_string_diff(array(), false), l10n('Processing treatment.
     204
     205Please wait...'));
    204206      }
    205207    }
     
    268270        if ($is_action_send)
    269271        {
    270           $msg_break_timeout = l10n('nbm_break_timeout_send_mail');
     272          $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.');
    271273        }
    272274        else
    273275        {
    274           $msg_break_timeout = l10n('nbm_break_timeout_list_user');
     276          $msg_break_timeout = l10n('Prepared time for list of users to send mail is limited. Others users are not listed.');
    275277        }
    276278
     
    314316            if ($exist_data)
    315317            {
    316               $subject = '['.$conf['gallery_title'].']: '.l10n('nbm_object_news');
     318              $subject = '['.$conf['gallery_title'].']: '.l10n('New elements added');
    317319
    318320              // Assign current var for nbm mail
     
    450452        if ($is_action_send)
    451453        {
    452           array_push($page['errors'], l10n('nbm_no_user_to send_notifications_by_mail'));
     454          array_push($page['errors'], l10n('No user to send notifications by mail.'));
    453455        }
    454456      }
     
    594596  $tabsheet = new tabsheet();
    595597  // TabSheet initialization
    596   $tabsheet->add('param', l10n('nbm_param_mode'),
     598  $tabsheet->add('param', l10n('Parameter'),
    597599    add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
    598600        array('mode' => 'param')));
    599   $tabsheet->add('subscribe', l10n('nbm_subscribe_mode'),
     601  $tabsheet->add('subscribe', l10n('Subscribe'),
    600602    add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
    601603      array('mode' => 'subscribe')));
    602   $tabsheet->add('send', l10n('nbm_send_mode'),
     604  $tabsheet->add('send', l10n('Send'),
    603605    add_url_params($base_url.get_query_string_diff(array('mode', 'select')),
    604606      array('mode' => 'send')));
     
    651653    $template->assign(
    652654      array(
    653         'L_CAT_OPTIONS_TRUE' => l10n('nbm_subscribe_col'),
    654         'L_CAT_OPTIONS_FALSE' => l10n('nbm_unsubscribe_col')
     655        'L_CAT_OPTIONS_TRUE' => l10n('Subscribed'),
     656        'L_CAT_OPTIONS_FALSE' => l10n('Unsubscribed')
    655657        )
    656658      );
  • trunk/admin/picture_modify.php

    r4325 r5021  
    6363    )
    6464  {
    65     array_push($page['errors'], l10n('err_date'));
     65    array_push($page['errors'], l10n('wrong date'));
    6666  }
    6767}
  • trunk/admin/plugins_new.php

    r3282 r5021  
    5151    case 'ok':
    5252      array_push($page['infos'],
    53         l10n('plugins_install_ok'),
    54         l10n('plugins_install_need_activate'));
     53        l10n('Plugin has been successfully copied'),
     54        l10n('You might go to plugin list to install and activate it.'));
    5555      break;
    5656
    5757    case 'temp_path_error':
    58       array_push($page['errors'], l10n('plugins_temp_path_error'));
     58      array_push($page['errors'], l10n('Can\'t create temporary file.'));
    5959      break;
    6060
    6161    case 'dl_archive_error':
    62       array_push($page['errors'], l10n('plugins_dl_archive_error'));
     62      array_push($page['errors'], l10n('Can\'t download archive.'));
    6363      break;
    6464
    6565    case 'archive_error':
    66       array_push($page['errors'], l10n('plugins_archive_error'));
     66      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
    6767      break;
    6868
    6969    default:
    7070      array_push($page['errors'],
    71         sprintf(l10n('plugins_extract_error'), $_GET['installstatus']),
    72         l10n('plugins_check_chmod'));
     71        sprintf(l10n('An error occured during extraction (%s).'), $_GET['installstatus']),
     72        l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).'));
    7373  } 
    7474}
     
    8282  array(
    8383    $link.'date' => l10n('Post date'),
    84     $link.'revision' => l10n('plugins_revisions'),
     84    $link.'revision' => l10n('Last revisions'),
    8585    $link.'name' => l10n('Name'),
    8686    $link.'author' => l10n('Author'),
     
    127127else
    128128{
    129   array_push($page['errors'], l10n('plugins_server_error'));
     129  array_push($page['errors'], l10n('Can\'t connect to server.'));
    130130}
    131131
  • trunk/admin/plugins_update.php

    r3282 r5021  
    6969      array_push($page['infos'],
    7070         sprintf(
    71             l10n('plugins_upgrade_ok'),
     71            l10n('%s has been successfully upgraded.'),
    7272            $plugins->fs_plugins[$_GET['plugin']]['name']));
    7373      break;
    7474
    7575    case 'temp_path_error':
    76       array_push($page['errors'], l10n('plugins_temp_path_error'));
     76      array_push($page['errors'], l10n('Can\'t create temporary file.'));
    7777      break;
    7878
    7979    case 'dl_archive_error':
    80       array_push($page['errors'], l10n('plugins_dl_archive_error'));
     80      array_push($page['errors'], l10n('Can\'t download archive.'));
    8181      break;
    8282
    8383    case 'archive_error':
    84       array_push($page['errors'], l10n('plugins_archive_error'));
     84      array_push($page['errors'], l10n('Can\'t read or extract archive.'));
    8585      break;
    8686
    8787    default:
    8888      array_push($page['errors'],
    89         sprintf(l10n('plugins_extract_error'), $_GET['upgradestatus']),
    90         l10n('plugins_check_chmod'));
     89        sprintf(l10n('An error occured during extraction (%s).'), $_GET['upgradestatus']),
     90        l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).'));
    9191  } 
    9292}
     
    158158else
    159159{
    160   array_push($page['errors'], l10n('plugins_server_error'));
     160  array_push($page['errors'], l10n('Can\'t connect to server.'));
    161161}
    162162
  • trunk/admin/site_manager.php

    r4325 r5021  
    6666  else
    6767  {
    68     array_push($page['errors'], l10n('site_err_remote_file_not_found'));
     68    array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found'));
    6969  }
    7070}
     
    103103  {
    104104    array_push($page['errors'],
    105       l10n('site_already_exists').' ['.$url.']');
     105      l10n('This site already exists').' ['.$url.']');
    106106  }
    107107  if (count($page['errors']) == 0)
     
    121121          {
    122122            array_push($page['errors'],
    123                        l10n('site_err').' : '.$first_line);
     123                       l10n('an error happened').' : '.$first_line);
    124124          }
    125125        }
    126126        else
    127127        {
    128           array_push($page['errors'], l10n('site_err_remote_file_not_found') );
     128          array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found') );
    129129        }
    130130      }
     
    150150    pwg_query($query);
    151151    array_push($page['infos'],
    152                $url.' '.l10n('site_created'));
     152               $url.' '.l10n('created'));
    153153  }
    154154}
     
    173173    case 'generate' :
    174174    {
    175       $title = $galleries_url.' : '.l10n('remote_site_generate');
     175      $title = $galleries_url.' : '.l10n('generate listing');
    176176      remote_output($galleries_url.'create_listing_file.php?action=generate');
    177177      break;
     
    179179    case 'test' :
    180180    {
    181       $title = $galleries_url.' : '.l10n('remote_site_test');
     181      $title = $galleries_url.' : '.l10n('test');
    182182      remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION);
    183183      break;
     
    185185    case 'clean' :
    186186    {
    187       $title = $galleries_url.' : '.l10n('remote_site_clean');
     187      $title = $galleries_url.' : '.l10n('clean');
    188188      remote_output($galleries_url.'create_listing_file.php?action=clean');
    189189      break;
     
    193193      delete_site($page['site']);
    194194      array_push($page['infos'],
    195                  $galleries_url.' '.l10n('site_deleted'));
     195                 $galleries_url.' '.l10n('deleted'));
    196196      break;
    197197    }
  • trunk/admin/site_update.php

    r4367 r5021  
    5656$error_labels = array(
    5757  'PWG-UPDATE-1' => array(
    58     l10n('update_wrong_dirname_short'),
    59     l10n('update_wrong_dirname_info')
     58    l10n('wrong filename'),
     59    l10n('The name of directories and files must be composed of letters, numbers, \"-\", \"_\" or \".\"')
    6060    ),
    6161  'PWG-UPDATE-2' => array(
    62     l10n('update_missing_tn_short'),
    63     l10n('update_missing_tn_info').implode(',', $conf['picture_ext'])
     62    l10n('missing thumbnail'),
     63    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'])
    6464    ),
    6565  'PWG-ERROR-NO-FS' => array(
    66     l10n('update_missing_file_or_dir'),
    67     l10n('update_missing_file_or_dir_info')
     66    l10n('File/directory read error'),
     67    l10n('The file or directory cannot be accessed (either it does not exist or the access is denied)')
    6868    ),
    6969  'PWG-ERROR-VERSION' => array(
    70     l10n('update_err_pwg_version_differs'),
    71     l10n('update_err_pwg_version_differs_info')
     70    l10n('Piwigo version differs on the remote site'),
     71    l10n('Version of create_listing_file.php on the remote site and Piwigo must be the same')
    7272    ),
    7373  'PWG-ERROR-NOLISTING' => array(
    74     l10n('update_err_remote_listing_not_found'),
    75     l10n('update_err_remote_listing_not_found_info')
     74    l10n('listing.xml file was not found'),
     75    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')
    7676    )
    7777  );
     
    279279        array(
    280280          'path' => $fulldir,
    281           'info' => l10n('update_research_added')
     281          'info' => l10n('added')
    282282          )
    283283        );
     
    328328    unset($db_fulldirs[$fulldir]);
    329329    array_push($infos, array('path' => $fulldir,
    330                              'info' => l10n('update_research_deleted')));
     330                             'info' => l10n('deleted')));
    331331  }
    332332  if (count($to_delete) > 0)
     
    474474        array(
    475475          'path' => $insert['path'],
    476           'info' => l10n('update_research_added')
     476          'info' => l10n('added')
    477477          )
    478478        );
     
    515515    array_push($to_delete_elements, array_search($path, $db_elements));
    516516    array_push($infos, array('path' => $path,
    517                              'info' => l10n('update_research_deleted')));
     517                             'info' => l10n('deleted')));
    518518  }
    519519  if (count($to_delete_elements) > 0)
     
    829829if (isset($simulate) and $simulate)
    830830{
    831   $result_title.= l10n('update_simulation_title').' ';
     831  $result_title.= l10n('[Simulation]').' ';
    832832}
    833833
     
    844844    'SITE_URL'=>$site_url,
    845845    'U_SITE_MANAGER'=> get_root_url().'admin.php?page=site_manager',
    846     'L_RESULT_UPDATE'=>$result_title.l10n('update_part_research'),
    847     'L_RESULT_METADATA'=>$result_title.l10n('update_result_metadata'),
     846    'L_RESULT_UPDATE'=>$result_title.l10n('Search for new images in the directories'),
     847    'L_RESULT_METADATA'=>$result_title.l10n('Metadata synchronization results'),
    848848    'METADATA_LIST' => $used_metadata,
    849849    'U_HELP' => get_root_url().'popuphelp.php?page=synchronize',
  • trunk/admin/tags.php

    r4325 r5021  
    6868          $page['errors'],
    6969          sprintf(
    70             l10n('Tag "%s" already exists'),
     70            l10n('Tag \"%s\" already exists'),
    7171            $tag_name
    7272            )
     
    165165      $page['infos'],
    166166      sprintf(
    167         l10n('Tag "%s" was added'),
     167        l10n('Tag \"%s\" was added'),
    168168        stripslashes($tag_name)
    169169        )
     
    175175      $page['errors'],
    176176      sprintf(
    177         l10n('Tag "%s" already exists'),
     177        l10n('Tag \"%s\" already exists'),
    178178        stripslashes($tag_name)
    179179        )
  • trunk/admin/template/goto/admin.tpl

    r3522 r5021  
    1717    <dd>
    1818      <ul>
    19         <li><a href="{$U_RETURN}">{'home'|@translate}</a></li>
    20         <li><a href="{$U_FAQ}">{'instructions'|@translate}</a></li>
    21         <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
    22         <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
     19        <li><a href="{$U_RETURN}">{'Home'|@translate}</a></li>
     20        <li><a href="{$U_FAQ}">{'Instructions'|@translate}</a></li>
     21        <li><a href="{$U_ADMIN}" title="{'Administration'|@translate}">{'Administration'|@translate}</a></li>
     22        <li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>
    2323{if isset($pwgmenu)}
    2424        <li class="external"><a class="external" href="{$pwgmenu.WIKI}" onclick="window.open(this.href, '');
    25           return false;">{'WIKI / DOC'|@translate}</a></li>
     25          return false;">{'Documentation'|@translate}</a></li>
    2626        <li class="external"><a class="external" href="{$pwgmenu.FORUM}" onclick="window.open(this.href, '');
    27           return false;">{'FORUM'|@translate}</a></li>
     27          return false;">{'Support'|@translate}</a></li>
    2828{/if}
    2929       
     
    3232  </dl>
    3333  <dl>
    34     <dt class="rdion"><span>{'config'|@translate}&nbsp;</span></dt>
     34    <dt class="rdion"><span>{'Configuration'|@translate}&nbsp;</span></dt>
    3535    <dd>
    3636      <ul>
    37         <li><a href="{$U_CONFIG_GENERAL}">{'conf_general'|@translate}</a></li>
    38         <li><a href="{$U_CONFIG_DISPLAY}">{'conf_display'|@translate}</a></li>
    39         <li><a href="{$U_CONFIG_MENUBAR}">{'title_menu'|@translate}</a></li>
    40         <li><a href="{$U_CONFIG_EXTENTS}">{'conf_extents'|@translate}</a></li>
     37        <li><a href="{$U_CONFIG_GENERAL}">{'General'|@translate}</a></li>
     38        <li><a href="{$U_CONFIG_DISPLAY}">{'Default display'|@translate}</a></li>
     39        <li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
     40        <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
    4141      </ul>
    4242    </dd>
     
    4747      <ul>
    4848        <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
    49         <li><a href="{$U_CAT_UPDATE}">{'update'|@translate}</a></li>
    50         <li><a href="{$U_CATEGORIES}">{'manage'|@translate}</a></li>
     49        <li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
     50        <li><a href="{$U_CATEGORIES}">{'Manage'|@translate}</a></li>
    5151        <li><a href="{$U_MOVE}">{'Move'|@translate}</a></li>
    52         <li><a href="{$U_CAT_OPTIONS}">{'cat_options_title'|@translate}</a></li>
     52        <li><a href="{$U_CAT_OPTIONS}">{'Properties'|@translate}</a></li>
    5353        <li><a href="{$U_PERMALINKS}">{'Permalinks'|@translate}</a></li>
    5454      </ul>
     
    5959    <dd>
    6060      <ul>
    61         <li><a href="{$U_WAITING}">{'waiting'|@translate}</a></li>
    62         <li><a href="{$U_THUMBNAILS}">{'thumbnails'|@translate}</a></li>
     61        <li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
     62        <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
    6363        <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
    6464        <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
    6565        <li><a href="{$U_CADDIE}">{'Caddie'|@translate}</a></li>
    66         <li><a href="{$U_RECENT_SET}">{'recent_pics_cat'|@translate}</a></li>
     66        <li><a href="{$U_RECENT_SET}">{'Recent pictures'|@translate}</a></li>
    6767      </ul>
    6868    </dd>
    6969  </dl>
    7070  <dl>
    71     <dt class="rdion"><span>{'identification'|@translate}&nbsp;</span></dt>
     71    <dt class="rdion"><span>{'Identification'|@translate}&nbsp;</span></dt>
    7272    <dd>
    7373      <ul>
    74         <li><a href="{$U_USERS}">{'users'|@translate}</a></li>
    75         <li><a href="{$U_GROUPS}">{'groups'|@translate}</a></li>
    76         <li><a href="{$U_NOTIFICATION_BY_MAIL}">{'nbm_item_notification'|@translate}</a></li>
     74        <li><a href="{$U_USERS}">{'Users'|@translate}</a></li>
     75        <li><a href="{$U_GROUPS}">{'Groups'|@translate}</a></li>
     76        <li><a href="{$U_NOTIFICATION_BY_MAIL}">{'Notification'|@translate}</a></li>
    7777      </ul>
    7878    </dd>
    7979  </dl>
    8080  <dl>
    81     <dt class="rdion"><span>{'special_admin_menu'|@translate}&nbsp;</span></dt>
     81    <dt class="rdion"><span>{'Specials'|@translate}&nbsp;</span></dt>
    8282    <dd>
    8383      <ul>
    8484        <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
    8585        <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
    86         <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced_features'|@translate}</a></li>
     86        <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced features'|@translate}</a></li>
    8787        <li><a href="{$U_PLUGINS}">{'Plugins'|@translate}</a>
    8888        {if !empty($plugin_menu_items)}
  • trunk/admin/template/goto/advanced_feature.tpl

    r3283 r5021  
    11<div class="titrePage">
    2   <h2>{'Advanced_features'|@translate}</h2>
     2  <h2>{'Advanced features'|@translate}</h2>
    33</div>
    44
  • trunk/admin/template/goto/cat_list.tpl

    r3283 r5021  
    2222</script>
    2323
    24 <h2>{'title_categories'|@translate}</h2>
     24<h2>{'Categories management'|@translate}</h2>
    2525
    2626<h3>{$CATEGORIES_NAV}</h3>
     
    2828<form id="addVirtual" action="{$F_ACTION}" method="post">
    2929  <p>
    30     {'cat_add'|@translate} : <input type="text" name="virtual_name">
     30    {'Add a virtual category'|@translate} : <input type="text" name="virtual_name">
    3131    <input class="submit" type="submit" value="{'Submit'|@translate}" name="submitAdd" {$TAG_INPUT_ENABLED}>
    3232    {if count($categories)>9 }
     
    5252        <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>
    5353        {/if}
    54         <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>
     54        <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>
    5555        {if isset($category.U_MANAGE_ELEMENTS) }
    56         <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>
     56        <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>
    5757        {/if}
    58         <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>
     58        <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>
    5959        {if isset($category.U_MANAGE_PERMISSIONS) }
    60         <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>
     60        <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>
    6161        {/if}
    6262        {if isset($category.U_DELETE) }
    63         <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>
     63        <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>
    6464        {/if}
    6565      </ul>
     
    6969      <strong><a href="{$category.U_CHILDREN}" title="{'manage sub-categories'|@translate}">{$category.NAME}</a></strong>
    7070      {if $category.IS_VIRTUAL}
    71       <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'virtual_category'|@translate}">
     71      <img src="{$themeconf.admin_icon_dir}/virt_category.png" class="button" alt="{'Virtual category'|@translate}">
    7272      {/if}
    7373      </p>
  • trunk/admin/template/goto/cat_modify.tpl

    r3283 r5021  
    44
    55<div class="titrePage">
    6   <h2>{'title_edit_cat'|@translate}</h2>
     6  <h2>{'Edit a category'|@translate}</h2>
    77</div>
    88
     
    1414  {/if}
    1515  {if isset($U_MANAGE_ELEMENTS) }
    16   <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>
    17   <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>
    18   {/if}
    19   <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>
     16  <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>
     17  <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>
     18  {/if}
     19  <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>
    2020  {if isset($U_MANAGE_PERMISSIONS) }
    21   <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>
     21  <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>
    2222  {/if}
    2323  {if isset($U_DELETE) }
    24   <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>
     24  <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>
    2525  {/if}
    2626</ul>
     
    3434    {if isset($CAT_FULL_DIR) }
    3535    <tr>
    36       <td><strong>{'storage'|@translate}</strong></td>
     36      <td><strong>{'Directory'|@translate}</strong></td>
    3737      <td class="row1">{$CAT_FULL_DIR}</td>
    3838    </tr>
     
    6969  <table>
    7070    <tr>
    71       <td><strong>{'conf_access'|@translate}</strong>
     71      <td><strong>{'Access type'|@translate}</strong>
    7272      <td>
    7373        {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
     
    7575    </tr>
    7676    <tr>
    77       <td><strong>{'lock'|@translate}</strong>
     77      <td><strong>{'Lock'|@translate}</strong>
    7878      <td>
    7979        {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
     
    8181    </tr>
    8282    <tr>
    83       <td><strong>{'comments'|@translate}</strong>
     83      <td><strong>{'Comments'|@translate}</strong>
    8484      <td>
    8585        {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
     
    8888    {if isset($SHOW_UPLOADABLE) }
    8989    <tr>
    90       <td><strong>{'editcat_uploadable'|@translate}</strong>
     90      <td><strong>{'Authorize upload'|@translate}</strong>
    9191      <td>
    9292        {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE}
     
    100100  <legend>{'Sort order'|@translate}</legend>
    101101  <input type="checkbox" name="image_order_default" id="image_order_default" {$IMG_ORDER_DEFAULT}>
    102   <label for="image_order_default">{'Use default sort order'|@translate}</label>
     102  <label for="image_order_default">{'Use the default image sort order (defined in the configuration file)'|@translate}</label>
    103103  <br>
    104104  <input type="checkbox" name="image_order_subcats" id="image_order_subcats">
     
    136136      <td>
    137137        {if $representant.ALLOW_SET_RANDOM }
    138         <p><input class="submit" type="submit" name="set_random_representant" value="{'cat_representant'|@translate}" {$TAG_INPUT_ENABLED}></p>
     138        <p><input class="submit" type="submit" name="set_random_representant" value="{'Find a new representant by random'|@translate}" {$TAG_INPUT_ENABLED}></p>
    139139        {/if}
    140140
     
    214214    </tr>
    215215    <tr>
    216       <td><strong>{'mail_content'|@translate}</strong></td>
     216      <td><strong>{'Mail content'|@translate}</strong></td>
    217217      <td>
    218218        <textarea cols="50" rows="5" name="mail_content" id="mail_content" class="description">{$MAIL_CONTENT}</textarea>
  • trunk/admin/template/goto/cat_options.tpl

    r3283 r5021  
    11<div class="titrePage">
    2   <h2>{'cat_options_title'|@translate} {$TABSHEET_TITLE}</h2>
     2  <h2>{'Properties'|@translate} {$TABSHEET_TITLE}</h2>
    33</div>
    44
  • trunk/admin/template/goto/check_integrity.tpl

    r3283 r5021  
    11<dl>
    2   <dt>{'c13y_title'|@translate}</dt>
     2  <dt>{'Check integrity'|@translate}</dt>
    33  <dd>
    44    <ul>
     
    88          <tr class="throw">
    99            <th></th>
    10             <th>{'c13y_Anomaly'|@translate}</th>
    11             <th>{'c13y_Correction'|@translate}</th>
     10            <th>{'Anomaly'|@translate}</th>
     11            <th>{'Correction'|@translate}</th>
    1212          </tr>
    1313          {if isset($c13y_list)}
     
    2323                  <label for="c13y_selection-{$c13y.id}">
    2424                    {if $c13y.show_ignore_msg}
    25                       {'c13y_ignore_msg1'|@translate}
     25                      {'The anomaly will be ignored until next application version'|@translate}
    2626                      <br>
    27                       {'c13y_ignore_msg2'|@translate}
     27                      {'Correction the anomaly will cancel the fact that it\'s ignored'|@translate}
    2828                    {/if}
    2929                    {if $c13y.show_correction_fct}
    30                       {'c13y_Automatic_correction'|@translate}
     30                      {'Automatic correction'|@translate}
    3131                    {/if}
    3232                    {if $c13y.show_correction_bad_fct}
    33                       {'c13y_Impossible_automatic_correction'|@translate}
     33                      {'Impossible automatic correction'|@translate}
    3434                    {/if}
    3535                    {if $c13y.show_correction_success_fct}
    36                       {'c13y_Correction_applied_success'|@translate}
     36                      {'Correction applied with success'|@translate}
    3737                    {/if}
    3838                    {if !empty($c13y.correction_error_fct)}
    39                       {'c13y_Correction_applied_error'|@translate}
     39                      {'Correction applied with error'|@translate}
    4040                      <br>
    4141                      {$c13y.c13y.correction_error_fct}
     
    6464              document.getElementById('c13y_selection-{$ID}').checked = true;
    6565            {/foreach}
    66             return false;">{'c13y_check_auto'|@translate}</a>
     66            return false;">{'Check automatic corrections'|@translate}</a>
    6767          {/if}
    6868        </p>
     
    7070        <p>
    7171          {if $c13y_show_submit_automatic_correction}
    72             <input class="submit" type="submit" value="{'c13y_submit_correction'|@translate}" name="c13y_submit_correction" {$TAG_INPUT_ENABLED}>
     72            <input class="submit" type="submit" value="{'Apply selected corrections'|@translate}" name="Apply selected corrections" {$TAG_INPUT_ENABLED}>
    7373          {/if}
    7474          {if $c13y_show_submit_ignore}
    75             <input class="submit" type="submit" value="{'c13y_submit_ignore'|@translate}" name="c13y_submit_ignore" {$TAG_INPUT_ENABLED}>
     75            <input class="submit" type="submit" value="{'Ignore selected anomalies'|@translate}" name="Ignore selected anomalies" {$TAG_INPUT_ENABLED}>
    7676          {/if}
    77           <input class="submit" type="submit" value="{'c13y_submit_refresh'|@translate}" name="c13y_submit_refresh">
     77          <input class="submit" type="submit" value="{'Refresh'|@translate}" name="Refresh">
    7878          </p>
    7979
  • trunk/admin/template/goto/comments.tpl

    r3283 r5021  
    11<div class="titrePage">
    2   <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2>
     2  <h2>{'Waiting'|@translate} {$TABSHEET_TITLE}</h2>
    33</div>
    44
  • trunk/admin/template/goto/configuration.tpl

    r3445 r5021  
    33
    44<div class="titrePage">
    5   <h2>{'title_configuration'|@translate} {$TABSHEET_TITLE}</h2>
     5  <h2>{'Piwigo configuration'|@translate} {$TABSHEET_TITLE}</h2>
    66</div>
    77
     
    7070    <li>
    7171      <label>
    72         <span class="property">{'obligatory_user_mail_address'|@translate}</span>
     72        <span class="property">{'Mail address is obligatory for all users'|@translate}</span>
    7373        <input type="checkbox" name="obligatory_user_mail_address" {if ($main.obligatory_user_mail_address)}checked="checked"{/if}>
    7474      </label>
     
    7777    <li>
    7878      <label>
    79         <span class="property">{'Email administrators when a new user registers'|@translate}</span>
     79        <span class="property">{'Email admins when a new user registers'|@translate}</span>
    8080        <input type="checkbox" name="email_admin_on_new_user" {if ($main.email_admin_on_new_user)}checked="checked"{/if}>
    8181      </label>
     
    9090  <ul>
    9191      <li>
    92         <label><span class="property">{'conf_history_guest'|@translate}</span><input type="checkbox" name="history_guest" {if ($history.history_guest)}checked="checked"{/if}></label>
     92        <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>
    9393      </li>
    9494
    9595      <li>
    96         <label><span class="property">{'conf_history_user'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if}></label>
     96        <label><span class="property">{'Save page visits by users'|@translate}</span><input type="checkbox" name="log" {if ($history.log)}checked="checked"{/if}></label>
    9797      </li>
    9898
    9999      <li>
    100         <label><span class="property">{'conf_history_admin'|@translate}</span><input type="checkbox" name="history_admin" {if ($history.history_admin)}checked="checked"{/if}></label>
     100        <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>
    101101      </li>
    102102  </ul>
     
    133133    <li>
    134134      <label>
    135         <span class="property">{'Email administrators when a valid comment is entered'|@translate}</span>
     135        <span class="property">{'Email admins when a valid comment is entered'|@translate}</span>
    136136        <input type="checkbox" name="email_admin_on_comment" {if ($comments.email_admin_on_comment)}checked="checked"{/if}>
    137137      </label>
     
    140140    <li>
    141141      <label>
    142         <span class="property">{'Email administrators when a comment requires validation'|@translate}</span>
     142        <span class="property">{'Email admins when a comment requires validation'|@translate}</span>
    143143        <input type="checkbox" name="email_admin_on_comment_validation" {if ($comments.email_admin_on_comment_validation)}checked="checked"{/if}>
    144144      </label>
     
    189189    <li>
    190190      <label>
    191         <span class="property">{'Email administrators when a picture is uploaded'|@translate}</span>
     191        <span class="property">{'Email admins when a picture is uploaded'|@translate}</span>
    192192        <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if}>
    193193      </label>
  • trunk/admin/template/goto/extend_for_templates.tpl

    r3283 r5021  
    1 <div class="titrePage"><h2>{'extend_for_templates'|@translate}</h2>
     1<div class="titrePage"><h2>{'Extend for templates'|@translate}</h2>
    22</div>
    33{if isset($extents)}
    4 <h4>{'Replacement of original templates'|@translate}</h4>
     4<h4>{'Replacement of original templates by customized templates from template-extension subfolder'|@translate}</h4>
    55<form method="post" name="extend_for_templates" id="extend_for_templates" action="">
    66  <table class="table2">
    77    <tr class="throw">
    8       <th>{'Replacers'|@translate}</th>
     8      <th>{'Replacers (customized templates)'|@translate}</th>
    99      <th>{'Original templates'|@translate}</th>
    1010      <th>{'Optional URL keyword'|@translate}</th>
  • trunk/admin/template/goto/footer.tpl

    r3283 r5021  
    66 <a name="EoP"></a> <!-- End of ADMIN Page -->
    77 {if isset($debug.TIME) }
    8  {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
     8 {'SQL queries in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
    99 {/if}
    1010
     
    1414  *}
    1515
    16   {'powered_by'|@translate}
     16  {'Powered by'|@translate}
    1717  <a href="{$PHPWG_URL}" class="Piwigo">
    1818  <span class="Piwigo">Piwigo</span></a>
    1919  {$VERSION}
    2020  {if isset($CONTACT_MAIL)}
    21   - {'send_mail'|@translate}
     21  - {'Contact'|@translate}
    2222  <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
    2323  {/if}
  • trunk/admin/template/goto/group_list.tpl

    r3283 r5021  
    11<div class="titrePage">
    2   <h2>{'title_groups'|@translate}</h2>
     2  <h2>{'Group management'|@translate}</h2>
    33</div>
    44
     
    3131    <td style="text-align:center;">
    3232      <a href="{$group.U_PERM}">
    33         <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
     33        <img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/Permissions.png" class="button" style="border:none" alt="{'Permissions'|@translate}" title="{'Permissions'|@translate}"></a>
    3434      <a href="{$group.U_DELETE}" onclick="return confirm('{'delete'|@translate|@escape:'javascript'}' + '\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
    35         <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>
     35        <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>
    3636      <a href="{$group.U_ISDEFAULT}" onclick="return confirm('{'toggle_is_default_group'|@translate|@escape:'javascript'}' +'\n\n' + '{'Are you sure?'|@translate|@escape:'javascript'}');">
    37         <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>
     37        <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>
    3838    </td>
    3939  </tr>
  • trunk/admin/template/goto/history.tpl

    r3283 r5021  
    1717  <legend>{'Filter'|@translate}</legend>
    1818  <ul>
    19     <li><label>{'search_date_from'|@translate}</label></li>
     19    <li><label>{'Date'|@translate}</label></li>
    2020    <li>
    2121      <select id="start_day" name="start_day">
     
    3333  </ul>
    3434  <ul>
    35     <li><label>{'search_date_to'|@translate}</label></li>
     35    <li><label>{'End-Date'|@translate}</label></li>
    3636    <li>
    3737      <select id="end_day" name="end_day">
     
    107107<tr class="throw">
    108108  <th>{'Date'|@translate}</th>
    109   <th>{'time'|@translate}</th>
    110   <th>{'user'|@translate}</th>
     109  <th>{'Time'|@translate}</th>
     110  <th>{'User'|@translate}</th>
    111111  <th>{'IP'|@translate}</th>
    112   <th>{'image'|@translate}</th>
     112  <th>{'Element'|@translate}</th>
    113113  <th>{'Element type'|@translate}</th>
    114   <th>{'section'|@translate}</th>
    115   <th>{'category'|@translate}</th>
    116   <th>{'tags'|@translate}</th>
     114  <th>{'Section'|@translate}</th>
     115  <th>{'Category'|@translate}</th>
     116  <th>{'Tags'|@translate}</th>
    117117</tr>
    118118{if !empty($search_results) }
  • trunk/admin/template/goto/install.tpl

    r4985 r5021  
    7171  <table class="table2">
    7272    <tr class="throw">
    73       <th colspan="2">{'Initial_config'|@translate}</th>
     73      <th colspan="2">{'Basic configuration'|@translate}</th>
    7474    </tr>
    7575    <tr>
    76       <td style="width: 30%">{'Default_lang'|@translate}</td>
     76      <td style="width: 30%">{'Default gallery language'|@translate}</td>
    7777      <td>
    7878    <select name="language" onchange="document.location = 'install.php?language='+this.options[this.selectedIndex].value;">
     
    8484  <table class="table2">
    8585    <tr class="throw">
    86       <th colspan="3">{'step1_title'|@translate}</th>
     86      <th colspan="3">{'Database configuration'|@translate}</th>
    8787    </tr>
    8888    {if count($F_DB_ENGINES)>1}
    8989    <tr>
    90       <td style="width: 30%;">{'step1_dbengine'|@translate}</td>
     90      <td style="width: 30%;">{'Database type'|@translate}</td>
    9191      <td>
    9292        <select name="dblayer" id="dblayer">
     
    9999        </select>   
    100100      </td>
    101       <td>{'step1_dbengine_info'|@translate}</td>
     101      <td>{'The type of database your piwigo data will be store in'|@translate}</td>
    102102    {else}
    103103    <td colspan="3">
     
    107107    </tr>
    108108    <tr>
    109       <td style="width: 30%;">{'step1_host'|@translate}</td>
     109      <td style="width: 30%;">{'Host'|@translate}</td>
    110110      <td align=center><input type="text" name="dbhost" value="{$F_DB_HOST}"></td>
    111       <td>{'step1_host_info'|@translate}</td>
     111      <td>{'localhost, sql.multimania.com, toto.freesurf.fr'|@translate}</td>
    112112    </tr>
    113113    <tr>
    114       <td>{'step1_user'|@translate}</td>
     114      <td>{'User'|@translate}</td>
    115115      <td align=center><input type="text" name="dbuser" value="{$F_DB_USER}"></td>
    116       <td>{'step1_user_info'|@translate}</td>
     116      <td>{'user login given by your host provider'|@translate}</td>
    117117    </tr>
    118118    <tr>
    119       <td>{'step1_pass'|@translate}</td>
     119      <td>{'Password'|@translate}</td>
    120120      <td align=center><input type="password" name="dbpasswd" value=""></td>
    121       <td>{'step1_pass_info'|@translate}</td>
     121      <td>{'user password given by your host provider'|@translate}</td>
    122122    </tr>
    123123    <tr>
    124       <td>{'step1_database'|@translate}</td>
     124      <td>{'Database name'|@translate}</td>
    125125      <td align=center><input type="text" name="dbname" value="{$F_DB_NAME}"></td>
    126       <td>{'step1_database_info'|@translate}</td>
     126      <td>{'also given by your host provider'|@translate}</td>
    127127    </tr>
    128128    <tr>
    129       <td>{'step1_prefix'|@translate}</td>
     129      <td>{'Database table prefix'|@translate}</td>
    130130      <td align=center><input type="text" name="prefix" value="{$F_DB_PREFIX}"></td>
    131       <td>{'step1_prefix_info'|@translate}</td>
     131      <td>{'database tables names will be prefixed with it (enables you to manage better your tables)'|@translate}</td>
    132132    </tr>
    133133  </table>
     
    135135  <table class="table2">
    136136    <tr class="throw">
    137       <th colspan="3">{'step2_title'|@translate}</th>
     137      <th colspan="3">{'Admin configuration'|@translate}</th>
    138138    </tr>
    139139    <tr>
    140       <td style="width: 30%;">{'install_webmaster'|@translate}</td>
     140      <td style="width: 30%;">{'Webmaster login'|@translate}</td>
    141141      <td align="center"><input type="text" name="admin_name" value="{$F_ADMIN}"></td>
    142       <td>{'install_webmaster_info'|@translate}</td>
     142      <td>{'It will be shown to the visitors. It is necessary for website administration'|@translate}</td>
    143143    </tr>
    144144    <tr>
    145       <td>{'step2_pwd'|@translate}</td>
     145      <td>{'Webmaster password'|@translate}</td>
    146146      <td align="center"><input type="password" name="admin_pass1" value=""></td>
    147       <td>{'step2_pwd_info'|@translate}</td>
     147      <td>{'Keep it confidential, it enables you to access administration panel'|@translate}</td>
    148148    </tr>
    149149    <tr>
    150       <td>{'step2_pwd_conf'|@translate}</td>
     150      <td>{'Password [confirm]'|@translate}</td>
    151151      <td align="center"><input type="password" name="admin_pass2" value=""></td>
    152       <td>{'step2_pwd_conf_info'|@translate}</td>
     152      <td>{'verification'|@translate}</td>
    153153    </tr>
    154154    <tr>
    155       <td>{'conf_mail_webmaster'|@translate}</td>
     155      <td>{'Webmaster mail address'|@translate}</td>
    156156      <td align="center"><input type="text" name="admin_mail" value="{$F_ADMIN_EMAIL}"></td>
    157       <td>{'conf_mail_webmaster_info'|@translate}</td>
     157      <td>{'Visitors will be able to contact site administrator with this mail'|@translate}</td>
    158158    </tr>
    159159  </table>
     
    162162    <tr>
    163163      <td style="text-align: center;">
    164         <input class="submit" type="submit" name="install" value="{'Start_Install'|@translate}">
     164        <input class="submit" type="submit" name="install" value="{'Start Install'|@translate}">
    165165      </td>
    166166    </tr>
     
    169169{else}
    170170<p>
    171   <input type="button" name="home" value="{'home'|@translate}" onClick="window.open('index.php');">
    172   <input type="button" name="admin" value="{'admin'|@translate}" onClick="window.open('admin.php');">
     171  <input type="button" name="Home" value="{'Home'|@translate}" onClick="window.open('index.php');">
     172  <input type="button" name="Administration" value="{'Administration'|@translate}" onClick="window.open('Administration.php');">
    173173</p>
    174174
     
    176176<div class="infos">
    177177  <ul>
    178     <li>{'Subscribe to Piwigo Announcements Newsletter'|@translate}</li>
     178    <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>
    179179  </ul>
    180180</div>
  • trunk/admin/template/goto/intro.tpl

    r4325 r5021  
    1111</script>
    1212
    13 <h2>{'title_default'|@translate}</h2>
     13<h2>{'Piwigo administration'|@translate}</h2>
    1414<dl style="padding-top: 30px;">
    1515  <dt>{'Piwigo version'|@translate}</dt>
  • trunk/admin/template/goto/maintenance.tpl

    r3517 r5021  
    44
    55<ul>
    6   <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'update categories informations'|@translate}</a></li>
    7   <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'update images informations'|@translate}</a></li>
    8   <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'repair and optimize database'|@translate}</a></li>
     6  <li><a href="{$U_MAINT_CATEGORIES}" {$TAG_INPUT_ENABLED}>{'Update categories informations'|@translate}</a></li>
     7  <li><a href="{$U_MAINT_IMAGES}" {$TAG_INPUT_ENABLED}>{'Update images informations'|@translate}</a></li>
     8  <li><a href="{$U_MAINT_DATABASE}" {$TAG_INPUT_ENABLED}>{'Repair and optimize database'|@translate}</a></li>
    99</ul>
    1010
    1111<ul>
    12   <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history detail'|@translate}</a></li>
    13   <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'purge history summary'|@translate}</a></li>
    14   <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'purge sessions'|@translate}</a></li>
    15   <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'purge never used notification feeds'|@translate}</a></li>
    16   <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
     12  <li><a href="{$U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{'Purge history detail'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge history detail'|@translate}</a></li>
     13  <li><a href="{$U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{'Purge history summary'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge history summary'|@translate}</a></li>
     14  <li><a href="{$U_MAINT_SESSIONS}" {$TAG_INPUT_ENABLED}>{'Purge sessions'|@translate}</a></li>
     15  <li><a href="{$U_MAINT_FEEDS}" {$TAG_INPUT_ENABLED}>{'Purge never used notification feeds'|@translate}</a></li>
     16  <li><a href="{$U_MAINT_SEARCH}"onclick="return confirm('{'Purge search history'|@translate}');" {$TAG_INPUT_ENABLED}>{'Purge search history'|@translate}</a></li>
    1717  <li><a href="{$U_MAINT_COMPILED_TEMPLATES}" {$TAG_INPUT_ENABLED}>{'Purge compiled templates'|@translate}</a></li>
    1818</ul>
    1919
    2020<ul>
    21   <li><a href="{$U_MAINT_C13Y}" {$TAG_INPUT_ENABLED}>{'c13y_maintenance'|@translate}</a></li>
     21  <li><a href="{$U_MAINT_C13Y}" {$TAG_INPUT_ENABLED}>{'Reinitialize check integrity'|@translate}</a></li>
    2222</ul>
  • trunk/admin/template/goto/navigation_bar.tpl

    r3283 r5021  
    11<div class="navigationBar">
    22  {if isset($navbar.URL_FIRST)}
    3   <a href="{$navbar.URL_FIRST}" rel="first">{'first_page'|@translate}</a> |
    4   <a href="{$navbar.URL_PREV}" rel="prev">{'previous_page'|@translate}</a> |
     3  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
     4  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
    55  {else}
    6   {'first_page'|@translate} |
    7   {'previous_page'|@translate} |
     6  {'First'|@translate} |
     7  {'Previous'|@translate} |
    88  {/if}
    99
     
    2020
    2121  {if isset($navbar.URL_NEXT)}
    22   | <a href="{$navbar.URL_NEXT}" rel="next">{'next_page'|@translate}</a>
    23   | <a href="{$navbar.URL_LAST}" rel="last">{'last_page'|@translate}</a>
     22  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
     23  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
    2424  {else}
    25   | {'next_page'|@translate}
    26   | {'last_page'|@translate}
     25  | {'Next'|@translate}
     26  | {'Last'|@translate}
    2727  {/if}
    2828</div>
  • trunk/admin/template/goto/notification_by_mail.tpl

    r3283 r5021  
    33
    44<div class="titrePage">
    5   <h2>{'nbm_send_mail_to_users'|@translate} {$TABSHEET_TITLE}</h2>
     5  <h2>{'Send mail to users'|@translate} {$TABSHEET_TITLE}</h2>
    66</div>
    77
     
    1010  <fieldset>
    1111    <div class="infos">
    12       <input class="submit" type="submit" value="{'nbm_repost_submit'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}>
     12      <input class="submit" type="submit" value="{'Continue processing treatment'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}>
    1313    </div>
    1414  </fieldset>
     
    1717  {if isset($param)}
    1818  <fieldset>
    19     <legend>{'nbm_title_param'|@translate}</legend>
     19    <legend>{'Parameters'|@translate}</legend>
    2020    <table>
    2121      <tr>
    22         <td><label>{'nbm_send_html_mail'|@translate}</label></td>
     22        <td><label>{'Send mail on HTML format'|@translate}</label></td>
    2323        <td>
    2424          <label><input type="radio" name="nbm_send_html_mail" value="true"  {if $param.SEND_HTML_MAIL}checked="checked"{/if}>{'Yes'|@translate}</label>
     
    2828      <tr>
    2929        <td>
    30           <label for="send_mail_as">{'nbm_send_mail_as'|@translate}</label>
    31           <br><i><small>{'nbm_info_send_mail_as'|@translate}</small></i>
     30          <label for="send_mail_as">{'Send mail as'|@translate}</label>
     31          <br><i><small>{'With blank value, gallery title will be used'|@translate}</small></i>
    3232        </td>
    3333        <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{$param.SEND_MAIL_AS}"></td>
    3434      </tr>
    3535      <tr>
    36         <td><label>{'nbm_send_detailed_content'|@translate}</label></td>
     36        <td><label>{'Add detailed content'|@translate}</label></td>
    3737        <td>
    3838          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {if $param.SEND_DETAILED_CONTENT}checked="checked"{/if}>{'Yes'|@translate}</label>
     
    4141      </tr>
    4242     <tr>
    43         <td><label for="complementary_mail_content">{'nbm_complementary_mail_content'|@translate}</label></td>
     43        <td><label for="complementary_mail_content">{'Complementary mail content'|@translate}</label></td>
    4444        <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{$param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
    4545      </tr>
    4646      <tr>
    4747        <td>
    48           <label>{'nbm_send_recent_post_dates'|@translate}</label>
    49           <br><i><small>{'nbm_info_send_recent_post_dates'|@translate}</small></i>
     48          <label>{'Include display of recent pictures group by dates'|@translate}</label>
     49          <br><i><small>{'Available only with HTML format'|@translate}</small></i>
    5050        </td>
    5151        <td>
     
    6565  {if isset($subscribe)}
    6666  <fieldset>
    67     <legend>{'nbm_title_subscribe'|@translate}</legend>
    68     <p><i>{'nbm_warning_subscribe_unsubscribe'|@translate}</i></p>
     67    <legend>{'Subscribe/unsubscribe users'|@translate}</legend>
     68    <p><i>{'Warning: subscribing or unsubscribing will send mails to users'|@translate}</i></p>
    6969    {$DOUBLE_SELECT}
    7070  </fieldset>
     
    7373  {if isset($send)}
    7474    {if empty($send.users)}
    75     <p>{'nbm_no_user_available_to_send_L1'|@translate}</p>
     75    <p>{'There is no available subscribers to mail.'|@translate}</p>
    7676    <p>
    77     {'nbm_no_user_available_to_send_L2'|@translate}<br>
    78     {'nbm_no_user_available_to_send_L3'|@translate}
     77    {'Subscribers could be listed (available) only if there is new elements to notify.'|@translate}<br>
     78    {'Anyway only webmasters can see this tab and never administrators.'|@translate}
    7979    </p>
    8080    {else}
    8181    <fieldset>
    82       <legend>{'nbm_title_send'|@translate}</legend>
     82      <legend>{'Select recipients'|@translate}</legend>
    8383      <table class="table2">
    8484        <tr class="throw">
    85           <th>{'nbm_col_user'|@translate}</th>
    86           <th>{'nbm_col_mail'|@translate}</th>
    87           <th>{'nbm_col_last_send'|@translate}</th>
    88           <th>{'nbm_col_check_user_send_mail'|@translate}</th>
     85          <th>{'User'|@translate}</th>
     86          <th>{'email'|@translate}</th>
     87          <th>{'Last send'|@translate}</th>
     88          <th>{'To send ?'|@translate}</th>
    8989        </tr>
    9090        {foreach from=$send.users item=u name=user_loop}
     
    104104
    105105    <fieldset>
    106       <legend>{'nbm_send_options'|@translate}</legend>
     106      <legend>{'Options'|@translate}</legend>
    107107      <table>
    108108       <tr>
    109           <td><label for="send_customize_mail_content">{'nbm_send_complementary_mail_content'|@translate}</label></td>
     109          <td><label for="send_customize_mail_content">{'Complementary mail content'|@translate}</label></td>
    110110          <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{$send.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
    111111        </tr>
     
    114114
    115115    <p>
    116       <input class="submit" type="submit" value="{'nbm_send_submit'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}>
     116      <input class="submit" type="submit" value="{'Send'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}>
    117117    </p>
    118118    {/if}
  • trunk/admin/template/goto/permalinks.tpl

    r3283 r5021  
    6161                <td>{$permalink.last_hit}</td>
    6262                <td>{$permalink.hit}</td>
    63                 <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>
     63                <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>
    6464        </tr>
    6565{/foreach}
  • trunk/admin/template/goto/picture_modify.tpl

    r3283 r5021  
    1010{/literal}
    1111
    12 <h2>{'title_picmod'|@translate}</h2>
    13 
    14 <img src="{$TN_SRC}" alt="{'thumbnail'|@translate}" class="thumbnail">
     12<h2>{'Modify informations about a picture'|@translate}</h2>
     13
     14<img src="{$TN_SRC}" alt="{'Thumbnail'|@translate}" class="Thumbnail">
    1515
    1616<ul class="categoryActions">
     
    1919  {/if}
    2020  {if !url_is_remote($path)}
    21   <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>
     21  <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>
    2222  {/if}
    2323</ul>
  • trunk/admin/template/goto/plugins_list.tpl

    r3282 r5021  
    7171      <li>
    7272        <a href="{$plugin.U_ACTION}&amp;action=delete" onclick="return confirm('{'plugins_confirm_delete'|@translate|@escape:'javascript'}');">
    73           <img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}">
     73          <img src="{$themeconf.admin_icon_dir}/plug_delete.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}">
    7474        </a>
    7575      </li>
    7676    {else}
    7777      <li>
    78         <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'plugins_delete'|@translate}" title="{'plugins_delete'|@translate}">
     78        <img src="{$themeconf.admin_icon_dir}/plug_delete_grey.png" alt="{'Delete'|@translate}" title="{'Delete'|@translate}">
    7979      </li>
    8080    {/if}
  • trunk/admin/template/goto/plugins_new.tpl

    r3722 r5021  
    4040    <td>{$plugin.AUTHOR}</td>
    4141    <td style="text-align:center;"><a href="{$plugin.URL_INSTALL}" onclick="return confirm('{'plugins_confirm_install'|@translate|@escape:javascript}');">{'plugins_auto_install'|@translate}</a>
    42       / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a>
     42      / <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a>
    4343    </td>
    4444  </tr>
  • trunk/admin/template/goto/plugins_update.tpl

    r3722 r5021  
    1717{if isset($plugins_not_uptodate)}
    1818<br>
    19 <b>{'plugins_need_update'|@translate}</b>
     19<b>{'Plugins which need upgrade'|@translate}</b>
    2020<table class="table2 plugins">
    2121<thead>
    2222  <tr class="throw">
    2323    <td>{'Name'|@translate}</td>
    24     <td>{'plugins_actual_version'|@translate}</td>
    25     <td>{'plugins_new_version'|@translate}</td>
     24    <td>{'Current<br>version'|@translate}</td>
     25    <td>{'Available<br>version'|@translate}</td>
    2626    <td>{'Actions'|@translate}</td>
    2727  </tr>
     
    3333    <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>
    3434    <td style="text-align:center;"><a href="{$plugin.URL_UPDATE}" onclick="return confirm('{'plugins_confirm_upgrade'|@translate|@escape:javascript}');">{'plugins_auto_update'|@translate}</a>
    35       / <a href="{$plugin.URL_DOWNLOAD}">{'plugins_download'|@translate}</a></td>
     35      / <a href="{$plugin.URL_DOWNLOAD}">{'Download file'|@translate}</a></td>
    3636  </tr>
    3737{/foreach}
     
    4242{if isset($plugins_uptodate)}
    4343<br>
    44 <b>{'plugins_dontneed_update'|@translate}</b>
     44<b>{'Plugins up to date'|@translate}</b>
    4545<table class="table2 plugins">
    4646<thead>
     
    6262{if isset($plugins_cant_check)}
    6363<br>
    64 <b>{'plugins_cant_check'|@translate}</b>
     64<b>{'Plugin versions can\'t be checked'|@translate}</b>
    6565<table class="table2 plugins">
    6666<thead>
  • trunk/admin/template/goto/profile_content.tpl

    r3283 r5021  
    2626      <li>
    2727        <span class="property">
    28           <label for="use_new_pwd">{'new_password'|@translate}</label>
     28          <label for="use_new_pwd">{'New password'|@translate}</label>
    2929        </span>
    3030        <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
     
    4141
    4242  <fieldset>
    43     <legend>{'preferences'|@translate}</legend>
     43    <legend>{'Preferences'|@translate}</legend>
    4444
    4545    <ul>
    4646      <li>
    4747        <span class="property">
    48           <label for="nb_image_line">{'nb_image_per_row'|@translate}</label>
     48          <label for="nb_image_line">{'Number of images per row'|@translate}</label>
    4949        </span>
    5050        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
     
    5252      <li>
    5353        <span class="property">
    54           <label for="nb_line_page">{'nb_row_per_page'|@translate}</label>
     54          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
    5555        </span>
    5656        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
     
    5858      <li>
    5959        <span class="property">
    60           <label for="template">{'theme'|@translate}</label>
     60          <label for="template">{'Interface theme'|@translate}</label>
    6161        </span>
    6262        {html_options id=template name=template options=$template_options selected=$template_selection}
     
    6464      <li>
    6565        <span class="property">
    66           <label for="language">{'language'|@translate}</label>
     66          <label for="Language">{'Language'|@translate}</label>
    6767        </span>
    6868        {html_options id=language name=language options=$language_options selected=$language_selection}
     
    7070      <li>
    7171        <span class="property">
    72           <label for="recent_period">{'recent_period'|@translate}</label>
     72          <label for="Recent period">{'Recent period'|@translate}</label>
    7373        </span>
    7474        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
    7575      </li>
    7676      <li>
    77         <span class="property">{'auto_expand'|@translate}</span>
     77        <span class="property">{'Expand all categories'|@translate}</span>
    7878        {html_radios name='expand' options=$radio_options selected=$EXPAND}
    7979      </li>
    8080      <li>
    81         <span class="property">{'show_nb_comments'|@translate}</span>
     81        <span class="property">{'Show number of comments'|@translate}</span>
    8282        {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
    8383      </li>
    8484      <li>
    85         <span class="property">{'show_nb_hits'|@translate}</span>
     85        <span class="property">{'Show number of hits'|@translate}</span>
    8686        {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    8787      </li>
    8888      <li>
    8989        <span class="property">
    90           <label for="maxwidth">{'maxwidth'|@translate}</label>
     90          <label for="Maximum width of the pictures">{'Maximum width of the pictures'|@translate}</label>
    9191        </span>
    9292        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
     
    9494      <li>
    9595        <span class="property">
    96           <label for="maxheight">{'maxheight'|@translate}</label>
     96          <label for="Maximum height of the pictures">{'Maximum height of the pictures'|@translate}</label>
    9797        </span>
    9898        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
  • trunk/admin/template/goto/rating.tpl

    r3283 r5021  
    1 <h2>{'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
     1<h2>{'elements'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]</h2>
    22
    33<form action="{$F_ACTION}" method="GET" id="update" class="filter">
     
    5959    <td><b>{$rate.USER}</b></td>
    6060    <td><span class="date">{$rate.DATE}</span></td>
    61     <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>
     61    <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>
    6262</tr>
    6363{/foreach} {*rates*}
  • trunk/admin/template/goto/site_manager.tpl

    r3283 r5021  
    1414
    1515{if isset($local_listing)}
    16 {'remote_site_local_found'|@translate} {$local_listing.URL}
     16{'A local listing.xml file has been found for '|@translate} {$local_listing.URL}
    1717{if isset($local_listing.CREATE)}
    1818<form action="{$F_ACTION}" method="post">
    1919  <p>
    20     {'remote_site_local_create'|@translate}:
     20    {'Create this site'|@translate}:
    2121    <input type="hidden" name="no_check" value="1">
    2222    <input type="hidden" name="galleries_url" value="{$local_listing.URL}">
     
    2626{/if}
    2727{if isset($local_listing.U_SYNCHRONIZE)}
    28 &nbsp;<a href="{$local_listing.U_SYNCHRONIZE}" title="{'remote_site_local_update'|@translate}">{'site_synchronize'|@translate}</a>
     28&nbsp;<a href="{$local_listing.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>
    2929<br><br>
    3030{/if}
     
    3434<table class="table2">
    3535        <tr class="throw">
    36                 <td>{'site_local'|@translate} / {'site_remote'|@translate}</td>
     36                <td>{'Remote'|@translate} / {'Remote'|@translate}</td>
    3737                <td>{'Actions'|@translate}</td>
    3838        </tr>
     
    4141    <a href="{$site.NAME}">{$site.NAME}</a><br>({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})
    4242  </td><td>
    43     [<a href="{$site.U_SYNCHRONIZE}" title="{'site_synchronize_hint'|@translate}">{'site_synchronize'|@translate}</a>]
     43    [<a href="{$site.U_SYNCHRONIZE}" title="{'synchronize'|@translate}">{'synchronize'|@translate}</a>]
    4444    {if isset($site.U_DELETE)}
    4545      [<a href="{$site.U_DELETE}" onclick="return confirm('{'Are you sure?'|@translate|escape:'javascript'}');"
    46                 title="{'site_delete_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'site_delete'|@translate}</a>]
     46                title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}>{'delete'|@translate}</a>]
    4747    {/if}
    4848    {if isset($site.remote)}
    4949      <br>
    50       [<a href="{$site.remote.U_TEST}" title="{'remote_site_test_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_test'|@translate}</a>]
    51       [<a href="{$site.remote.U_GENERATE}" title="{'remote_site_generate_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_generate'|@translate}</a>]
    52       [<a href="{$site.remote.U_CLEAN}" title="{'remote_site_clean_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'remote_site_clean'|@translate}</a>]
     50      [<a href="{$site.remote.U_TEST}" title="{'test'|@translate}" {$TAG_INPUT_ENABLED}>{'test'|@translate}</a>]
     51      [<a href="{$site.remote.U_GENERATE}" title="{'generate listing'|@translate}" {$TAG_INPUT_ENABLED}>{'generate listing'|@translate}</a>]
     52      [<a href="{$site.remote.U_CLEAN}" title="{'clean'|@translate}" {$TAG_INPUT_ENABLED}>{'clean'|@translate}</a>]
    5353    {/if}
    5454    {if not empty($site.plugin_links)}
     
    6565<form action="{$F_ACTION}" method="post">
    6666  <p>
    67     <label for="galleries_url" >{'site_create'|@translate}</label>
     67    <label for="galleries_url" >{'Create a new site : (give its URL to create_listing_file.php)'|@translate}</label>
    6868    <input type="text" name="galleries_url" id="galleries_url">
    6969  </p>
  • trunk/admin/template/goto/site_update.tpl

    r3283 r5021  
    33
    44<div class="titrePage">
    5   <h2>{'title_update'|@translate}: <a href="{$SITE_URL}">{$SITE_URL}</a></h2>
     5  <h2>{'Database synchronization with files'|@translate}: <a href="{$SITE_URL}">{$SITE_URL}</a></h2>
    66</div>
    77
     
    99<h3>{$L_RESULT_UPDATE}</h3>
    1010<ul>
    11   <li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'update_nb_new_categories'|@translate}</li>
    12   <li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'update_nb_new_elements'|@translate}</li>
    13   <li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'update_nb_del_categories'|@translate}</li>
    14   <li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'update_nb_del_elements'|@translate}</li>
    15   <li>{$update_result.NB_UPD_ELEMENTS} {'update_nb_upd_elements'|@translate}</li>
    16   <li class="update_summary_err">{$update_result.NB_ERRORS} {'update_nb_errors'|@translate}</li>
     11  <li class="update_summary_new">{$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}</li>
     12  <li class="update_summary_new">{$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}</li>
     13  <li class="update_summary_del">{$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}</li>
     14  <li class="update_summary_del">{$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}</li>
     15  <li>{$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}</li>
     16  <li class="update_summary_err">{$update_result.NB_ERRORS} {'errors during synchronization'|@translate}</li>
    1717</ul>
    1818{/if}
     
    2121<h3>{$L_RESULT_METADATA}</h3>
    2222<ul>
    23   <li>{$metadata_result.NB_ELEMENTS_DONE} {'update_nb_elements_metadata_sync'|@translate}</li>
    24   <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'update_nb_elements_metadata_available'|@translate}</li>
    25   <li>{'update_used_metadata'|@translate} : {$METADATA_LIST}</li>
     23  <li>{$metadata_result.NB_ELEMENTS_DONE} {'elements informations synchronized with files metadata'|@translate}</li>
     24  <li>{$metadata_result.NB_ELEMENTS_CANDIDATES} {'images candidates for metadata synchronization'|@translate}</li>
     25  <li>{'Used metadata'|@translate} : {$METADATA_LIST}</li>
    2626</ul>
    2727{/if}
     
    2929
    3030{if not empty($sync_errors)}
    31 <h3>{'update_error_list_title'|@translate}</h3>
     31<h3>{'Error list'|@translate}</h3>
    3232<div class="errors">
    3333<ul>
     
    3737</ul>
    3838</div>
    39 <h3>{'update_errors_caption'|@translate}</h3>
     39<h3>{'Errors caption'|@translate}</h3>
    4040<ul>
    4141  {foreach from=$sync_error_captions item=caption}
     
    4646
    4747{if not empty($sync_infos)}
    48 <h3>{'update_infos_title'|@translate}</h3>
     48<h3>{'Detailed informations'|@translate}</h3>
    4949<div class="infos">
    5050<ul>
     
    5757
    5858{if isset($introduction)}
    59 <h4>{'update_default_title'|@translate}</h4>
     59<h4>{'Choose an option'|@translate}</h4>
    6060<form action="" method="post" id="update">
    6161
    6262        <fieldset id="syncFiles">
    63                 <legend>{'update_sync_files'|@translate}</legend>
     63                <legend>{'synchronize files structure with database'|@translate}</legend>
    6464                <ul>
    6565                        <li><label><input type="radio" name="sync" value="" {if empty($introduction.sync)}checked="checked"{/if}> {'nothing'|@translate}</label></li>
    66                         <li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}> {'update_sync_dirs'|@translate}</label></li>
     66                        <li><label><input type="radio" name="sync" value="dirs" {if 'dirs'==$introduction.sync}checked="checked"{/if}> {'only directories'|@translate}</label></li>
    6767
    68                         <li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'update_sync_all'|@translate}</label>
     68                        <li><label><input type="radio" name="sync" value="files" {if 'files'==$introduction.sync}checked="checked"{/if}> {'directories + files'|@translate}</label>
    6969                                <ul style="padding-left:3em">
    70                                         <li><label><input type="checkbox" name="display_info" value="1" {if $introduction.display_info}checked="checked"{/if}> {'update_display_info'|@translate}</label></li>
     70                                        <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>
    7171                                        <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>
    7272                                        <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>
     
    7777
    7878        <fieldset id="syncMetadata">
    79                 <legend>{'update_sync_metadata'|@translate}</legend>
     79                <legend>{'synchronize files metadata with database elements informations'|@translate}</legend>
    8080                <label><input type="checkbox" name="sync_meta" {if $introduction.sync_meta}checked="checked"{/if}> {'synchronize metadata'|@translate} ({$METADATA_LIST})</label>
    8181                <ul style="padding-left:3em">
    8282                        <li>
    83                                 <label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'update_sync_metadata_all'|@translate}</label>
     83                                <label><input type="checkbox" name="meta_all" {if $introduction.meta_all}checked="checked"{/if}> {'even already synchronized elements'|@translate}</label>
    8484                        </li>
    8585                        <li>
     
    9191  <fieldset id="syncSimulate">
    9292    <legend></legend>
    93     <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {$TAG_INPUT_ENABLED}> {'update_simulate'|@translate}</label></li></ul>
     93    <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>
    9494  </fieldset>
    9595
    9696  <fieldset id="catSubset">
    97     <legend>{'update_cats_subset'|@translate}</legend>
     97    <legend>{'reduce to single existing categories'|@translate}</legend>
    9898    <ul>
    9999    <li>
     
    103103    </li>
    104104
    105     <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'search_subcats_included'|@translate}</label></li>
     105    <li><label><input type="checkbox" name="subcats-included" value="1" {if $introduction.subcats_included}checked="checked"{/if}> {'Search in subcategories'|@translate}</label></li>
    106106    </ul>
    107107  </fieldset>
  • trunk/admin/template/goto/tags.tpl

    r3283 r5021  
    4747    <p>
    4848      <input class="submit" type="submit" name="edit" value="{'Edit selected tags'|@translate}">
    49       <input class="submit" type="submit" name="delete" value="{'Delete selected tags'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
     49      <input class="submit" type="submit" name="delete" value="{'Are you sure?'|@translate}" onclick="return confirm('{'Are you sure?'|@translate}');" {$TAG_INPUT_ENABLED}>
    5050    </p>
    5151  </fieldset>
  • trunk/admin/template/goto/thumbnail.tpl

    r3283 r5021  
    11<div class="titrePage">
    2   <h2>{'title_thumbnails'|@translate}</h2>
     2  <h2>{'Thumbnail creation'|@translate}</h2>
    33</div>
    44
    55{if isset($results) }
    6 <div class="admin">{'tn_results_title'|@translate}</div>
     6<div class="admin">{'Results of miniaturization'|@translate}</div>
    77<table style="width:100%;">
    88  <tr class="throw">
    99    <td>{'Path'|@translate}</td>
    10     <td>{'thumbnail'|@translate}</td>
    11     <td>{'tn_results_gen_time'|@translate}</td>
    12     <td>{'filesize'|@translate}</td>
     10    <td>{'Thumbnail'|@translate}</td>
     11    <td>{'generated in'|@translate}</td>
     12    <td>{'Filesize'|@translate}</td>
    1313    <td>{'Dimensions'|@translate}</td>
    1414  </tr>
     
    2626<table class="table2">
    2727  <tr class="throw">
    28     <td colspan="2">{'tn_stats'|@translate}</td>
     28    <td colspan="2">{'General statistics'|@translate}</td>
    2929  </tr>
    3030  <tr>
    31     <td>{'tn_stats_nb'|@translate}</td>
     31    <td>{'number of miniaturized pictures'|@translate}</td>
    3232    <td style="text-align:center;">{$results.TN_NB}</td>
    3333  </tr>
    3434  <tr>
    35     <td>{'tn_stats_total'|@translate}</td>
     35    <td>{'total time'|@translate}</td>
    3636    <td style="text-align:right;">{$results.TN_TOTAL}</td>
    3737  </tr>
    3838  <tr>
    39     <td>{'tn_stats_max'|@translate}</td>
     39    <td>{'max time'|@translate}</td>
    4040    <td style="text-align:right;">{$results.TN_MAX}</td>
    4141  </tr>
    4242  <tr>
    43     <td>{'tn_stats_min'|@translate}</td>
     43    <td>{'min time'|@translate}</td>
    4444    <td style="text-align:right;">{$results.TN_MIN}</td>
    4545  </tr>
    4646  <tr>
    47     <td>{'tn_stats_mean'|@translate}</td>
     47    <td>{'average time'|@translate}</td>
    4848    <td style="text-align:right;">{$results.TN_AVERAGE}</td>
    4949  </tr>
     
    5656
    5757  <fieldset>
    58     <legend>{'tn_params_title'|@translate}</legend>
     58    <legend>{'Miniaturization parameters'|@translate}</legend>
    5959
    6060    <ul>
    6161      <li>
    62         <span class="property">{'tn_params_GD'|@translate}</span>
     62        <span class="property">{'GD version'|@translate}</span>
    6363        <label>
    6464          <input type="radio" name="gd" value="2" {if $params.GD_SELECTED==2}checked="checked"{/if}>2.x
     
    8888        <label><input type="radio" name="n" value="10"  {if $params.N_SELECTED==10}checked="checked"{/if}> 10</label>
    8989        <label><input type="radio" name="n" value="20"  {if $params.N_SELECTED==20}checked="checked"{/if}> 20</label>
    90         <label><input type="radio" name="n" value="all" {if $params.N_SELECTED=='all'}checked="checked"{/if}> {'tn_all'|@translate}</label>
     90        <label><input type="radio" name="n" value="all" {if $params.N_SELECTED=='all'}checked="checked"{/if}> {'all'|@translate}</label>
    9191      </li>
    9292    </ul>
     
    9898
    9999{if !empty($remainings) }
    100 <div class="admin">{$TOTAL_NB_REMAINING} {'tn_alone_title'|@translate}</div>
     100<div class="admin">{$TOTAL_NB_REMAINING} {'pictures without thumbnail (jpeg and png only)'|@translate}</div>
    101101<table style="width:100%;">
    102102  <tr class="throw">
    103103    <td>&nbsp;</td>
    104104    <td style="width:60%;">{'Path'|@translate}</td>
    105     <td>{'filesize'|@translate}</td>
     105    <td>{'Filesize'|@translate}</td>
    106106    <td>{'Dimensions'|@translate}</td>
    107107  </tr>
     
    116116</table>
    117117{else}
    118 <div style="text-align:center;font-weight:bold;margin:10px;"> [ {'tn_no_missing'|@translate} ]</div>
     118<div style="text-align:center;font-weight:bold;margin:10px;"> [ {'No missing thumbnail'|@translate} ]</div>
    119119{/if}
  • trunk/admin/template/goto/upgrade.tpl

    r3283 r5021  
    4949<table>
    5050  <tr>
    51     <td>{'language'|@translate}</td>
     51    <td>{'Language'|@translate}</td>
    5252    <td>
    5353      <select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;">
     
    6060<p>{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p>
    6161{if isset($login)}
    62 <p>{'upgrade login message'|@translate}</p>
     62<p>{'Only administrator can run upgrade: please sign in below.'|@translate}</p>
    6363{/if}
    6464
     
    107107
    108108<form action="index.php" method="post">
    109 <p><input type="submit" name="submit" value="{'home'|@translate}"></p>
     109<p><input type="submit" name="submit" value="{'Home'|@translate}"></p>
    110110</form>
    111111{/if}
  • trunk/admin/template/goto/upload.tpl

    r3283 r5021  
    11<div class="titrePage">
    2   <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2>
     2  <h2>{'Waiting'|@translate} {$TABSHEET_TITLE}</h2>
    33</div>
    44
    5 <h3>{'title_upload'|@translate}</h3>
     5<h3>{'Pictures waiting for validation'|@translate}</h3>
    66
    77<form action="{$F_ACTION}" method="post" id="waiting">
    88  <table style="width:99%;" >
    99    <tr class="throw">
    10       <td style="width:20%;">{'category'|@translate}</td>
     10      <td style="width:20%;">{'Category'|@translate}</td>
    1111      <td style="width:20%;">{'Date'|@translate}</td>
    12       <td style="width:20%;">{'file'|@translate}</td>
    13       <td style="width:20%;">{'thumbnail'|@translate}</td>
     12      <td style="width:20%;">{'File'|@translate}</td>
     13      <td style="width:20%;">{'Thumbnail'|@translate}</td>
    1414      <td style="width:20%;">{'Author'|@translate}</td>
    1515      <td style="width:1px;">&nbsp;</td>
  • trunk/admin/template/goto/user_list.tpl

    r4455 r5021  
    11<div class="titrePage">
    2   <h2>{'title_liste_users'|@translate}</h2>
     2  <h2>{'User list'|@translate}</h2>
    33</div>
    44
     
    6363      <td>&nbsp;</td>
    6464      <td>{'Username'|@translate}</td>
    65       <td>{'user_status'|@translate}</td>
     65      <td>{'User status'|@translate}</td>
    6666      <td>{'Email address'|@translate}</td>
    6767      <td>{'Groups'|@translate}</td>
    68       <td>{'properties'|@translate}</td>
     68      <td>{'Properties'|@translate}</td>
    6969      {if not empty($plugin_user_list_column_titles)}
    7070      {foreach from=$plugin_user_list_column_titles item=title}
     
    8888    {/foreach}
    8989    <td style="text-align:center;">
    90       <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>
     90      <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>
    9191      <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>
    9292      {foreach from=$user.plugin_actions item=data}
     
    124124    {if isset($adviser)}
    125125    <tr>
    126       <td>{'adviser'|@translate}</td>
     126      <td>{'Adviser'|@translate}</td>
    127127      <td>
    128128        <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    163163{* Properties *}
    164164<fieldset>
    165   <legend>{'properties'|@translate}</legend>
     165  <legend>{'Properties'|@translate}</legend>
    166166
    167167  <table>
    168168
    169169    <tr>
    170       <td>{'enabled_high'|@translate}</td>
     170      <td>{'High definition enabled'|@translate}</td>
    171171      <td>
    172172        <label><input type="radio" name="enabled_high" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    197197<table>
    198198  <tr>
    199     <td>{'nb_image_per_row'|@translate}</td>
     199    <td>{'Number of images per row'|@translate}</td>
    200200    <td>
    201201      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    207207
    208208  <tr>
    209     <td>{'nb_row_per_page'|@translate}</td>
     209    <td>{'Number of rows per page'|@translate}</td>
    210210    <td>
    211211      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    217217
    218218  <tr>
    219     <td>{'theme'|@translate}</td>
     219    <td>{'Interface theme'|@translate}</td>
    220220    <td>
    221221      <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    228228
    229229  <tr>
    230     <td>{'language'|@translate}</td>
     230    <td>{'Language'|@translate}</td>
    231231    <td>
    232232      <label><input type="radio" name="language_action" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    239239
    240240  <tr>
    241     <td>{'recent_period'|@translate}</td>
     241    <td>{'Recent period'|@translate}</td>
    242242    <td>
    243243      <label><input type="radio" name="recent_period_action" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    249249
    250250  <tr>
    251     <td>{'auto_expand'|@translate}</td>
     251    <td>{'Expand all categories'|@translate}</td>
    252252    <td>
    253253      <label><input type="radio" name="expand" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    259259
    260260  <tr>
    261     <td>{'show_nb_comments'|@translate}</td>
     261    <td>{'Show number of comments'|@translate}</td>
    262262    <td>
    263263      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    269269
    270270  <tr>
    271     <td>{'show_nb_hits'|@translate}</td>
     271    <td>{'Show number of hits'|@translate}</td>
    272272    <td>
    273273      <label><input type="radio" name="show_nb_hits" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    279279
    280280  <tr>
    281     <td>{'maxwidth'|@translate}</td>
     281    <td>{'Maximum width of the pictures'|@translate}</td>
    282282    <td>
    283283      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked"> {'leave'|@translate}</label>
     
    291291
    292292  <tr>
    293     <td>{'maxheight'|@translate}</td>
     293    <td>{'Maximum height of the pictures'|@translate}</td>
    294294    <td>
    295295      <label><input type="radio" name="maxheight_action" value="leave" checked="checked"> {'leave'|@translate}</label>
  • trunk/admin/thumbnail.php

    r4325 r5021  
    116116    if (!is_writable($tndir))
    117117    {
    118       array_push($page['errors'], '['.$tndir.'] : '.l10n('no_write_access'));
     118      array_push($page['errors'], '['.$tndir.'] : '.l10n('no write access'));
    119119      return false;
    120120    }
     
    137137  else
    138138  {
    139     echo l10n('tn_no_support')." ";
     139    echo l10n('Picture unreachable or no support')." ";
    140140    if ( isset( $extenstion ) )
    141141    {
    142       echo l10n('tn_format').' '.$extension;
     142      echo l10n('for the file format').' '.$extension;
    143143    }
    144144    else
    145145    {
    146       echo l10n('tn_thisformat');
     146      echo l10n('for this file format');
    147147    }
    148148    exit();
     
    234234  if (!preg_match('/^[0-9]{2,3}$/', $_POST['width']) or $_POST['width'] < 10)
    235235  {
    236     array_push($page['errors'], l10n('tn_err_width').' 10');
     236    array_push($page['errors'], l10n('width must be a number superior to').' 10');
    237237  }
    238238  if (!preg_match('/^[0-9]{2,3}$/', $_POST['height']) or $_POST['height'] < 10)
    239239  {
    240     array_push($page['errors'], l10n('tn_err_height').' 10');
     240    array_push($page['errors'], l10n('height must be a number superior to').' 10');
    241241  }
    242242 
  • trunk/admin/user_list.php

    r4455 r5021  
    169169
    170170$page['order_by_items'] = array(
    171   'id' => l10n('registration_date'),
     171  'id' => l10n('registration date'),
    172172  'username' => l10n('Username'),
    173173  'level' => l10n('Privacy level'),
    174   'language' => l10n('language'),
     174  'Language' => l10n('Language'),
    175175  );
    176176
     
    192192    if(empty($_POST['password']))
    193193    {
    194       array_push($page['errors'], l10n('Password is missing'));
     194      array_push($page['errors'], l10n('Password is missing. Please enter the password.'));
    195195    }
    196196    else if(empty($_POST['password_conf']))
    197197    {
    198       array_push($page['errors'], l10n('Password confirmation is missing'));
     198      array_push($page['errors'], l10n('Password confirmation is missing. Please confirm the chosen password.'));
    199199    }
    200200    else if(empty($_POST['email']))
    201201    {
    202       array_push($page['errors'], l10n('Email address is missing'));
     202      array_push($page['errors'], l10n('Email address is missing. Please specify an email address.'));
    203203    }
    204204    else if ($_POST['password'] != $_POST['password_conf'])
    205205    {
    206       array_push($page['errors'], l10n('Password confirmation error'));
     206      array_push($page['errors'], l10n('Password confirmation error.'));
    207207    }
    208208    else
     
    216216          $page['infos'],
    217217          sprintf(
    218             l10n('user "%s" added'),
     218            l10n('user \"%s\" added'),
    219219            $_POST['login']
    220220          )
     
    236236        $page['infos'],
    237237        sprintf(
    238           l10n('user "%s" added'),
     238          l10n('user \"%s\" added'),
    239239          $_POST['login']
    240240          )
     
    694694  $properties[] =
    695695    (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true'))
    696         ? l10n('is_high_enabled') : l10n('is_high_disabled');
     696        ? l10n('') : l10n('');
    697697
    698698  $template->append(
     
    705705      'USERNAME' => stripslashes($local_user['username'])
    706706        .($local_user['id'] == $conf['guest_id']
    707           ? '<br>['.l10n('is_the_guest').']' : '')
     707          ? '<br>['.l10n('guest').']' : '')
    708708        .($local_user['id'] == $conf['default_user_id']
    709           ? '<br>['.l10n('is_the_default').']' : ''),
     709          ? '<br>['.l10n('default values').']' : ''),
    710710      'STATUS' => l10n('user_status_'.
    711711        $local_user['status']).(($local_user['adviser'] == 'true')
    712         ? '<br>['.l10n('adviser').']' : ''),
     712        ? '<br>['.l10n('Adviser').']' : ''),
    713713      'EMAIL' => get_email_address_as_display_text($local_user['email']),
    714714      'GROUPS' => $groups_string,
  • trunk/admin/user_perm.php

    r4325 r5021  
    127127    'TITLE' =>
    128128      sprintf(
    129         l10n('Manage permissions for user "%s"'),
     129        l10n('Manage permissions for user \"%s\"'),
    130130        get_username($page['user']
    131131          )
    132132        ),
    133     'L_CAT_OPTIONS_TRUE'=>l10n('authorized'),
    134     'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'),
     133    'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'),
     134    'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'),
    135135
    136136    'F_ACTION' =>
  • trunk/identification.php

    r5014 r5021  
    4040  if ( is_a_guest() )
    4141  {
    42     array_push($errors, l10n('access_forbiden'));
     42    array_push($errors, l10n('You are not authorized to access the requested page'));
    4343  }
    4444}
     
    6363    else
    6464    {
    65       array_push( $errors, l10n('invalid_pwd') );
     65      array_push( $errors, l10n('Invalid password!') );
    6666    }
    6767  }
     
    7272// Start output of page
    7373//
    74 $title = l10n('identification');
     74$title = l10n('Identification');
    7575$page['body_id'] = 'theIdentificationPage';
    7676include(PHPWG_ROOT_PATH.'include/page_header.php');
  • trunk/include/calendar_base.class.php

    r5014 r5021  
    9696    elseif ('any' === $date_component )
    9797    {
    98       $label = l10n('calendar_any');
     98      $label = l10n('All');
    9999    }
    100100    return $label;
     
    193193          );
    194194      $nav_bar_datas[]=array(
    195         'LABEL' => l10n('calendar_any'),
     195        'LABEL' => l10n('All'),
    196196        'URL' => $url
    197197      );
  • trunk/include/common.inc.php

    r5014 r5021  
    174174    $user['internal_status']['guest_must_be_guest'] === true)
    175175{
    176   $header_msgs[] = l10n('guest_must_be_guest');
     176  $header_msgs[] = l10n('Bad status for user "guest", using default status. Please notify the webmaster.');
    177177}
    178178
    179179if ($conf['gallery_locked'])
    180180{
    181   $header_msgs[] = l10n('gallery_locked_message');
     181  $header_msgs[] = l10n('The gallery is locked for maintenance. Please, come back later.');
    182182
    183183  if ( script_basename() != 'identification' and !is_admin() )
     
    186186    @header('Retry-After: 900');
    187187    header('Content-Type: text/html; charset='.get_pwg_charset());
    188     echo '<a href="'.get_absolute_root_url(false).'identification.php">'.l10n('gallery_locked_message').'</a>';
     188    echo '<a href="'.get_absolute_root_url(false).'identification.php">'.l10n('The gallery is locked for maintenance. Please, come back later.').'</a>';
    189189    echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
    190190    exit();
     
    204204if (is_adviser())
    205205{
    206   $header_msgs[] = l10n('adviser_mode_enabled');
     206  $header_msgs[] = l10n('Adviser mode enabled');
    207207}
    208208
  • trunk/include/functions.inc.php

    r5014 r5021  
    3131include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
    3232include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
     33include_once( PHPWG_ROOT_PATH .'include/php-gettext/gettext.inc.php' );
    3334
    3435//----------------------------------------------------------- generic functions
     
    4041                         );
    4142  if (!empty($fields))
    42   {
     43  { 
    4344    $fields = ','.$fields;
    4445  }
     
    174175    if ($mkd==false)
    175176    {
    176       !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access'));
     177      !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access'));
    177178      return false;
    178179    }
     
    190191  if ( !is_writable($dir) )
    191192  {
    192     !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no_write_access'));
     193    !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access'));
    193194    return false;
    194195  }
     
    214215  {
    215216    array_push($errors,
    216           '['.$dirname.'] : '.l10n('no_write_access'));
     217          '['.$dirname.'] : '.l10n('no write access'));
    217218    return false;
    218219  }
     
    621622  if (empty($msg))
    622623  {
    623     $msg = nl2br(l10n('redirect_msg'));
     624    $msg = nl2br(l10n('Redirection...'));
    624625  }
    625626
     
    867868 * @return string
    868869 */
    869 function l10n($key)
    870 {
    871   global $lang, $conf;
    872 
    873   if ($conf['debug_l10n'] and !isset($lang[$key]) and !empty($key))
    874   {
    875     trigger_error('[l10n] language key "'.$key.'" is not defined', E_USER_WARNING);
    876   }
    877 
    878   return isset($lang[$key]) ? $lang[$key] : $key;
     870function l10n($key, $textdomain='messages')
     871{
     872  global $user;
     873
     874  if (empty($user['language']))
     875  {
     876    $locale = $GLOBALS['language'];
     877  }
     878  else
     879  {
     880    $locale = $user['language'];
     881  }
     882
     883  T_setlocale(LC_ALL, $locale.'.UTF-8');
     884
     885  // Specify location of translation tables
     886  T_bindtextdomain($textdomain, "./language");
     887
     888  // Choose domain
     889  T_textdomain($textdomain);
     890 
     891  return T_gettext($key);
    879892}
    880893
     
    888901 * @return string
    889902 */
    890 function l10n_dec($singular_fmt_key, $plural_fmt_key, $decimal)
    891 {
    892   global $lang_info;
    893 
    894   return
    895     sprintf(
    896       l10n((
    897         (($decimal > 1) or ($decimal == 0 and $lang_info['zero_plural']))
    898           ? $plural_fmt_key
    899           : $singular_fmt_key
    900         )), $decimal);
    901 }
     903function l10n_dec($singular_fmt_key, $plural_fmt_key,
     904                  $decimal, $textdomain='messages')
     905{
     906  global $user;
     907
     908  if (empty($user['language']))
     909  {
     910    $locale = $GLOBALS['language'];
     911  }
     912  else
     913  {
     914    $locale = $user['language'];
     915  }
     916
     917  T_setlocale(LC_ALL, $locale.'.UTF-8');
     918
     919  // Specify location of translation tables
     920  T_bindtextdomain($textdomain, "./language");
     921
     922  // Choose domain
     923  T_textdomain($textdomain);
     924
     925  return sprintf(T_ngettext($singular_fmt_key,
     926                            $plural_fmt_key,
     927                            $decimal),
     928                 $decimal
     929                 );
     930}
     931
    902932/*
    903933 * returns a single element to use with l10n_args
     
    14361466  {
    14371467    $cache['get_icon']['title'] = sprintf(
    1438       l10n('elements posted during the last %d days'),
     1468      l10n('images posted during the last %d days'),
    14391469      $user['recent_period']
    14401470      );
  • trunk/include/functions_category.inc.php

    r5014 r5021  
    287287  return trigger_event('get_category_preferred_image_orders',
    288288    array(
    289     array(l10n('default_sort'), '', true),
     289    array(l10n('Default'), '', true),
    290290    array(l10n('Average rate'), 'average_rate DESC', $conf['rate']),
    291     array(l10n('most_visited_cat'), 'hit DESC', true),
     291    array(l10n('Most visited'), 'hit DESC', true),
    292292    array(l10n('Creation date'), 'date_creation DESC', true),
    293293    array(l10n('Post date'), 'date_available DESC', true),
     
    298298      ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) )
    299299      ),
    300     array( l10n('permissions'), 'level DESC', is_admin() )
     300    array( l10n('Permissions'), 'level DESC', is_admin() )
    301301    ));
    302302}
     
    480480      if (! $short_message)
    481481      {
    482         $display_text.= ' '.l10n('images_available_cpl');
     482        $display_text.= ' '.l10n('in this category');
    483483      }
    484484    }
  • trunk/include/functions_comment.inc.php

    r5014 r5021  
    104104      if ( $row['user_exists'] == 1 )
    105105      {
    106         array_push($infos, l10n('comment_user_exists') );
     106        array_push($infos, l10n('This login is already used by another user') );
    107107        $comment_action='reject';
    108108      }
     
    141141    if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
    142142    {
    143       array_push( $infos, l10n('comment_anti-flood') );
     143      array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
    144144      $comment_action='reject';
    145145    }
     
    269269    if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
    270270    {
    271       //?? array_push( $infos, l10n('comment_anti-flood') );
     271      //?? array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );
    272272      $comment_action='reject';
    273273    }
  • trunk/include/functions_html.inc.php

    r5014 r5021  
    293293  {
    294294    echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
    295     echo '<div style="text-align:center;">'.l10n('access_forbiden').'<br>';
    296     echo '<a href="'.get_root_url().'identification.php">'.l10n('identification').'</a>&nbsp;';
    297     echo '<a href="'.make_index_url().'">'.l10n('home').'</a></div>';
     295    echo '<div style="text-align:center;">'.l10n('You are not authorized to access the requested page').'<br>';
     296    echo '<a href="'.get_root_url().'Identification.php">'.l10n('Identification').'</a>&nbsp;';
     297    echo '<a href="'.make_index_url().'">'.l10n('Home').'</a></div>';
    298298    echo str_repeat( ' ', 512); //IE6 doesn't error output if below a size
    299299    exit();
     
    400400{
    401401  global $page;
    402   $title = count($page['tags']) > 1 ? l10n('Tags') : l10n('Tag');
     402  $title = count($page['tags']) > 1 ? l10n('Tag') : l10n('Tag');
    403403  $title.= ' ';
    404404
     
    415415        )
    416416      .'" title="'
    417       .l10n('See elements linked to this tag only')
     417      .l10n('See images linked to this tag only')
    418418      .'">'
    419419      .$page['tags'][$i]['name']
     
    432432          )
    433433        .'" style="border:none;" title="'
    434         .l10n('remove this tag')
     434        .l10n('remove this tag from the list')
    435435        .'"><img src="'
    436436        .get_root_url().get_themeconf('icon_dir').'/remove_s.png'
  • trunk/include/functions_mail.inc.php

    r5014 r5021  
    647647          'PHPWG_URL' => PHPWG_URL,
    648648
    649           'TITLE_MAIL' => urlencode(l10n('title_send_mail')),
     649          'TITLE_MAIL' => urlencode(l10n('A comment on your site')),
    650650          'MAIL' => get_webmaster_mail_address()
    651651          ));
  • trunk/include/functions_notification.inc.php

    r5014 r5021  
    530530        .' ('
    531531        .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
    532           .l10n('recent_pics_cat').'</a>'
     532          .l10n('Recent pictures').'</a>'
    533533        .')'
    534534        .'</li><br>';
  • trunk/include/functions_user.inc.php

    r5014 r5021  
    4848  if ( !preg_match( $regex, $mail_address ) )
    4949  {
    50     return l10n('reg_err_mail_address');
     50    return l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)');
    5151  }
    5252
     
    6262    if ($count != 0)
    6363    {
    64       return l10n('reg_err_mail_address_dbl');
     64      return l10n('a user use already this mail address');
    6565    }
    6666  }
     
    8787    if ($count > 0)
    8888    {
    89       return l10n('reg_err_login5');
     89      return l10n('this login is already used');
    9090    }
    9191  }
     
    9999  if ($login == '')
    100100  {
    101     array_push($errors, l10n('reg_err_login1'));
     101    array_push($errors, l10n('Please, enter a login'));
    102102  }
    103103  if (preg_match('/^.* $/', $login))
    104104  {
    105     array_push($errors, l10n('reg_err_login2'));
     105    array_push($errors, l10n('login mustn\'t end with a space character'));
    106106  }
    107107  if (preg_match('/^ .*$/', $login))
    108108  {
    109     array_push($errors, l10n('reg_err_login3'));
     109    array_push($errors, l10n('login mustn\'t start with a space character'));
    110110  }
    111111  if (get_userid($login))
    112112  {
    113     array_push($errors, l10n('reg_err_login5'));
     113    array_push($errors, l10n('this login is already used'));
    114114  }
    115115  $mail_error = validate_mail_address(null, $mail_address);
  • trunk/include/menubar.inc.php

    r5014 r5021  
    149149        array(
    150150          'URL' => make_index_url(array('section' => 'favorites')),
    151           'TITLE' => l10n('favorite_cat_hint'),
    152           'NAME' => l10n('favorite_cat')
     151          'TITLE' => l10n('display my favorites pictures'),
     152          'NAME' => l10n('My favorites')
    153153          );
    154154    }
     
    157157      array(
    158158        'URL' => make_index_url(array('section' => 'most_visited')),
    159         'TITLE' => l10n('most_visited_cat_hint'),
    160         'NAME' => l10n('most_visited_cat')
     159        'TITLE' => l10n('display most visited pictures'),
     160        'NAME' => l10n('Most visited')
    161161      );
    162162
     
    166166        array(
    167167          'URL' => make_index_url(array('section' => 'best_rated')),
    168           'TITLE' => l10n('best_rated_cat_hint'),
    169           'NAME' => l10n('best_rated_cat')
     168          'TITLE' => l10n('display best rated items'),
     169          'NAME' => l10n('Best rated')
    170170        );
    171171    }
     
    174174      array(
    175175        'URL' => get_root_url().'random.php',
    176         'TITLE' => l10n('random_cat_hint'),
    177         'NAME' => l10n('random_cat'),
     176        'TITLE' => l10n('display a set of random pictures'),
     177        'NAME' => l10n('Random pictures'),
    178178        'REL'=> 'rel="nofollow"'
    179179      );
     
    182182      array(
    183183        'URL' => make_index_url(array('section' => 'recent_pics')),
    184         'TITLE' => l10n('recent_pics_cat_hint'),
    185         'NAME' => l10n('recent_pics_cat'),
     184        'TITLE' => l10n('display most recent pictures'),
     185        'NAME' => l10n('Recent pictures'),
    186186      );
    187187
     
    189189      array(
    190190        'URL' => make_index_url(array('section' => 'recent_cats')),
    191         'TITLE' => l10n('recent_cats_cat_hint'),
    192         'NAME' => l10n('recent_cats_cat'),
     191        'TITLE' => l10n('display recently updated categories'),
     192        'NAME' => l10n('Recent categories'),
    193193      );
    194194
     
    205205            )
    206206          ),
    207         'TITLE' => l10n('calendar_hint'),
    208         'NAME' => l10n('calendar'),
     207        'TITLE' => l10n('display each day with pictures, month per month'),
     208        'NAME' => l10n('Calendar'),
    209209        'REL'=> 'rel="nofollow"'
    210210      );
     
    231231    $block->data['search'] =
    232232      array(
    233         'TITLE'=>l10n('hint_search'),
     233        'TITLE'=>l10n('search'),
    234234        'NAME'=>l10n('Search'),
    235235        'URL'=> get_root_url().'search.php',
     
    240240    $block->data['comments'] =
    241241      array(
    242         'TITLE'=>l10n('hint_comments'),
    243         'NAME'=>l10n('comments'),
     242        'TITLE'=>l10n('See last users comments'),
     243        'NAME'=>l10n('Comments'),
    244244        'URL'=> get_root_url().'comments.php',
    245245      );
     
    248248    $block->data['about'] =
    249249      array(
    250         'TITLE'     => l10n('about_page_title'),
     250        'TITLE'     => l10n('About Piwigo'),
    251251        'NAME'      => l10n('About'),
    252252        'URL' => get_root_url().'about.php',
  • trunk/include/picture_comment.inc.php

    r5014 r5021  
    5959  {
    6060    case 'moderate':
    61       array_push( $infos, l10n('comment_to_validate') );
     61      array_push( $infos, l10n('An administrator must authorize your comment before it is visible.') );
    6262    case 'validate':
    63       array_push( $infos, l10n('comment_added'));
     63      array_push( $infos, l10n('Your comment has been registered'));
    6464      break;
    6565    case 'reject':
    6666      set_status_header(403);
    67       array_push($infos, l10n('comment_not_added') );
     67      array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
    6868      break;
    6969    default:
  • trunk/include/section_init.inc.php

    r5014 r5021  
    238238  else
    239239  {
    240     $page['title'] = l10n('no_category');
     240    $page['title'] = l10n('Home');
    241241  }
    242242
     
    362362        'items' => $search_result['items'],
    363363        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    364                   .l10n('search_result').'</a>',
     364                  .l10n('Search results').'</a>',
    365365        )
    366366      );
     
    376376      $page,
    377377      array(
    378         'title' => l10n('favorites')
     378        'title' => l10n('Favorites')
    379379            )
    380380    );
     
    457457      array(
    458458        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    459                   .l10n('recent_pics_cat').'</a>',
     459                  .l10n('Recent pictures').'</a>',
    460460        'items' => array_from_query($query, 'id'),
    461461        )
     
    470470      $page,
    471471      array(
    472         'title' => l10n('recent_cats_cat'),
     472        'title' => l10n('Recent categories'),
    473473        )
    474474      );
     
    495495      array(
    496496        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    497                   .$conf['top_number'].' '.l10n('most_visited_cat').'</a>',
     497                  .$conf['top_number'].' '.l10n('Most visited').'</a>',
    498498        'items' => array_from_query($query, 'id'),
    499499        )
     
    521521      array(
    522522        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    523                   .$conf['top_number'].' '.l10n('best_rated_cat').'</a>',
     523                  .$conf['top_number'].' '.l10n('Best rated').'</a>',
    524524        'items' => array_from_query($query, 'id'),
    525525        )
     
    544544      array(
    545545        'title' => '<a href="'.duplicate_index_url(array('start'=>0)).'">'
    546                     .l10n('random_cat').'</a>',
     546                    .l10n('Random pictures').'</a>',
    547547        'items' => array_from_query($query, 'id'),
    548548        )
  • trunk/include/ws_functions.inc.php

    r5014 r5021  
    563563  {
    564564    case 'reject':
    565       array_push($infos, l10n('comment_not_added') );
     565      array_push($infos, l10n('Your comment has NOT been registered because it did not pass the validation rules') );
    566566      return new PwgError(403, implode("\n", $infos) );
    567567    case 'validate':
  • trunk/install.php

    r5014 r5021  
    232232  {
    233233
    234     array_push( $infos, l10n('step1_confirmation') );
     234    array_push( $infos, l10n('Parameters are correct') );
    235235
    236236    $required_version = constant('REQUIRED_'.strtoupper($dblayer).'_VERSION');
     
    261261  else
    262262  {
    263     array_push( $errors, l10n('step1_err_server') );
     263    array_push( $errors, l10n('Can\'t connect to server') );
    264264  }
    265265
    266266  $webmaster = trim(preg_replace( '/\s{2,}/', ' ', $admin_name ));
    267267  if ( empty($webmaster))
    268     array_push( $errors, l10n('step2_err_login1') );
     268    array_push( $errors, l10n('enter a login for webmaster') );
    269269  else if ( preg_match( '/[\'"]/', $webmaster ) )
    270     array_push( $errors, l10n('step2_err_login3') );
     270    array_push( $errors, l10n('webmaster login can\'t contain characters \' or \"') );
    271271  if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) )
    272     array_push( $errors, l10n('step2_err_pass') );
     272    array_push( $errors, l10n('please enter your password again') );
    273273  if ( empty($admin_mail))
    274     array_push( $errors, l10n('reg_err_mail_address') );
     274    array_push( $errors, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
    275275  else
    276276  {
     
    305305      $html_content = htmlentities( $file_content, ENT_QUOTES );
    306306      $html_content = nl2br( $html_content );
    307       $error_copy = l10n('step1_err_copy');
     307      $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)');
    308308      $error_copy .= '<br>--------------------------------------------------------------------<br>';
    309309      $error_copy .= '<span class="sql_content">' . $html_content . '</span>';
     
    443443      'F_ADMIN' => $admin_name,
    444444      'F_ADMIN_EMAIL' => $admin_mail,
    445       'L_INSTALL_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
     445      'L_INSTALL_HELP' => sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
    446446      ));
    447447}
     
    461461else
    462462{
    463   array_push($infos, l10n('install_end_message'));
     463  array_push($infos, l10n('The configuration of Piwigo is finished, here is the next step<br><br>
     464* go to the identification page and use the login/password given for webmaster<br>
     465* this login will enable you to access to the administration panel and to the instructions in order to place pictures in your directories'));
    464466
    465467  if (isset($error_copy))
  • trunk/install/php5_apache_configuration.php

    r3203 r5021  
    109109  echo '
    110110</div>
    111 <div style="text-align: center">'.sprintf(l10n('install_help'), PHPWG_URL.'/forum').'</div>
     111<div style="text-align: center">'.sprintf(l10n('Need help ? Ask your question on <a href="%s">Piwigo message board</a>.'), PHPWG_URL.'/forum').'</div>
    112112</div>
    113113</body>
     
    141141  <table>
    142142  <tr>
    143     <td>'.l10n('language').'</td>
     143    <td>'.l10n('Language').'</td>
    144144    <td>
    145145      <select name="language" onchange="document.location = \''.$script.'.php?language=\'+this.options[this.selectedIndex].value;">';
  • trunk/install/upgrade_1.3.1.php

    r4325 r5021  
    603603  $page['infos'],
    604604  array(
    605     l10n('all sub-categories of private categories become private'),
    606     l10n('user permissions and group permissions have been erased'),
    607     l10n('only thumbnails prefix and webmaster mail saved')
     605    l10n('All sub-categories of private categories become private'),
     606    l10n('User permissions and group permissions have been erased'),
     607    l10n('Only thumbnails prefix and webmaster mail address have been saved from previous configuration')
    608608    )
    609609  );
  • trunk/nbm.php

    r5014 r5021  
    5858else
    5959{
    60   array_push($page['errors'], l10n('nbm_unknown_identifier'));
     60  array_push($page['errors'], l10n('Unknown identifier'));
    6161}
    6262
     
    6464// | template initialization                                               |
    6565// +-----------------------------------------------------------------------+
    66 $title = l10n('nbm_item_notification');
     66$title = l10n('Notification');
    6767$page['body_id'] = 'theNBMPage';
    6868include(PHPWG_ROOT_PATH.'include/page_header.php');
  • trunk/password.php

    r5014 r5021  
    5252  if (isset($_POST['no_mail_address']) and $_POST['no_mail_address'] == 1)
    5353  {
    54     array_push($page['infos'], l10n('Email address is missing'));
     54    array_push($page['infos'], l10n('Email address is missing. Please specify an email address.'));
    5555    array_push($page['infos'], $mailto);
    5656  }
     
    131131    else
    132132    {
    133       array_push($page['errors'], l10n('No user matches this email address'));
     133      array_push($page['errors'], l10n('No classic user matches this email address'));
    134134      array_push($page['errors'], l10n('Administrator, webmaster and special user cannot use this method'));
    135135      array_push($page['errors'], $mailto);
  • trunk/picture.php

    r5014 r5021  
    777777        'FAVORITE_IMG'  =>
    778778          get_root_url().get_themeconf('icon_dir').'/favorite.png',
    779         'FAVORITE_HINT' => l10n('add_favorites_hint'),
     779        'FAVORITE_HINT' => l10n('add this image to your favorites'),
    780780        'U_FAVORITE'    => add_url_params(
    781781          $url_self,
     
    792792        'FAVORITE_IMG'  =>
    793793          get_root_url().get_themeconf('icon_dir').'/del_favorite.png',
    794         'FAVORITE_HINT' => l10n('del_favorites_hint'),
     794        'FAVORITE_HINT' => l10n('delete this image from your favorites'),
    795795        'U_FAVORITE'    => add_url_params(
    796796          $url_self,
  • trunk/profile.php

    r5014 r5021  
    6262  save_profile_from_post($userdata, $errors);
    6363
    64   $title= l10n('customize_page_title');
     64  $title= l10n('Your Gallery Customization ');
    6565  $page['body_id'] = 'theProfilePage';
    6666  include(PHPWG_ROOT_PATH.'include/page_header.php');
     
    109109      or (!preg_match($int_pattern, $_POST['nb_image_line'])))
    110110  {
    111     $errors[] = l10n('nb_image_line_error');
     111    $errors[] = l10n('The number of images per row must be a not null scalar');
    112112  }
    113113
     
    115115      or (!preg_match($int_pattern, $_POST['nb_line_page'])))
    116116  {
    117     $errors[] = l10n('nb_line_page_error');
     117    $errors[] = l10n('The number of rows per page must be a not null scalar');
    118118  }
    119119
     
    122122           or $_POST['maxwidth'] < 50))
    123123  {
    124     $errors[] = l10n('maxwidth_error');
     124    $errors[] = l10n('Maximum width must be a number superior to 50');
    125125  }
    126126  if ($_POST['maxheight']
     
    128128             or $_POST['maxheight'] < 50))
    129129  {
    130     $errors[] = l10n('maxheight_error');
     130    $errors[] = l10n('Maximum height must be a number superior to 50');
    131131  }
    132132  // periods must be integer values, they represents number of days
     
    134134      or $_POST['recent_period'] <= 0)
    135135  {
    136     $errors[] = l10n('periods_error') ;
     136    $errors[] = l10n('Recent period must be a positive integer value') ;
    137137  }
    138138
  • trunk/register.php

    r5014 r5021  
    4343  if ($_POST['password'] != $_POST['password_conf'])
    4444  {
    45     array_push($errors, l10n('reg_err_pass'));
     45    array_push($errors, l10n('please enter your password again'));
    4646  }
    4747
  • trunk/search.php

    r5014 r5021  
    153153  else
    154154  {
    155     array_push($errors, l10n('search_one_clause_at_least'));
     155    array_push($errors, l10n('Empty query. No criteria has been entered.'));
    156156  }
    157157}
     
    173173// Start output of page
    174174//
    175 $title= l10n('search_title');
     175$title= l10n('Search');
    176176$page['body_id'] = 'theSearchPage';
    177177
  • trunk/search_rules.php

    r5014 r5021  
    3131function inc_exc_str($is_included)
    3232{
    33   return $is_included ? l10n('included') : l10n('excluded');
     33  return $is_excluded ? l10n('excluded') : l10n('excluded');
    3434}
    3535
  • trunk/template-extension/distributed/samples/my-picture.tpl

    r3283 r5021  
    2222<div id="imageHeaderBar">
    2323  <div class="browsePath">
    24     <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
     24    <a href="{$U_HOME}" rel="Home">{'Home'|@translate}</a>
    2525    {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
    2626    {$LEVEL_SEPARATOR}{$current.TITLE}
     
    3939    {/if}
    4040    {if isset($U_SLIDESHOW_STOP) }
    41       <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>
     41      <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>
    4242    {/if}
    43       <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>
     43      <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>
    4444    {if isset($current.U_DOWNLOAD) }
    45       <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
     45      <a href="{$current.U_DOWNLOAD}" title="{'download'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
    4646    {/if}
    4747    {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
     
    5050    {/if}
    5151    {if !empty($U_SET_AS_REPRESENTATIVE) }
    52       <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>
     52      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
    5353    {/if}
    5454    {if isset($U_ADMIN) }
    55       <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     55      <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
    5656    {/if}
    5757    {if isset($U_CADDIE) }{*caddie management BEGIN*}
     
    7272}{/literal}
    7373</script>
    74       <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>
     74      <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>
    7575    {/if}{*caddie management END*}
    7676  </div>
     
    8787{if isset($U_SLIDESHOW_STOP) }
    8888<p>
    89   [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
     89  [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
    9090</p>
    9191{/if}
     
    9494
    9595{if isset($previous) }
    96 <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
     96<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
    9797  <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
    9898</a>
    9999{/if}
    100100{if isset($next) }
    101 <a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
     101<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
    102102  <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
    103103</a>
  • trunk/template-extension/distributed/samples/titling_categories.tpl

    r3282 r5021  
    2929          <a href="{$cat.URL}">
    3030            <img src="{$cat.TN_SRC}" alt="{$cat.ALT}"
    31             title="{'hint_category'|@translate}">
     31            title="{'shows images at the root of this category'|@translate}">
    3232          </a>
    3333        </div>
  • trunk/template/yoga/about.tpl

    r3283 r5021  
    44      <li>
    55        <a href="{$U_HOME}" title="{'return to homepage'|@translate}">
    6           <img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}">
     6          <img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}">
    77        </a>
    88      </li>
  • trunk/template/yoga/comment_list.tpl

    r4881 r5021  
    4343        <fieldset>
    4444          <legend>{'Edit a comment'|@translate}</legend>
    45           <label>{'comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label>
     45          <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$Comment.CONTENT|@escape}</textarea></label>
    4646          <input type="hidden" name="key" value="{$comment.KEY}">
    4747          <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}">
  • trunk/template/yoga/comments.tpl

    r3283 r5021  
    33  <div class="titrePage">
    44    <ul class="categoryActions">
    5       <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
     5      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    66    </ul>
    77    <h2>{'User comments'|@translate}</h2>
  • trunk/template/yoga/footer.tpl

    r3283 r5021  
    22 <a name="EoP"></a> <!-- End of Page -->
    33 {if isset($debug.TIME) }
    4  {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
     4 {'SQL queries in'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'SQL queries in'|@translate} {$debug.SQL_TIME}) -
    55 {/if}
    66
     
    1010  *}
    1111
    12   {'powered_by'|@translate}
     12  {'Powered by'|@translate}
    1313  <a href="{$PHPWG_URL}" class="Piwigo">
    1414  <span class="Piwigo">Piwigo</span></a>
    1515  {$VERSION}
    1616  {if isset($CONTACT_MAIL)}
    17   - {'send_mail'|@translate}
     17  - {'Contact'|@translate}
    1818  <a href="mailto:{$CONTACT_MAIL}?subject={'title_send_mail'|@translate|@escape:url}">{'Webmaster'|@translate}</a>
    1919  {/if}
  • trunk/template/yoga/header.tpl

    r3283 r5021  
    2323<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
    2424
    25 <link rel="start" title="{'home'|@translate}" href="{$U_HOME}" >
     25<link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
    2626<link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
    27 {if isset($first.U_IMG)   }<link rel="first" title="{'first_page'|@translate}" href="{$first.U_IMG}" >{/if}
    28 {if isset($previous.U_IMG)}<link rel="prev" title="{'previous_page'|@translate}" href="{$previous.U_IMG}" >{/if}
    29 {if isset($next.U_IMG)    }<link rel="next" title="{'next_page'|@translate}" href="{$next.U_IMG}" >{/if}
    30 {if isset($last.U_IMG)    }<link rel="last" title="{'last_page'|@translate}" href="{$last.U_IMG}" >{/if}
    31 {if isset($U_UP)          }<link rel="up" title="{'thumbnails'|@translate}" href="{$U_UP}" >{/if}
     27{if isset($first.U_IMG)   }<link rel="first" title="{'First'|@translate}" href="{$first.U_IMG}" >{/if}
     28{if isset($previous.U_IMG)}<link rel="prev" title="{'Previous'|@translate}" href="{$previous.U_IMG}" >{/if}
     29{if isset($next.U_IMG)    }<link rel="next" title="{'Next'|@translate}" href="{$next.U_IMG}" >{/if}
     30{if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
     31{if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
    3232
    3333<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/layout.css">
  • trunk/template/yoga/identification.tpl

    r3283 r5021  
    55      <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>
    66      {if isset($U_REGISTER) }
    7       <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>
     7      <li><a href="{$U_REGISTER}" title="{'Register'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"></a></li>
    88      {/if}
    9       <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>
     9      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    1010    </ul>
    1111    <h2>{'Identification'|@translate}</h2>
     
    4646      <li>
    4747        <span class="property">
    48           <label for="remember_me">{'remember_me'|@translate}</label>
     48          <label for="Auto login">{'Auto login'|@translate}</label>
    4949        </span>
    5050        <input tabindex="3" type="checkbox" name="remember_me" id="remember_me" value="1">
     
    5858  <p>
    5959    {if isset($U_REGISTER) }
    60     <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>
     60    <a href="{$U_REGISTER}" title="{'Register'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/register.png" class="button" alt="{'Register'|@translate}"> {'Register'|@translate}</a>
    6161    {/if}
    6262    <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

    r3283 r5021  
    1616
    1717      {if isset($favorite) }
    18       <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>
     18      <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>
    1919      {/if}
    2020
    2121      {if isset($U_CADDIE) }
    22       <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>
     22      <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>
    2323      {/if}
    2424
    2525      {if isset($U_EDIT) }
    26       <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>
     26      <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>
    2727      {/if}
    2828
     
    3636
    3737      {if isset($U_MODE_FLAT) }
    38       <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>
     38      <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>
    3939      {/if}
    4040
    4141      {if isset($U_MODE_NORMAL) }
    42       <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>
     42      <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>
    4343      {/if}
    4444
    4545      {if isset($U_MODE_POSTED) }
    46       <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>
     46      <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>
    4747      {/if}
    4848     
    4949      {if isset($U_MODE_CREATED) }
    50       <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>
     50      <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>
    5151      {/if}
    5252     
     
    5757
    5858  {if isset($chronology_views) }
    59   <div class="calendarViews">{'calendar_view'|@translate}:
     59  <div class="calendarViews">{'View'|@translate}:
    6060    <select onchange="document.location = this.options[this.selectedIndex].value;">
    6161      {foreach from=$chronology_views item=view}
  • trunk/template/yoga/mainpage_categories.tpl

    r3283 r5021  
    66                        <div class="illustration">
    77                        <a href="{$cat.URL}">
    8                                 <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'hint_category'|@translate}">
     8                                <img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'shows images at the root of this category'|@translate}">
    99                        </a>
    1010                        </div>
  • trunk/template/yoga/menubar_categories.tpl

    r3282 r5021  
    11<dt>
    22  {if isset($U_START_FILTER)}
    3   <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>
     3  <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>
    44  {/if}
    55  {if isset($U_STOP_FILTER)}
    6   <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>
     6  <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>
    77  {/if}
    88        <a href="{$block->data.U_CATEGORIES}">{'Categories'|@translate}</a>
     
    3232        <ul>
    3333                <li>
    34                         <a href="{$block->data.U_UPLOAD}">{'upload_picture'|@translate}</a>
     34                        <a href="{$block->data.U_UPLOAD}">{'Upload a picture'|@translate}</a>
    3535                </li>
    3636        </ul>
  • trunk/template/yoga/menubar_identification.tpl

    r3282 r5021  
    1 <dt>{'identification'|@translate}</dt>
     1<dt>{'Identification'|@translate}</dt>
    22<dd>
    33        {if isset($USERNAME)}
    4         <p>{'hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
     4        <p>{'Hello'|@translate}&nbsp;{$USERNAME}&nbsp;!</p>
    55        {/if}
    66
    77        <ul>
    88        {if isset($U_REGISTER)}
    9         <li><a href="{$U_REGISTER}" title="{'Create a new account'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
     9        <li><a href="{$U_REGISTER}" title="{'Register'|@translate}" rel="nofollow">{'Register'|@translate}</a></li>
    1010        {/if}
    1111
    1212        {if isset($U_LOGIN)}
    13         <li><a href="{$U_LOGIN}" rel="nofollow">{'Connection'|@translate}</a></li>
     13        <li><a href="{$U_LOGIN}" rel="nofollow">{'Login'|@translate}</a></li>
    1414        {/if}
    1515
    1616        {if isset($U_LOGOUT)}
    17         <li><a href="{$U_LOGOUT}">{'logout'|@translate}</a></li>
     17        <li><a href="{$U_LOGOUT}">{'Logout'|@translate}</a></li>
    1818        {/if}
    1919
    2020        {if isset($U_PROFILE)}
    21         <li><a href="{$U_PROFILE}" title="{'hint_customize'|@translate}">{'customize'|@translate}</a></li>
     21        <li><a href="{$U_PROFILE}" title="{'Customize'|@translate}">{'Customize'|@translate}</a></li>
    2222        {/if}
    2323
    2424        {if isset($U_ADMIN)}
    25         <li><a href="{$U_ADMIN}" title="{'hint_admin'|@translate}">{'admin'|@translate}</a></li>
     25        <li><a href="{$U_ADMIN}" title="{'Administration'|@translate}">{'Administration'|@translate}</a></li>
    2626        {/if}
    2727        </ul>
     
    4343        {if $AUTHORIZE_REMEMBERING}
    4444        <div><label for="remember_me">
    45         {'remember_me'|@translate}
     45        {'Auto login'|@translate}
    4646        <input type="checkbox" name="remember_me" id="remember_me" value="1">
    4747        </label></div>
     
    5353                <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>
    5454                {if isset($U_REGISTER)}
    55                 <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>
     55                <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>
    5656                {/if}
    5757        </ul>
  • trunk/template/yoga/menubar_menu.tpl

    r3282 r5021  
    1 <dt>{'title_menu'|@translate}</dt>
     1<dt>{'Menu'|@translate}</dt>
    22<dd>
    33  {if isset($block->data.qsearch) and  $block->data.qsearch==true}
  • trunk/template/yoga/menubar_specials.tpl

    r3282 r5021  
    1 <dt>{'special_categories'|@translate}</dt>
     1<dt>{'Specials'|@translate}</dt>
    22<dd>
    33        <ul>
  • trunk/template/yoga/menubar_tags.tpl

    r3546 r5021  
    1111                        </a>
    1212                        {/if}
    13                         <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>
     13                        <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>
    1414                {/foreach}
    1515        </div>
  • trunk/template/yoga/navigation_bar.tpl

    r3283 r5021  
    11<div class="navigationBar">
    22  {if isset($navbar.URL_FIRST)}
    3   <a href="{$navbar.URL_FIRST}" rel="first">{'first_page'|@translate}</a> |
    4   <a href="{$navbar.URL_PREV}" rel="prev">{'previous_page'|@translate}</a> |
     3  <a href="{$navbar.URL_FIRST}" rel="first">{'First'|@translate}</a> |
     4  <a href="{$navbar.URL_PREV}" rel="prev">{'Previous'|@translate}</a> |
    55  {else}
    6   {'first_page'|@translate} |
    7   {'previous_page'|@translate} |
     6  {'First'|@translate} |
     7  {'Previous'|@translate} |
    88  {/if}
    99
     
    2020
    2121  {if isset($navbar.URL_NEXT)}
    22   | <a href="{$navbar.URL_NEXT}" rel="next">{'next_page'|@translate}</a>
    23   | <a href="{$navbar.URL_LAST}" rel="last">{'last_page'|@translate}</a>
     22  | <a href="{$navbar.URL_NEXT}" rel="next">{'Next'|@translate}</a>
     23  | <a href="{$navbar.URL_LAST}" rel="last">{'Last'|@translate}</a>
    2424  {else}
    25   | {'next_page'|@translate}
    26   | {'last_page'|@translate}
     25  | {'Next'|@translate}
     26  | {'Last'|@translate}
    2727  {/if}
    2828</div>
  • trunk/template/yoga/nbm.tpl

    r3283 r5021  
    33  <div class="titrePage">
    44    <ul class="categoryActions">
    5       <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>
     5      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    66    </ul>
    7     <h2>{'nbm_item_notification'|@translate}</h2>
     7    <h2>{'Notification'|@translate}</h2>
    88  </div>
    99
  • trunk/template/yoga/notification.tpl

    r3283 r5021  
    11{html_head}
    22<link rel="alternate" type="application/rss+xml" title="{'Image only RSS feed'|@translate}" href="{$U_FEED_IMAGE_ONLY}">
    3 <link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed'|@translate}" href="{$U_FEED}">
     3<link rel="alternate" type="application/rss+xml" title="{'Complete RSS feed (images, comments)'|@translate}" href="{$U_FEED}">
    44{/html_head}
    55<div id="content" class="content">
     
    77  <div class="titrePage">
    88    <ul class="categoryActions">
    9       <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
     9      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    1010    </ul>
    1111    <h2>{'Notification'|@translate}</h2>
     
    1919    </dt>
    2020    <dt>
    21       <a href="{$U_FEED}">{'Complete RSS feed'|@translate}</a>
     21      <a href="{$U_FEED}">{'Complete RSS feed (images, comments)'|@translate}</a>
    2222    </dt>
    2323  </dl>
  • trunk/template/yoga/password.tpl

    r3283 r5021  
    33  <div class="titrePage">
    44    <ul class="categoryActions">
    5       <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>
     5      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    66    </ul>
    77    <h2>{'Password forgotten'|@translate}</h2>
  • trunk/template/yoga/picture.tpl

    r4513 r5021  
    2929<div id="imageHeaderBar">
    3030  <div class="browsePath">
    31     <a href="{$U_HOME}" rel="home">{'home'|@translate}</a>
     31    <a href="{$U_HOME}" rel="Home">{'Home'|@translate}</a>
    3232    {if !$IS_HOME}{$LEVEL_SEPARATOR}{$SECTION_TITLE}{/if}
    3333    {$LEVEL_SEPARATOR}{$current.TITLE}
     
    4545    {/if}
    4646    {if isset($U_SLIDESHOW_STOP) }
    47       <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>
    48     {/if}
    49       <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>
     47      <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>
     48    {/if}
     49      <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>
    5050    {if isset($current.U_DOWNLOAD) }
    51       <a href="{$current.U_DOWNLOAD}" title="{'download_hint'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
     51      <a href="{$current.U_DOWNLOAD}" title="{'download'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
    5252    {/if}
    5353    {if isset($PLUGIN_PICTURE_ACTIONS)}{$PLUGIN_PICTURE_ACTIONS}{/if}
     
    5656    {/if}
    5757    {if !empty($U_SET_AS_REPRESENTATIVE) }
    58       <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>
     58      <a href="{$U_SET_AS_REPRESENTATIVE}" title="{'representative'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/representative.png" class="button" alt="{'representative'|@translate}"></a>
    5959    {/if}
    6060    {if isset($U_ADMIN) }
    61       <a href="{$U_ADMIN}" title="{'link_info_image'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
     61      <a href="{$U_ADMIN}" title="{'edit'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/preferences.png" class="button" alt="{'edit'|@translate}"></a>
    6262    {/if}
    6363    {if isset($U_CADDIE) }{*caddie management BEGIN*}
     
    7878}{/literal}
    7979</script>
    80       <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>
     80      <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>
    8181    {/if}{*caddie management END*}
    8282  </div>
     
    9393{if isset($U_SLIDESHOW_STOP) }
    9494<p>
    95   [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
     95  [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
    9696</p>
    9797{/if}
     
    100100
    101101{if isset($previous) }
    102 <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'previous_page'|@translate} : {$previous.TITLE}" rel="prev">
     102<a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
    103103  <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
    104104</a>
    105105{/if}
    106106{if isset($next) }
    107 <a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'next_page'|@translate} : {$next.TITLE}" rel="next">
     107<a class="navThumb" id="linkNext" href="{$next.U_IMG}" title="{'Next'|@translate} : {$next.TITLE}" rel="next">
    108108  <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
    109109</a>
     
    169169                        {$pwg->sprintf($rate_text, $rate_summary.average, $rate_summary.count, $rate_summary.std) }
    170170                {else}
    171                         {'no_rate'|@translate}
     171                        {'no rate'|@translate}
    172172                {/if}
    173173                </td>
     
    178178        <tr>
    179179                <td class="label">
    180                         <span id="updateRate">{if isset($rating.USER_RATE)}{'update_rate'|@translate}{else}{'new_rate'|@translate}{/if}</span>
     180                        <span id="updateRate">{if isset($rating.USER_RATE)}{'Rate this picture'|@translate}{else}{'Rate this picture'|@translate}{/if}</span>
    181181                </td>
    182182                <td class="value">
     
    265265        <form  method="post" action="{$comment_add.F_ACTION}" class="filter" id="addComment">
    266266        <fieldset>
    267                 <legend>{'comments_add'|@translate}</legend>
     267                <legend>{'Add a comment'|@translate}</legend>
    268268                {if $comment_add.SHOW_AUTHOR}
    269                 <label>{'upload_author'|@translate}<input type="text" name="author"></label>
     269                <label>{'Author'|@translate}<input type="text" name="author"></label>
    270270                {/if}
    271                 <label>{'comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$comment_add.CONTENT}</textarea></label>
     271                <label>{'Comment'|@translate}<textarea name="content" id="contentid" rows="5" cols="80">{$Comment_add.CONTENT}</textarea></label>
    272272                <input type="hidden" name="key" value="{$comment_add.KEY}">
    273273                <input class="submit" type="submit" value="{'Submit'|@translate}">
  • trunk/template/yoga/picture_content.tpl

    r3283 r5021  
    88{if isset($high) }
    99</a>
    10   <p>{'picture_high'|@translate}</p>
     10  <p>{'Click on the picture to see it in high definition'|@translate}</p>
    1111{/if}
  • trunk/template/yoga/picture_nav_buttons.tpl

    r3283 r5021  
    22 
    33{if isset($last)}
    4   <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>
     4  <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>
    55{else}
    66  <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last_unactive.png" class="button" alt=""></a>
     
    88 
    99{if isset($next)}
    10   <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>
     10  <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>
    1111{else}
    1212  <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/right_unactive.png" class="button" alt=""></a>
     
    1414
    1515{if isset($slideshow.U_START_PLAY)}
    16   <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>
     16  <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>
    1717{/if}
    1818
    1919{if isset($slideshow.U_STOP_PLAY)}
    20   <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>
     20  <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>
    2121{/if}
    2222
    2323{if isset($U_UP) and !isset($slideshow)}
    24   <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>
     24  <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>
    2525{/if}
    2626 
    2727{if isset($previous)}
    28   <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>
     28  <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>
    2929{else}
    3030  <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/left_unactive.png" class="button" alt=""></a>
     
    3232 
    3333{if isset($first)}
    34   <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>
     34  <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>
    3535{else}
    3636  <a class="navButton"><img src="{$ROOT_URL}{$themeconf.icon_dir}/first_unactive.png" class="button" alt=""></a>
     
    3939
    4040{if isset($slideshow.U_START_REPEAT)}
    41   <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>
     41  <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>
    4242{/if}
    4343
    4444{if isset($slideshow.U_STOP_REPEAT)}
    45   <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>
     45  <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>
    4646{/if}
    4747
    4848{if isset($slideshow)}
    4949  {if isset($slideshow.U_DEC_PERIOD)}
    50     <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>
     50    <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>
    5151  {else}
    5252    <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/dec_period_unactive.png" class="button" alt=""></a>
     
    5454
    5555  {if isset($slideshow.U_INC_PERIOD)}
    56     <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>
     56    <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>
    5757  {else}
    5858    <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
  • trunk/template/yoga/profile.tpl

    r3283 r5021  
    1313  <div class="titrePage">
    1414    <ul class="categoryActions">
    15       <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>
     15      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    1616    </ul>
    1717    <h2>{'Profile'|@translate}</h2>
  • trunk/template/yoga/profile_content.tpl

    r3995 r5021  
    2626      <li>
    2727        <span class="property">
    28           <label for="use_new_pwd">{'new_password'|@translate}</label>
     28          <label for="use_new_pwd">{'New password'|@translate}</label>
    2929        </span>
    3030        <input type="password" name="use_new_pwd" id="use_new_pwd" value="">
     
    4141
    4242  <fieldset>
    43     <legend>{'preferences'|@translate}</legend>
     43    <legend>{'Preferences'|@translate}</legend>
    4444
    4545    <ul>
    4646      <li>
    4747        <span class="property">
    48           <label for="nb_image_line">{'nb_image_per_row'|@translate}</label>
     48          <label for="nb_image_line">{'Number of images per row'|@translate}</label>
    4949        </span>
    5050        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{$NB_IMAGE_LINE}">
     
    5252      <li>
    5353        <span class="property">
    54           <label for="nb_line_page">{'nb_row_per_page'|@translate}</label>
     54          <label for="nb_line_page">{'Number of rows per page'|@translate}</label>
    5555        </span>
    5656        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{$NB_ROW_PAGE}" >
     
    5858      <li>
    5959        <span class="property">
    60           <label for="template">{'theme'|@translate}</label>
     60          <label for="template">{'Interface theme'|@translate}</label>
    6161        </span>
    6262        {html_options name=template options=$template_options selected=$template_selection}
     
    6464      <li>
    6565        <span class="property">
    66           <label for="language">{'language'|@translate}</label>
     66          <label for="Language">{'Language'|@translate}</label>
    6767        </span>
    6868        {html_options name=language options=$language_options selected=$language_selection}
     
    7070      <li>
    7171        <span class="property">
    72           <label for="recent_period">{'recent_period'|@translate}</label>
     72          <label for="Recent period">{'Recent period'|@translate}</label>
    7373        </span>
    7474        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{$RECENT_PERIOD}">
    7575      </li>
    7676      <li>
    77         <span class="property">{'auto_expand'|@translate}</span>
     77        <span class="property">{'Expand all categories'|@translate}</span>
    7878        {html_radios name='expand' options=$radio_options selected=$EXPAND}
    7979      </li>
    8080      <li>
    81         <span class="property">{'show_nb_comments'|@translate}</span>
     81        <span class="property">{'Show number of comments'|@translate}</span>
    8282        {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
    8383      </li>
    8484      <li>
    85         <span class="property">{'show_nb_hits'|@translate}</span>
     85        <span class="property">{'Show number of hits'|@translate}</span>
    8686        {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    8787      </li>
    8888      <li>
    8989        <span class="property">
    90           <label for="maxwidth">{'maxwidth'|@translate}</label>
     90          <label for="Maximum width of the pictures">{'Maximum width of the pictures'|@translate}</label>
    9191        </span>
    9292        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{$MAXWIDTH}">
     
    9494      <li>
    9595        <span class="property">
    96           <label for="maxheight">{'maxheight'|@translate}</label>
     96          <label for="Maximum height of the pictures">{'Maximum height of the pictures'|@translate}</label>
    9797        </span>
    9898        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{$MAXHEIGHT}">
     
    104104    <input class="submit" type="submit" name="validate" value="{'Submit'|@translate}">
    105105    <input class="submit" type="reset" name="reset" value="{'Reset'|@translate}">
    106     <input class="submit" type="submit" name="reset_to_default" value="{'Reset_To_Default'|@translate}">
     106    <input class="submit" type="submit" name="reset_to_default" value="{'Reset to default values'|@translate}">
    107107  </p>
    108108
  • trunk/template/yoga/redirect.tpl

    r3283 r5021  
    99<p style="margin: 2em">
    1010        <a href="{$page_refresh.U_REFRESH}">
    11                 {'click_to_redirect'|@translate}
     11                {'Click here if your browser does not automatically forward you'|@translate}
    1212        </a>
    1313</p>
  • trunk/template/yoga/register.tpl

    r3283 r5021  
    55  <div class="titrePage">
    66    <ul class="categoryActions">
    7       <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>
     7      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    88    </ul>
    99    <h2>{'Registration'|@translate}</h2>
  • trunk/template/yoga/search.tpl

    r3283 r5021  
    2323    <ul class="categoryActions">
    2424      <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>
    25       <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>
     25      <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>
    2626    </ul>
    2727    <h2>{'Search'|@translate}</h2>
     
    4141<fieldset>
    4242  <legend>{'Filter'|@translate}</legend>
    43   <label>{'search_keywords'|@translate}
     43  <label>{'Search for words'|@translate}
    4444    <input type="text" style="width: 300px" name="search_allwords" size="30">
    4545  </label>
    4646  <ul>
    4747    <li><label>
    48       <input type="radio" name="mode" value="AND" checked="checked">{'search_mode_and'|@translate}
     48      <input type="radio" name="mode" value="AND" checked="checked">{'Search for all terms '|@translate}
    4949    </label></li>
    5050    <li><label>
    51       <input type="radio" name="mode" value="OR">{'search_mode_or'|@translate}
     51      <input type="radio" name="mode" value="OR">{'Search for any terms'|@translate}
    5252    </label></li>
    5353  </ul>
    54   <label>{'search_author'|@translate}
     54  <label>{'Search for Author'|@translate}
    5555    <input type="text" style="width: 300px" name="search_author" size="30">
    5656  </label>
     
    6767
    6868<fieldset>
    69   <legend>{'search_date'|@translate}</legend>
     69  <legend>{'Search by Date'|@translate}</legend>
    7070  <ul>
    71     <li><label>{'search_date_type'|@translate}</label></li>
     71    <li><label>{'Kind of date'|@translate}</label></li>
    7272    <li><label>
    7373      <input type="radio" name="date_type" value="date_creation" checked="checked">{'Creation date'|@translate}
     
    7878  </ul>
    7979  <ul>
    80     <li><label>{'search_date_from'|@translate}</label></li>
     80    <li><label>{'Date'|@translate}</label></li>
    8181    <li>
    8282      <select id="start_day" name="start_day">
     
    9797  </ul>
    9898  <ul>
    99     <li><label>{'search_date_to'|@translate}</label></li>
     99    <li><label>{'End-Date'|@translate}</label></li>
    100100    <li>
    101101      <select id="end_day" name="end_day">
     
    118118
    119119<fieldset>
    120   <legend>{'search_options'|@translate}</legend>
    121   <label>{'search_categories'|@translate}
     120  <legend>{'Search Options'|@translate}</legend>
     121  <label>{'Search in Categories'|@translate}
    122122    <select class="categoryList" name="cat[]" multiple="multiple" >
    123123      {html_options options=$category_options selected=$category_options_selected}
     
    125125  </label>
    126126  <ul>
    127     <li><label>{'search_subcats_included'|@translate}</label></li>
     127    <li><label>{'Search in subcategories'|@translate}</label></li>
    128128    <li><label>
    129129      <input type="radio" name="subcats-included" value="1" checked="checked">{'Yes'|@translate}
  • trunk/template/yoga/search_rules.tpl

    r3283 r5021  
    1616  {if isset($SEARCH_TAGS_MODE) }
    1717  <li>
    18     <p>{if 'AND'==$SEARCH_TAGS_MODE}{'All tags must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
     18    <p>{if 'AND'==$SEARCH_TAGS_MODE}{'At least one tag must match'|@translate}{else}{'At least one tag must match'|@translate}{/if}</p>
    1919    <ul>
    2020      {foreach from=$search_tags item=v}
  • trunk/template/yoga/slideshow.tpl

    r3283 r5021  
    22  <div class="browsePath">
    33    {if isset($U_SLIDESHOW_STOP) }
    4     [ <a href="{$U_SLIDESHOW_STOP}">{'slideshow_stop'|@translate}</a> ]
     4    [ <a href="{$U_SLIDESHOW_STOP}">{'stop the slideshow'|@translate}</a> ]
    55    {/if}
    66  </div>
  • trunk/template/yoga/tags.tpl

    r3283 r5021  
    44                <ul class="categoryActions">
    55                {if $display_mode == 'letters'}
    6                         <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>
     6                        <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>
    77                {/if}
    88
    99                {if $display_mode == 'cloud'}
    10                         <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>
     10                        <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>
    1111                {/if}
    1212
    13                         <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
     13                        <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    1414                </ul>
    1515                <h2>{'Tags'|@translate}</h2>
  • trunk/template/yoga/upload.tpl

    r3283 r5021  
    99  <div class="titrePage">
    1010    <ul class="categoryActions">
    11       <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"></a></li>
     11      <li><a href="{$U_HOME}" title="{'Home'|@translate}"><img src="{$themeconf.icon_dir}/Home.png" class="button" alt="{'Home'|@translate}"></a></li>
    1212    </ul>
    13     <h2>{'upload_title'|@translate}</h2>
     13    <h2>{'Upload a picture'|@translate}</h2>
    1414  </div>
    1515
     
    6161    <!-- mail address -->
    6262    <tr>
    63       <td>{'mail_address'|@translate} <span style="color:red;">*</span></td>
     63      <td>{'E-mail address'|@translate} <span style="color:red;">*</span></td>
    6464      <td>
    6565      <input name="mail_address" type="text" value="{$EMAIL}">
     
    6868    <!-- name of the picture -->
    6969    <tr>
    70       <td>{'upload_name'|@translate}</td>
     70      <td>{'Name of the picture'|@translate}</td>
    7171      <td>
    7272      <input name="name" type="text" value="{$NAME_IMG}">
     
    7575    <!-- author -->
    7676    <tr>
    77       <td>{'upload_author'|@translate}</td>
     77      <td>{'Author'|@translate}</td>
    7878      <td>
    7979      <input name="author" type="text" value="{$AUTHOR_IMG}">
     
    8989    <!-- comment -->
    9090    <tr>
    91       <td>{'comment'|@translate}</td>
     91      <td>{'Comment'|@translate}</td>
    9292      <td>
    9393       <textarea name="comment" id="comment" rows="3" cols="40" style="overflow:auto">{$COMMENT_IMG}</textarea>
     
    103103  </form>
    104104  {else}
    105   {'upload_successful'|@translate}<br>
     105  {'Picture uploaded with success, an administrator will validate it as soon as possible'|@translate}<br>
    106106  <div style="text-align:center;">
    107     <a href="{$U_RETURN}">[ {'home'|@translate} ]</a>
     107    <a href="{$U_RETURN}">[ {'Home'|@translate} ]</a>
    108108  </div>
    109109  {/if}
    110110 
    111111  {if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
    112   <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'mandatory'|@translate}</div>
     112  <div style="text-align:left; margin-left:20px;"><span style="color:red;">*</span> : {'obligatory'|@translate}</div>
    113113  {/if}
    114114</div> <!-- content -->
  • trunk/upgrade.php

    r5014 r5021  
    195195$template->assign(array(
    196196  'RELEASE' => PHPWG_VERSION,
    197   'L_UPGRADE_HELP' => sprintf(l10n('install_help'), PHPWG_URL.'/forum'),
     197  'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on <a href=\"%s\">Piwigo message board</a>.'), PHPWG_URL.'/forum'),
    198198  )
    199199);
     
    279279      {
    280280        array_push($page['infos'],
    281           l10n('in include/config_database.inc.php, before ?>, insert:') . '
    282 <p><textarea rows="4" cols="40">'.implode("\r\n" , $mysql_changes).'</textarea></p>'
    283           );
     281                   l10n_args('in <i>%s</i>, before <b>?></b>, insert:',
     282                             'include/config_database.inc.php') .
     283                   '<p><textarea rows="4" cols="40">' .
     284                   implode("\r\n" , $mysql_changes).'</textarea></p>'
     285                   );
    284286      }
    285287    }
     
    315317
    316318    array_push($page['infos'],
    317       l10n('perform a maintenance check')
     319      l10n('Perform a maintenance check in [Administration>Specials>Maintenance] if you encounter any problem.')
    318320      );
    319321
  • trunk/upload.php

    r5014 r5021  
    6262  if (!in_array($extension, $conf['picture_ext']))
    6363  {
    64     array_push( $result['error'], l10n('upload_advise_filetype') );
     64    array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
    6565    return $result;
    6666  }
     
    7373  {
    7474    array_push( $result['error'],
    75                 l10n('upload_advise_filesize').$my_max_file_size.' KB' );
     75                l10n('the filesize of the picture must not exceed : ').$my_max_file_size.' KB' );
    7676  }
    7777  else
     
    8181    if ( !move_uploaded_file( $_FILES['picture']['tmp_name'], $temp_name ) )
    8282    {
    83       array_push( $result['error'], l10n('upload_cannot_upload') );
     83      array_push( $result['error'], l10n('can\'t upload the picture on the server') );
    8484    }
    8585    else
     
    9191      {
    9292        array_push( $result['error'],
    93                     l10n('upload_advise_width').$image_max_width.' px' );
     93                    l10n('the width of the picture must not exceed : ').$image_max_width.' px' );
    9494      }
    9595      if ( isset( $image_max_height )
     
    9898      {
    9999        array_push( $result['error'],
    100                     l10n('upload_advise_height').$image_max_height.' px' );
     100                    l10n('the height of the picture must not exceed : ').$image_max_height.' px' );
    101101      }
    102102      // $size[2] == 1 means GIF
     
    109109      case 3 : $result['type'] = 'png'; break;
    110110      default :
    111         array_push( $result['error'], l10n('upload_advise_filetype') );
     111        array_push( $result['error'], l10n('the picture must be to the fileformat jpg, gif or png') );
    112112      }
    113113    }
     
    182182  if ( @is_file( $path ) )
    183183  {
    184     array_push( $error, l10n('upload_file_exists') );
     184    array_push( $error, l10n('A picture\'s name already used') );
    185185  }
    186186  // test de la présence des champs obligatoires
    187187  if ( empty($_FILES['picture']['name']))
    188188  {
    189     array_push( $error, l10n('upload_filenotfound') );
     189    array_push( $error, l10n('You must choose a picture fileformat for the image') );
    190190  }
    191191  if ( !preg_match( '/([_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)+)/',
    192192             $_POST['mail_address'] ) )
    193193  {
    194     array_push( $error, l10n('reg_err_mail_address') );
     194    array_push( $error, l10n('mail address must be like xxx@yyy.eee (example : jack@altern.org)') );
    195195  }
    196196  if ( empty($_POST['username']) )
    197197  {
    198     array_push( $error, l10n('upload_err_username') );
     198    array_push( $error, l10n('the username must be given') );
    199199  }
    200200
     
    210210    else
    211211    {
    212       array_push( $error, l10n('err_date') );
     212      array_push( $error, l10n('wrong date') );
    213213    }
    214214  }
     
    225225  if ( !preg_match( '/^[a-zA-Z0-9-_.]+$/', $_FILES['picture']['name'] ) )
    226226  {
    227     array_push( $error, l10n('update_wrong_dirname') );
     227    array_push( $error, l10n('wrong filename') );
    228228  }
    229229
     
    319319// Start output of page
    320320//
    321 $title= l10n('upload_title');
     321$title= l10n('Upload a picture');
    322322$page['body_id'] = 'theUploadPage';
    323323include(PHPWG_ROOT_PATH.'include/page_header.php');
     
    351351if ( isset( $page['waiting_id'] ) )
    352352{
    353   $advise_title = l10n('upload_advise_thumbnail').$_FILES['picture']['name'];
     353  $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to ').$_FILES['picture']['name'];
    354354}
    355355else
     
    382382  if ( !empty($conf['upload_maxfilesize']) )
    383383  {
    384     $content = l10n('upload_advise_filesize');
     384    $content = l10n('the filesize of the picture must not exceed : ');
    385385    $content.= $conf['upload_maxfilesize'].' KB';
    386386    $template->append('advises', $content);
     
    391391    if ( $conf['upload_maxwidth_thumbnail'] != '' )
    392392    {
    393       $content = l10n('upload_advise_width');
     393      $content = l10n('the width of the picture must not exceed : ');
    394394      $content.= $conf['upload_maxwidth_thumbnail'].' px';
    395395      $template->append('advises', $content);
     
    397397    if ( $conf['upload_maxheight_thumbnail'] != '' )
    398398    {
    399       $content = l10n('upload_advise_height');
     399      $content = l10n('the height of the picture must not exceed : ');
    400400      $content.= $conf['upload_maxheight_thumbnail'].' px';
    401401      $template->append('advises', $content);
     
    406406    if ( $conf['upload_maxwidth'] != '' )
    407407    {
    408       $content = l10n('upload_advise_width');
     408      $content = l10n('the width of the picture must not exceed : ');
    409409      $content.= $conf['upload_maxwidth'].' px';
    410410      $template->append('advises', $content);
     
    412412    if ( $conf['upload_maxheight'] != '' )
    413413    {
    414       $content = l10n('upload_advise_height');
     414      $content = l10n('the height of the picture must not exceed : ');
    415415      $content.= $conf['upload_maxheight'].' px';
    416416      $template->append('advises', $content);
    417417    }
    418418  }
    419   $template->append('advises', l10n('upload_advise_filetype'));
     419  $template->append('advises', l10n('the picture must be to the fileformat jpg, gif or png'));
    420420
    421421//----------------------------------------- optionnal username and mail address
Note: See TracChangeset for help on using the changeset viewer.