From 2e890e9597da29346a1fbe0db45f48e4a2be86e7 Mon Sep 17 00:00:00 2001 From: nikrou Date: Tue, 2 Mar 2010 14:54:22 +0000 Subject: 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 git-svn-id: http://piwigo.org/svn/trunk@5021 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/advanced_feature.php | 4 +- admin/cat_list.php | 4 +- admin/cat_modify.php | 6 +-- admin/cat_options.php | 32 ++++++------- admin/configuration.php | 18 +++---- admin/element_set.php | 6 +-- admin/extend_for_templates.php | 2 +- admin/group_list.php | 12 ++--- admin/group_perm.php | 6 +-- admin/history.php | 2 +- admin/include/c13y_internal.class.php | 12 ++--- admin/include/check_integrity.class.php | 6 +-- admin/include/functions.php | 8 ++-- .../include/functions_notification_by_mail.inc.php | 18 +++---- admin/include/functions_permalinks.php | 6 +-- admin/include/functions_plugins.inc.php | 6 +-- admin/include/functions_upgrade.php | 4 +- admin/include/functions_waiting.inc.php | 2 +- admin/notification_by_mail.php | 24 +++++----- admin/picture_modify.php | 2 +- admin/plugins_new.php | 18 +++---- admin/plugins_update.php | 14 +++--- admin/site_manager.php | 18 +++---- admin/site_update.php | 34 ++++++------- admin/tags.php | 6 +-- admin/template/goto/admin.tpl | 46 +++++++++--------- admin/template/goto/advanced_feature.tpl | 2 +- admin/template/goto/cat_list.tpl | 16 +++---- admin/template/goto/cat_modify.tpl | 28 +++++------ admin/template/goto/cat_options.tpl | 2 +- admin/template/goto/check_integrity.tpl | 26 +++++----- admin/template/goto/comments.tpl | 2 +- admin/template/goto/configuration.tpl | 18 +++---- admin/template/goto/extend_for_templates.tpl | 6 +-- admin/template/goto/footer.tpl | 6 +-- admin/template/goto/group_list.tpl | 8 ++-- admin/template/goto/history.tpl | 16 +++---- admin/template/goto/install.tpl | 56 +++++++++++----------- admin/template/goto/intro.tpl | 2 +- admin/template/goto/maintenance.tpl | 18 +++---- admin/template/goto/navigation_bar.tpl | 16 +++---- admin/template/goto/notification_by_mail.tpl | 46 +++++++++--------- admin/template/goto/permalinks.tpl | 2 +- admin/template/goto/picture_modify.tpl | 6 +-- admin/template/goto/plugins_list.tpl | 4 +- admin/template/goto/plugins_new.tpl | 2 +- admin/template/goto/plugins_update.tpl | 12 ++--- admin/template/goto/profile_content.tpl | 24 +++++----- admin/template/goto/rating.tpl | 4 +- admin/template/goto/site_manager.tpl | 20 ++++---- admin/template/goto/site_update.tpl | 46 +++++++++--------- admin/template/goto/tags.tpl | 2 +- admin/template/goto/thumbnail.tpl | 34 ++++++------- admin/template/goto/upgrade.tpl | 6 +-- admin/template/goto/upload.tpl | 10 ++-- admin/template/goto/user_list.tpl | 34 ++++++------- admin/thumbnail.php | 12 ++--- admin/user_list.php | 24 +++++----- admin/user_perm.php | 6 +-- 59 files changed, 417 insertions(+), 415 deletions(-) (limited to 'admin') diff --git a/admin/advanced_feature.php b/admin/advanced_feature.php index 29c26bb98..da2001516 100644 --- a/admin/advanced_feature.php +++ b/admin/advanced_feature.php @@ -66,14 +66,14 @@ $advanced_features = array(); array_push($advanced_features, array ( - 'CAPTION' => l10n('Elements_not_linked'), + 'CAPTION' => l10n('Not linked elements'), 'URL' => get_root_url().'admin.php?page=element_set&cat=not_linked' )); array_push($advanced_features, array ( - 'CAPTION' => l10n('Duplicates'), + 'CAPTION' => l10n('Files with same name in more than one physical category'), 'URL' => get_root_url().'admin.php?page=element_set&cat=duplicates' )); diff --git a/admin/cat_list.php b/admin/cat_list.php index 5b7733df2..45eee0732 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -68,7 +68,7 @@ $categories = array(); $base_url = get_root_url().'admin.php?page=cat_list'; $navigation = ''; -$navigation.= l10n('home'); +$navigation.= l10n('Home'); $navigation.= ''; // +-----------------------------------------------------------------------+ @@ -78,7 +78,7 @@ $navigation.= ''; if (isset($_GET['delete']) and is_numeric($_GET['delete']) and !is_adviser()) { delete_categories(array($_GET['delete'])); - array_push($page['infos'], l10n('cat_virtual_deleted')); + array_push($page['infos'], l10n('Virtual category deleted')); update_global_rank(); } // request to add a virtual category diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 17b23ce6c..0da90e456 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -110,7 +110,7 @@ UPDATE '.CATEGORIES_TABLE.' SET image_order='.(isset($image_order) ? 'NULL':"'$i move_categories( array($_GET['cat_id']), $_POST['parent'] ); } - array_push($page['infos'], l10n('editcat_confirm')); + array_push($page['infos'], l10n('Category informations updated successfully.')); } elseif (isset($_POST['set_random_representant'])) { @@ -316,7 +316,7 @@ $sort_fields = array( 'date_creation' => l10n('Creation date'), 'date_available' => l10n('Post date'), 'average_rate' => l10n('Average rate'), - 'hit' => l10n('most_visited_cat'), + 'hit' => l10n('Most visited'), 'file' => l10n('File name'), 'id' => 'Id', 'rank' => l10n('Rank'), @@ -516,7 +516,7 @@ SELECT array_push( $page['infos'], sprintf( - l10n('An information email was sent to group "%s"'), + l10n('An information email was sent to group \"%s\"'), $group_name ) ); diff --git a/admin/cat_options.php b/admin/cat_options.php index 31c67f8ce..67d626625 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -160,10 +160,10 @@ $template->assign( $tabsheet = new tabsheet(); // TabSheet initialization $opt_link = $link_start.'cat_options&section='; -$tabsheet->add('status', l10n('cat_security'), $opt_link.'status'); -$tabsheet->add('visible', l10n('lock'), $opt_link.'visible'); -$tabsheet->add('upload', l10n('upload'), $opt_link.'upload'); -$tabsheet->add('comments', l10n('comments'), $opt_link.'comments'); +$tabsheet->add('status', l10n('Public / Private'), $opt_link.'status'); +$tabsheet->add('visible', l10n('Lock'), $opt_link.'visible'); +$tabsheet->add('Upload', l10n('Upload'), $opt_link.'Upload'); +$tabsheet->add('Comments', l10n('Comments'), $opt_link.'Comments'); if ($conf['allow_random_representative']) { $tabsheet->add('representative', l10n('Representative'), $opt_link.'representative'); @@ -208,9 +208,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_upload_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('authorized'), - 'L_CAT_OPTIONS_FALSE' => l10n('forbidden'), + 'L_SECTION' => l10n('Select uploadable categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'), ) ); break; @@ -229,9 +229,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_comments_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('authorized'), - 'L_CAT_OPTIONS_FALSE' => l10n('forbidden'), + 'L_SECTION' => l10n('Authorize users to add comments on selected categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE' => l10n('Forbidden'), ) ); break; @@ -250,9 +250,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_lock_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('unlocked'), - 'L_CAT_OPTIONS_FALSE' => l10n('locked'), + 'L_SECTION' => l10n('Lock categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Unlocked'), + 'L_CAT_OPTIONS_FALSE' => l10n('Locked'), ) ); break; @@ -271,9 +271,9 @@ SELECT id,name,uppercats,global_rank ;'; $template->assign( array( - 'L_SECTION' => l10n('cat_status_title'), - 'L_CAT_OPTIONS_TRUE' => l10n('cat_public'), - 'L_CAT_OPTIONS_FALSE' => l10n('cat_private'), + 'L_SECTION' => l10n('Manage authorizations for selected categories'), + 'L_CAT_OPTIONS_TRUE' => l10n('Public category'), + 'L_CAT_OPTIONS_FALSE' => l10n('Private category'), ) ); break; diff --git a/admin/configuration.php b/admin/configuration.php index 9b4a7f0c2..41b196e35 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -86,7 +86,7 @@ if (isset($_POST['submit']) and !is_adviser()) { if ( !url_is_remote($_POST['gallery_url']) ) { - array_push($page['errors'], l10n('conf_gallery_url_error')); + array_push($page['errors'], l10n('The gallery URL is not valid.')); } foreach( $main_checkboxes as $checkbox) { @@ -110,7 +110,7 @@ if (isset($_POST['submit']) and !is_adviser()) or $_POST['nb_comment_page'] < 5 or $_POST['nb_comment_page'] > 50) { - array_push($page['errors'], l10n('conf_nb_comment_page_error')); + array_push($page['errors'], l10n('The number of comments a page must be between 5 and 50 included.')); } foreach( $comments_checkboxes as $checkbox) { @@ -160,7 +160,7 @@ WHERE param = \''.$row['param'].'\' pwg_query($query); } } - array_push($page['infos'], l10n('conf_confirmation')); + array_push($page['infos'], l10n('Information data registered in database')); } //------------------------------------------------------ $conf reinitialization @@ -173,11 +173,11 @@ $template->set_filename('config', 'configuration.tpl'); // TabSheet $tabsheet = new tabsheet(); // TabSheet initialization -$tabsheet->add('main', l10n('conf_main_title'), $conf_link.'main'); -$tabsheet->add('history', l10n('conf_history_title'), $conf_link.'history'); -$tabsheet->add('comments', l10n('conf_comments_title'), $conf_link.'comments'); -$tabsheet->add('upload', l10n('conf_upload_title'), $conf_link.'upload'); -$tabsheet->add('default', l10n('conf_display'), $conf_link.'default'); +$tabsheet->add('main', l10n('Main'), $conf_link.'main'); +$tabsheet->add('history', l10n('History'), $conf_link.'history'); +$tabsheet->add('comments', l10n('Comments'), $conf_link.'comments'); +$tabsheet->add('upload', l10n('Upload'), $conf_link.'upload'); +$tabsheet->add('default', l10n('Default display'), $conf_link.'default'); // TabSheet selection $tabsheet->select($page['section']); // Assign tabsheet to template @@ -285,7 +285,7 @@ switch ($page['section']) { // Reload user $edit_user = build_user($conf['default_user_id'], false); - array_push($page['infos'], l10n('conf_confirmation')); + array_push($page['infos'], l10n('Information data registered in database')); } } $page['errors'] = array_merge($page['errors'], $errors); diff --git a/admin/element_set.php b/admin/element_set.php index ce9ce63da..49b1b2377 100644 --- a/admin/element_set.php +++ b/admin/element_set.php @@ -132,7 +132,7 @@ SELECT element_id } else if ('not_linked' == $_GET['cat']) { - $page['title'] = l10n('Elements_not_linked'); + $page['title'] = l10n('Not linked elements'); $template->assign(array('U_ACTIVE_MENU' => 5 )); // we are searching elements not linked to any virtual category @@ -163,7 +163,7 @@ SELECT DISTINCT(image_id) } else if ('duplicates' == $_GET['cat']) { - $page['title'] = l10n('Duplicates'); + $page['title'] = l10n('Files with same name in more than one physical category'); $template->assign(array('U_ACTIVE_MENU' => 5 )); // we are searching related elements twice or more to physical categories @@ -189,7 +189,7 @@ ORDER BY file, id } elseif ('recent'== $_GET['cat']) { - $page['title'] = l10n('recent_pics_cat'); + $page['title'] = l10n('Recent pictures'); $query = 'SELECT MAX(date_available) AS date FROM '.IMAGES_TABLE; if ($row = pwg_db_fetch_assoc( pwg_query($query) ) ) diff --git a/admin/extend_for_templates.php b/admin/extend_for_templates.php index 876bfe194..92c70e6a9 100644 --- a/admin/extend_for_templates.php +++ b/admin/extend_for_templates.php @@ -146,7 +146,7 @@ WHERE param = 'extents_for_templates';"; if (pwg_query($query)) { array_push($page['infos'], - l10n('Templates recorded.')); + l10n('Templates configuration has been recorded.')); } } diff --git a/admin/group_list.php b/admin/group_list.php index eff20031d..3ecfa6b0d 100644 --- a/admin/group_list.php +++ b/admin/group_list.php @@ -72,7 +72,7 @@ DELETE array_push( $page['infos'], - sprintf(l10n('group "%s" deleted'), $groupname) + sprintf(l10n('group \"%s\" deleted'), $groupname) ); } @@ -84,7 +84,7 @@ if (isset($_POST['submit_add']) and !is_adviser()) { if (empty($_POST['groupname'])) { - array_push($page['errors'], l10n('group_add_error1')); + array_push($page['errors'], l10n('The name of a group must not contain \" or \' or be empty.')); } if (count($page['errors']) == 0) { @@ -97,7 +97,7 @@ SELECT COUNT(*) list($count) = pwg_db_fetch_row(pwg_query($query)); if ($count != 0) { - array_push($page['errors'], l10n('group_add_error2')); + array_push($page['errors'], l10n('This name is already used by another group.')); } } if (count($page['errors']) == 0) @@ -113,7 +113,7 @@ INSERT INTO '.GROUPS_TABLE.' array_push( $page['infos'], - sprintf(l10n('group "%s" added'), $_POST['groupname']) + sprintf(l10n('group \"%s\" added'), $_POST['groupname']) ); } } @@ -141,7 +141,7 @@ UPDATE '.GROUPS_TABLE.' array_push( $page['infos'], - sprintf(l10n('group "%s" updated'), $groupname) + sprintf(l10n('group \"%s\" updated'), $groupname) ); } @@ -188,7 +188,7 @@ SELECT COUNT(*) 'groups', array( 'NAME' => $row['name'], - 'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('is_default_group').']' : ''), + 'IS_DEFAULT' => (get_boolean($row['is_default']) ? ' ['.l10n('default').']' : ''), 'MEMBERS' => l10n_dec('%d member', '%d members', $counter), 'U_MEMBERS' => $members_url.$row['id'], 'U_DELETE' => $del_url.$row['id'], diff --git a/admin/group_perm.php b/admin/group_perm.php index f664854e7..cae05ab97 100644 --- a/admin/group_perm.php +++ b/admin/group_perm.php @@ -132,12 +132,12 @@ $template->assign( array( 'TITLE' => sprintf( - l10n('Manage permissions for group "%s"'), + l10n('Manage permissions for group \"%s\"'), get_groupname($page['group'] ) ), - 'L_CAT_OPTIONS_TRUE'=>l10n('authorized'), - 'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'), + 'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'), 'F_ACTION' => get_root_url(). diff --git a/admin/history.php b/admin/history.php index b0022b902..b8f30299a 100644 --- a/admin/history.php +++ b/admin/history.php @@ -144,7 +144,7 @@ INSERT INTO '.SEARCH_TABLE.' } else { - array_push($page['errors'], l10n('search_one_clause_at_least')); + array_push($page['errors'], l10n('Empty query. No criteria has been entered.')); } } diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php index 7b20e24db..02a2ff26a 100644 --- a/admin/include/c13y_internal.class.php +++ b/admin/include/c13y_internal.class.php @@ -55,10 +55,10 @@ class c13y_internal if (version_compare($elem['current'], $elem['required'], '<')) { $c13y->add_anomaly( - sprintf(l10n('c13y_version_anomaly'), $elem['type'], $elem['current'], $elem['required']), + sprintf(l10n('The version of %s [%s] installed is not compatible with the version required [%s]'), $elem['type'], $elem['current'], $elem['required']), null, null, - l10n('c13y_version_correction') + 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') .'
'. $c13y->get_htlm_links_more_info()); } @@ -80,10 +80,10 @@ class c13y_internal if (($conf[$value]) and (!function_exists('read_exif_data'))) { $c13y->add_anomaly( - sprintf(l10n('c13y_exif_anomaly'), '$conf[\''.$value.'\']'), + sprintf(l10n('%s value is not correct file because exif are not supported'), '$conf[\''.$value.'\']'), null, null, - sprintf(l10n('c13y_exif_correction'), '$conf[\''.$value.'\']') + sprintf(l10n('%s must be to set to false in your config_local.inc.php file'), '$conf[\''.$value.'\']') .'
'. $c13y->get_htlm_links_more_info()); } @@ -208,7 +208,7 @@ class c13y_internal create_user_infos($id); - $page['infos'][] = sprintf(l10n('c13y_user_created'), $name, $password); + $page['infos'][] = sprintf(l10n('User \"%s\" created with \"%s\" like password'), $name, $password); $result = true; } @@ -239,7 +239,7 @@ class c13y_internal array('primary' => array('user_id'),'update' => array('status')), $updates); - $page['infos'][] = sprintf(l10n('c13y_user_status_updated'), get_username($id)); + $page['infos'][] = sprintf(l10n('Status of user \"%s\" updated'), get_username($id)); $result = true; } diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php index 243f8729b..f19d19ab7 100644 --- a/admin/include/check_integrity.class.php +++ b/admin/include/check_integrity.class.php @@ -334,9 +334,9 @@ class check_integrity return sprintf ( - l10n('c13y_more_info'), - sprintf($link_fmt, $pwg_links['FORUM'], l10n('c13y_more_info_forum')), - sprintf($link_fmt, $pwg_links['WIKI'], l10n('c13y_more_info_wiki')) + l10n('Go to %s or %s for more informations'), + sprintf($link_fmt, $pwg_links['FORUM'], l10n('the forum')), + sprintf($link_fmt, $pwg_links['WIKI'], l10n('the wiki')) ); } diff --git a/admin/include/functions.php b/admin/include/functions.php index 5cfbf94f0..1df95314b 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -1182,7 +1182,7 @@ function create_virtual_category($category_name, $parent_id=null) // is the given category name only containing blank spaces ? if (preg_match('/^\s*$/', $category_name)) { - return array('error' => l10n('cat_error_name')); + return array('error' => l10n('The name of a category should not be empty')); } $parent_id = !empty($parent_id) ? $parent_id : 'NULL'; @@ -1268,7 +1268,7 @@ UPDATE pwg_query($query); return array( - 'info' => l10n('cat_virtual_added'), + 'info' => l10n('Virtual category added'), 'id' => $inserted_id, ); } @@ -1666,7 +1666,7 @@ SELECT id return array( 'info' => sprintf( - l10n('Tag "%s" was added'), + l10n('Tag \"%s\" was added'), stripslashes($tag_name) ), 'id' => $inserted_id, @@ -1676,7 +1676,7 @@ SELECT id { return array( 'error' => sprintf( - l10n('Tag "%s" already exists'), + l10n('Tag \"%s\" already exists'), stripslashes($tag_name) ) ); diff --git a/admin/include/functions_notification_by_mail.inc.php b/admin/include/functions_notification_by_mail.inc.php index e50321de4..e05e027f1 100644 --- a/admin/include/functions_notification_by_mail.inc.php +++ b/admin/include/functions_notification_by_mail.inc.php @@ -204,8 +204,8 @@ function begin_users_env_nbm($is_to_send_mail = false) $env_nbm['error_on_mail_count'] = 0; $env_nbm['sent_mail_count'] = 0; // Save sendmail message info and error in the original language - $env_nbm['msg_info'] = l10n('nbm_msg_mail_sent_to'); - $env_nbm['msg_error'] = l10n('nbm_msg_error_sending_email_to'); + $env_nbm['msg_info'] = l10n('Mail sent to %s [%s].'); + $env_nbm['msg_error'] = l10n('Error when sending email to %s [%s].'); } } @@ -322,7 +322,7 @@ function display_counter_info() else { if ($env_nbm['sent_mail_count'] == 0) - array_push($page['infos'], l10n('nbm_no_mail_to_send')); + array_push($page['infos'], l10n('No mail to send.')); else array_push($page['infos'], l10n_dec('nbm_msg_n_mail_sent', 'nbm_msg_n_mails_sent', $env_nbm['sent_mail_count'])); } @@ -369,13 +369,13 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su if ($is_subscribe) { - $msg_info = l10n('nbm_user_change_enabled_true'); - $msg_error = l10n('nbm_user_not_change_enabled_true'); + $msg_info = l10n('User %s [%s] was added to the subscription list.'); + $msg_error = l10n('User %s [%s] was not added to the subscription list.'); } else { - $msg_info = l10n('nbm_user_change_enabled_false'); - $msg_error = l10n('nbm_user_not_change_enabled_false'); + $msg_info = l10n('User %s [%s] was removed from the subscription list.'); + $msg_error = l10n('User %s [%s] was not removed from the subscription list.'); } if (count($check_key_list) != 0) @@ -385,7 +385,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su $data_users = get_user_notifications('subscribe', $check_key_list, !$is_subscribe); // Prepare message after change language - $msg_break_timeout = l10n('nbm_break_timeout_send_mail'); + $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.'); // Begin nbm users environment begin_users_env_nbm(true); @@ -408,7 +408,7 @@ function do_subscribe_unsubscribe_notification_by_mail($is_admin_request, $is_su // set env nbm user set_user_on_env_nbm($nbm_user, true); - $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('nbm_object_subscribe'): l10n('nbm_object_unsubscribe')); + $subject = '['.$conf['gallery_title'].']: '.($is_subscribe ? l10n('Unsubscribe from notification by mail'): l10n('Unsubscribe from notification by mail')); // Assign current var for nbm mail assign_vars_nbm_mail_content($nbm_user); diff --git a/admin/include/functions_permalinks.php b/admin/include/functions_permalinks.php index 94c13be31..84bde5460 100644 --- a/admin/include/functions_permalinks.php +++ b/admin/include/functions_permalinks.php @@ -87,7 +87,7 @@ SELECT permalink { $page['errors'][] = sprintf( - l10n('Permalink_%s_histo_used_by_%s'), + l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'), $permalink, $old_cat_id ); return false; @@ -140,7 +140,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) if ( $sanitized_permalink != $permalink or preg_match( '#^(\d)+(-.*)?$#', $permalink) ) { - $page['errors'][] = l10n('Permalink_name_rule'); + $page['errors'][] = l10n('The permalink name must be composed of a-z, A-Z, 0-9, \"-\", \"_\" or \"/\". It must not be numeric or start with number followed by \"-\"'); return false; } @@ -169,7 +169,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) { $page['errors'][] = sprintf( - l10n('Permalink_%s_histo_used_by_%s'), + l10n('Permalink %s has been previously used by category %s. Delete from the permalink history first'), $permalink, $old_cat_id ); return false; diff --git a/admin/include/functions_plugins.inc.php b/admin/include/functions_plugins.inc.php index 72c0b013c..2d4957d5e 100644 --- a/admin/include/functions_plugins.inc.php +++ b/admin/include/functions_plugins.inc.php @@ -55,9 +55,9 @@ function set_plugins_tabsheet($selected) $link = get_root_url().'admin.php?page='; $tabsheet = new tabsheet(); - $tabsheet->add('plugins_list', l10n('plugins_tab_list'), $link.'plugins_list'); - $tabsheet->add('plugins_update', l10n('plugins_tab_update'), $link.'plugins_update'); - $tabsheet->add('plugins_new', l10n('plugins_tab_new'), $link.'plugins_new'); + $tabsheet->add('plugins_list', l10n('Plugin list'), $link.'plugins_list'); + $tabsheet->add('plugins_update', l10n('Check for updates'), $link.'plugins_update'); + $tabsheet->add('plugins_new', l10n('Other plugins'), $link.'plugins_new'); $tabsheet->select($selected); $tabsheet->assign(); } diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index 6c653fe98..10eedf20b 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -127,7 +127,7 @@ WHERE id IN ("' . implode('","', $plugins) . '") pwg_query($query); array_push($page['infos'], - l10n('deactivated plugins').'

'.implode(', ', $plugins).'

'); + l10n('As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:').'

'.implode(', ', $plugins).'

'); } } @@ -174,7 +174,7 @@ WHERE '.$conf['user_fields']['username'].'="'.$username.'" if ($row['password'] != $conf['pass_convert']($password)) { - array_push($page['errors'], l10n('invalid_pwd')); + array_push($page['errors'], l10n('Invalid password!')); } elseif ($row['status'] != 'admin' and $row['status'] != 'webmaster') { diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php index 6f8bea052..16642474c 100644 --- a/admin/include/functions_waiting.inc.php +++ b/admin/include/functions_waiting.inc.php @@ -30,7 +30,7 @@ function waiting_tabsheet() // TabSheet $tabsheet = new tabsheet(); // TabSheet initialization - $tabsheet->add('comments', l10n('comments'), $link_start.'comments'); + $tabsheet->add('Comments', l10n('Comments'), $link_start.'Comments'); $tabsheet->add('upload', l10n('Pictures'), $link_start.'upload'); // TabSheet selection $tabsheet->select($page['page']); diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php index a165d54ea..8b3190a40 100644 --- a/admin/notification_by_mail.php +++ b/admin/notification_by_mail.php @@ -174,7 +174,7 @@ order by ( $page['infos'], sprintf( - l10n('nbm_user_x_added'), + l10n('User %s [%s] added.'), stripslashes($nbm_user['username']), get_email_address_as_display_text($nbm_user['mail_address']) ) @@ -200,7 +200,9 @@ order by $query = 'delete from '.USER_MAIL_NOTIFICATION_TABLE.' where check_key in ('.implode(",", $quoted_check_key_list).');'; $result = pwg_query($query); - redirect($base_url.get_query_string_diff(array(), false), l10n('nbm_redirect_msg')); + redirect($base_url.get_query_string_diff(array(), false), l10n('Processing treatment. + +Please wait...')); } } } @@ -267,11 +269,11 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l // Prepare message after change language if ($is_action_send) { - $msg_break_timeout = l10n('nbm_break_timeout_send_mail'); + $msg_break_timeout = l10n('Time to send mail is limited. Others mails are skipped.'); } else { - $msg_break_timeout = l10n('nbm_break_timeout_list_user'); + $msg_break_timeout = l10n('Prepared time for list of users to send mail is limited. Others users are not listed.'); } // Begin nbm users environment @@ -313,7 +315,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l if ($exist_data) { - $subject = '['.$conf['gallery_title'].']: '.l10n('nbm_object_news'); + $subject = '['.$conf['gallery_title'].']: '.l10n('New elements added'); // Assign current var for nbm mail assign_vars_nbm_mail_content($nbm_user); @@ -449,7 +451,7 @@ function do_action_send_mail_notification($action = 'list_to_send', $check_key_l { if ($is_action_send) { - array_push($page['errors'], l10n('nbm_no_user_to send_notifications_by_mail')); + array_push($page['errors'], l10n('No user to send notifications by mail.')); } } } @@ -593,13 +595,13 @@ if (is_autorize_status(ACCESS_WEBMASTER)) // TabSheet $tabsheet = new tabsheet(); // TabSheet initialization - $tabsheet->add('param', l10n('nbm_param_mode'), + $tabsheet->add('param', l10n('Parameter'), add_url_params($base_url.get_query_string_diff(array('mode', 'select')), array('mode' => 'param'))); - $tabsheet->add('subscribe', l10n('nbm_subscribe_mode'), + $tabsheet->add('subscribe', l10n('Subscribe'), add_url_params($base_url.get_query_string_diff(array('mode', 'select')), array('mode' => 'subscribe'))); - $tabsheet->add('send', l10n('nbm_send_mode'), + $tabsheet->add('send', l10n('Send'), add_url_params($base_url.get_query_string_diff(array('mode', 'select')), array('mode' => 'send'))); // TabSheet selection @@ -650,8 +652,8 @@ switch ($page['mode']) $template->assign( array( - 'L_CAT_OPTIONS_TRUE' => l10n('nbm_subscribe_col'), - 'L_CAT_OPTIONS_FALSE' => l10n('nbm_unsubscribe_col') + 'L_CAT_OPTIONS_TRUE' => l10n('Subscribed'), + 'L_CAT_OPTIONS_FALSE' => l10n('Unsubscribed') ) ); diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 912a94c1c..c7914f3a0 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -62,7 +62,7 @@ if (isset($_POST['date_creation_action']) $_POST['date_creation_year']) ) { - array_push($page['errors'], l10n('err_date')); + array_push($page['errors'], l10n('wrong date')); } } diff --git a/admin/plugins_new.php b/admin/plugins_new.php index 56b09d097..8ee9d26ed 100644 --- a/admin/plugins_new.php +++ b/admin/plugins_new.php @@ -50,26 +50,26 @@ if (isset($_GET['installstatus'])) { case 'ok': array_push($page['infos'], - l10n('plugins_install_ok'), - l10n('plugins_install_need_activate')); + l10n('Plugin has been successfully copied'), + l10n('You might go to plugin list to install and activate it.')); break; case 'temp_path_error': - array_push($page['errors'], l10n('plugins_temp_path_error')); + array_push($page['errors'], l10n('Can\'t create temporary file.')); break; case 'dl_archive_error': - array_push($page['errors'], l10n('plugins_dl_archive_error')); + array_push($page['errors'], l10n('Can\'t download archive.')); break; case 'archive_error': - array_push($page['errors'], l10n('plugins_archive_error')); + array_push($page['errors'], l10n('Can\'t read or extract archive.')); break; default: array_push($page['errors'], - sprintf(l10n('plugins_extract_error'), $_GET['installstatus']), - l10n('plugins_check_chmod')); + sprintf(l10n('An error occured during extraction (%s).'), $_GET['installstatus']), + l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).')); } } @@ -81,7 +81,7 @@ $link = get_root_url().'admin.php?page='.$page['page'].'&order='; $template->assign('order_options', array( $link.'date' => l10n('Post date'), - $link.'revision' => l10n('plugins_revisions'), + $link.'revision' => l10n('Last revisions'), $link.'name' => l10n('Name'), $link.'author' => l10n('Author'), $link.'downloads' => l10n('Number of downloads'))); @@ -126,7 +126,7 @@ if ($plugins->get_server_plugins(true)) } else { - array_push($page['errors'], l10n('plugins_server_error')); + array_push($page['errors'], l10n('Can\'t connect to server.')); } $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); diff --git a/admin/plugins_update.php b/admin/plugins_update.php index e6d6705fe..3d550d154 100644 --- a/admin/plugins_update.php +++ b/admin/plugins_update.php @@ -68,26 +68,26 @@ if (isset($_GET['upgradestatus']) and isset($_GET['plugin'])) case 'ok': array_push($page['infos'], sprintf( - l10n('plugins_upgrade_ok'), + l10n('%s has been successfully upgraded.'), $plugins->fs_plugins[$_GET['plugin']]['name'])); break; case 'temp_path_error': - array_push($page['errors'], l10n('plugins_temp_path_error')); + array_push($page['errors'], l10n('Can\'t create temporary file.')); break; case 'dl_archive_error': - array_push($page['errors'], l10n('plugins_dl_archive_error')); + array_push($page['errors'], l10n('Can\'t download archive.')); break; case 'archive_error': - array_push($page['errors'], l10n('plugins_archive_error')); + array_push($page['errors'], l10n('Can\'t read or extract archive.')); break; default: array_push($page['errors'], - sprintf(l10n('plugins_extract_error'), $_GET['upgradestatus']), - l10n('plugins_check_chmod')); + sprintf(l10n('An error occured during extraction (%s).'), $_GET['upgradestatus']), + l10n('Please check \"plugins\" folder and sub-folders permissions (CHMOD).')); } } @@ -157,7 +157,7 @@ if ($plugins->get_server_plugins()) } else { - array_push($page['errors'], l10n('plugins_server_error')); + array_push($page['errors'], l10n('Can\'t connect to server.')); } $template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); diff --git a/admin/site_manager.php b/admin/site_manager.php index 2cc77bfbb..145ef2b17 100644 --- a/admin/site_manager.php +++ b/admin/site_manager.php @@ -65,7 +65,7 @@ function remote_output($url) } else { - array_push($page['errors'], l10n('site_err_remote_file_not_found')); + array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found')); } } @@ -102,7 +102,7 @@ SELECT COUNT(id) AS count if ($row['count'] > 0) { array_push($page['errors'], - l10n('site_already_exists').' ['.$url.']'); + l10n('This site already exists').' ['.$url.']'); } if (count($page['errors']) == 0) { @@ -120,12 +120,12 @@ SELECT COUNT(id) AS count if (!preg_match('/^PWG-INFO-2:/', $first_line)) { array_push($page['errors'], - l10n('site_err').' : '.$first_line); + l10n('an error happened').' : '.$first_line); } } else { - array_push($page['errors'], l10n('site_err_remote_file_not_found') ); + array_push($page['errors'], l10n('file create_listing_file.php on remote site was not found') ); } } } @@ -149,7 +149,7 @@ INSERT INTO '.SITES_TABLE.' ;'; pwg_query($query); array_push($page['infos'], - $url.' '.l10n('site_created')); + $url.' '.l10n('created')); } } @@ -172,19 +172,19 @@ SELECT galleries_url { case 'generate' : { - $title = $galleries_url.' : '.l10n('remote_site_generate'); + $title = $galleries_url.' : '.l10n('generate listing'); remote_output($galleries_url.'create_listing_file.php?action=generate'); break; } case 'test' : { - $title = $galleries_url.' : '.l10n('remote_site_test'); + $title = $galleries_url.' : '.l10n('test'); remote_output($galleries_url.'create_listing_file.php?action=test&version='.PHPWG_VERSION); break; } case 'clean' : { - $title = $galleries_url.' : '.l10n('remote_site_clean'); + $title = $galleries_url.' : '.l10n('clean'); remote_output($galleries_url.'create_listing_file.php?action=clean'); break; } @@ -192,7 +192,7 @@ SELECT galleries_url { delete_site($page['site']); array_push($page['infos'], - $galleries_url.' '.l10n('site_deleted')); + $galleries_url.' '.l10n('deleted')); break; } } diff --git a/admin/site_update.php b/admin/site_update.php index b4980595d..2a53e9c82 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -55,24 +55,24 @@ define('CURRENT_DATE', $dbnow); $error_labels = array( 'PWG-UPDATE-1' => array( - l10n('update_wrong_dirname_short'), - l10n('update_wrong_dirname_info') + l10n('wrong filename'), + l10n('The name of directories and files must be composed of letters, numbers, \"-\", \"_\" or \".\"') ), 'PWG-UPDATE-2' => array( - l10n('update_missing_tn_short'), - l10n('update_missing_tn_info').implode(',', $conf['picture_ext']) + l10n('missing thumbnail'), + l10n('a picture filetype requires a thumbnail. The thumbnail must be present in the sub-directory \"thumbnail\" of the category directory. The thumbnail filename must start with the configured thumbnail prefix and the extension must be among the following list :').implode(',', $conf['picture_ext']) ), 'PWG-ERROR-NO-FS' => array( - l10n('update_missing_file_or_dir'), - l10n('update_missing_file_or_dir_info') + l10n('File/directory read error'), + l10n('The file or directory cannot be accessed (either it does not exist or the access is denied)') ), 'PWG-ERROR-VERSION' => array( - l10n('update_err_pwg_version_differs'), - l10n('update_err_pwg_version_differs_info') + l10n('Piwigo version differs on the remote site'), + l10n('Version of create_listing_file.php on the remote site and Piwigo must be the same') ), 'PWG-ERROR-NOLISTING' => array( - l10n('update_err_remote_listing_not_found'), - l10n('update_err_remote_listing_not_found_info') + l10n('listing.xml file was not found'), + l10n('listing.xml file was not found on the remote site. This file is generated by choosing the \"generate listing\" command in the Site manager') ) ); $errors = array(); @@ -278,7 +278,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank $infos, array( 'path' => $fulldir, - 'info' => l10n('update_research_added') + 'info' => l10n('added') ) ); @@ -327,7 +327,7 @@ SELECT id_uppercat, MAX(rank)+1 AS next_rank array_push($to_delete, $db_fulldirs[$fulldir]); unset($db_fulldirs[$fulldir]); array_push($infos, array('path' => $fulldir, - 'info' => l10n('update_research_deleted'))); + 'info' => l10n('deleted'))); } if (count($to_delete) > 0) { @@ -473,7 +473,7 @@ SELECT file,storage_category_id $infos, array( 'path' => $insert['path'], - 'info' => l10n('update_research_added') + 'info' => l10n('added') ) ); @@ -514,7 +514,7 @@ SELECT file,storage_category_id { array_push($to_delete_elements, array_search($path, $db_elements)); array_push($infos, array('path' => $path, - 'info' => l10n('update_research_deleted'))); + 'info' => l10n('deleted'))); } if (count($to_delete_elements) > 0) { @@ -828,7 +828,7 @@ $template->set_filenames(array('update'=>'site_update.tpl')); $result_title = ''; if (isset($simulate) and $simulate) { - $result_title.= l10n('update_simulation_title').' '; + $result_title.= l10n('[Simulation]').' '; } // used_metadata string is displayed to inform admin which metadata will be @@ -843,8 +843,8 @@ $template->assign( array( 'SITE_URL'=>$site_url, 'U_SITE_MANAGER'=> get_root_url().'admin.php?page=site_manager', - 'L_RESULT_UPDATE'=>$result_title.l10n('update_part_research'), - 'L_RESULT_METADATA'=>$result_title.l10n('update_result_metadata'), + 'L_RESULT_UPDATE'=>$result_title.l10n('Search for new images in the directories'), + 'L_RESULT_METADATA'=>$result_title.l10n('Metadata synchronization results'), 'METADATA_LIST' => $used_metadata, 'U_HELP' => get_root_url().'popuphelp.php?page=synchronize', )); diff --git a/admin/tags.php b/admin/tags.php index 949ccc22c..57781b71a 100644 --- a/admin/tags.php +++ b/admin/tags.php @@ -67,7 +67,7 @@ SELECT id, name array_push( $page['errors'], sprintf( - l10n('Tag "%s" already exists'), + l10n('Tag \"%s\" already exists'), $tag_name ) ); @@ -164,7 +164,7 @@ SELECT id array_push( $page['infos'], sprintf( - l10n('Tag "%s" was added'), + l10n('Tag \"%s\" was added'), stripslashes($tag_name) ) ); @@ -174,7 +174,7 @@ SELECT id array_push( $page['errors'], sprintf( - l10n('Tag "%s" already exists'), + l10n('Tag \"%s\" already exists'), stripslashes($tag_name) ) ); diff --git a/admin/template/goto/admin.tpl b/admin/template/goto/admin.tpl index 6fd39dc0c..2376f10b5 100644 --- a/admin/template/goto/admin.tpl +++ b/admin/template/goto/admin.tpl @@ -16,28 +16,28 @@ jQuery().ready(function(){ldelim}
{'Links'|@translate} 
-
{'config'|@translate} 
+
{'Configuration'|@translate} 
@@ -46,10 +46,10 @@ jQuery().ready(function(){ldelim}
@@ -58,32 +58,32 @@ jQuery().ready(function(){ldelim}
{'Pictures'|@translate} 
-
{'identification'|@translate} 
+
{'Identification'|@translate} 
-
{'special_admin_menu'|@translate} 
+
{'Specials'|@translate} 
  • {'History'|@translate}
  • {'Maintenance'|@translate}
    • -
  • {'Advanced_features'|@translate}
    • +
  • {'Advanced features'|@translate}
  • {'Plugins'|@translate} {if !empty($plugin_menu_items)}
      diff --git a/admin/template/goto/advanced_feature.tpl b/admin/template/goto/advanced_feature.tpl index b355036ea..76209387c 100644 --- a/admin/template/goto/advanced_feature.tpl +++ b/admin/template/goto/advanced_feature.tpl @@ -1,5 +1,5 @@
      -

      {'Advanced_features'|@translate}

      +

      {'Advanced features'|@translate}

        diff --git a/admin/template/goto/cat_list.tpl b/admin/template/goto/cat_list.tpl index b5f0250e0..020e5cff1 100644 --- a/admin/template/goto/cat_list.tpl +++ b/admin/template/goto/cat_list.tpl @@ -21,13 +21,13 @@ }); -

        {'title_categories'|@translate}

        +

        {'Categories management'|@translate}

        {$CATEGORIES_NAV}

        - {'cat_add'|@translate} : + {'Add a virtual category'|@translate} : {if count($categories)>9 } @@ -51,16 +51,16 @@ {if cat_admin_access($category.ID)}

      • {'jump to category'|@translate}
        • {/if} -
      • {'edit'|@translate}
        • +
      • {'edit'|@translate}
        • {if isset($category.U_MANAGE_ELEMENTS) } -
      • {'elements'|@translate}
        • +
      • {'elements'|@translate}
        • {/if} -
      • {'sub-categories'|@translate}
        • +
      • {'sub-categories'|@translate}
        • {if isset($category.U_MANAGE_PERMISSIONS) } -
      • {'permissions'|@translate}
        • +
      • {'Permissions'|@translate}
        • {/if} {if isset($category.U_DELETE) } -
      • {'delete'|@translate}
        • +
      • {'delete'|@translate}{'delete'|@translate}
        • {/if}
      @@ -68,7 +68,7 @@ {$category.NAME} {if $category.IS_VIRTUAL} - {'virtual_category'|@translate} + {'Virtual category'|@translate} {/if}

      diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl index 29e7780a9..1878da75c 100644 --- a/admin/template/goto/cat_modify.tpl +++ b/admin/template/goto/cat_modify.tpl @@ -3,7 +3,7 @@ {include file='include/resize.inc.tpl'}
      -

      {'title_edit_cat'|@translate}

      +

      {'Edit a category'|@translate}

      {$CATEGORIES_NAV}

      @@ -13,15 +13,15 @@
    • {'jump to category'|@translate}
      • {/if} {if isset($U_MANAGE_ELEMENTS) } -
    • {'elements'|@translate}
      • -
    • {'ranks'|@translate}
      • +
    • {'elements'|@translate}
      • +
    • {'ranks'|@translate}
      • {/if} -
    • {'sub-categories'|@translate}
      • +
    • {'sub-categories'|@translate}
      • {if isset($U_MANAGE_PERMISSIONS) } -
    • {'permissions'|@translate}
      • +
    • {'Permissions'|@translate}
      • {/if} {if isset($U_DELETE) } -
    • {'delete'|@translate}
      • +
    • {'delete'|@translate}{'delete'|@translate}
      • {/if}
    @@ -33,7 +33,7 @@ {if isset($CAT_FULL_DIR) } - {'storage'|@translate} + {'Directory'|@translate} {$CAT_FULL_DIR} {/if} @@ -68,26 +68,26 @@ {'Options'|@translate} - - - {if isset($SHOW_UPLOADABLE) } - @@ -99,7 +99,7 @@
    {'Sort order'|@translate} - +
    @@ -135,7 +135,7 @@
    - + diff --git a/admin/template/goto/cat_options.tpl b/admin/template/goto/cat_options.tpl index c27254f7f..9c25c1ef0 100644 --- a/admin/template/goto/cat_options.tpl +++ b/admin/template/goto/cat_options.tpl @@ -1,5 +1,5 @@
    -

    {'cat_options_title'|@translate} {$TABSHEET_TITLE}

    +

    {'Properties'|@translate} {$TABSHEET_TITLE}

    diff --git a/admin/template/goto/check_integrity.tpl b/admin/template/goto/check_integrity.tpl index 26b4a3b25..7cf566123 100644 --- a/admin/template/goto/check_integrity.tpl +++ b/admin/template/goto/check_integrity.tpl @@ -1,5 +1,5 @@
    -
    {'c13y_title'|@translate}
    +
    {'Check integrity'|@translate}
      @@ -7,8 +7,8 @@
    {'conf_access'|@translate} + {'Access type'|@translate} {html_radios name='status' values=$status_values output=$status_values|translate selected=$CAT_STATUS}
    {'lock'|@translate} + {'Lock'|@translate} {html_radios name='visible' values='true,false'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
    {'comments'|@translate} + {'Comments'|@translate} {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
    {'editcat_uploadable'|@translate} + {'Authorize upload'|@translate} {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE} {if $representant.ALLOW_SET_RANDOM } -

    +

    {/if} {if isset($representant.ALLOW_DELETE) } @@ -213,7 +213,7 @@
    {'mail_content'|@translate}{'Mail content'|@translate}
    - - + + {if isset($c13y_list)} {foreach from=$c13y_list item=c13y name=c13y_loop} @@ -22,21 +22,21 @@ {/foreach} diff --git a/admin/template/goto/plugins_update.tpl b/admin/template/goto/plugins_update.tpl index efc5acaa3..470b53558 100644 --- a/admin/template/goto/plugins_update.tpl +++ b/admin/template/goto/plugins_update.tpl @@ -16,13 +16,13 @@ jQuery().ready(function(){ldelim} {if isset($plugins_not_uptodate)}
    -{'plugins_need_update'|@translate} +{'Plugins which need upgrade'|@translate}
    {'c13y_Anomaly'|@translate}{'c13y_Correction'|@translate}{'Anomaly'|@translate}{'Correction'|@translate}
    {$plugin.DATE} {$plugin.AUTHOR} {'plugins_auto_install'|@translate} - / {'plugins_download'|@translate} + / {'Download file'|@translate}
    - - + + @@ -32,7 +32,7 @@ jQuery().ready(function(){ldelim} + / {'Download file'|@translate} {/foreach}
    {'Name'|@translate}{'plugins_actual_version'|@translate}{'plugins_new_version'|@translate}{'Current
    version'|@translate}    		{'Available
    version'|@translate}    		 {'Actions'|@translate}
    {$plugin.VERSION} {$plugin.NEW_VERSION} {'plugins_auto_update'|@translate} - / {'plugins_download'|@translate}
    @@ -41,7 +41,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_uptodate)}
    -{'plugins_dontneed_update'|@translate} +{'Plugins up to date'|@translate} @@ -61,7 +61,7 @@ jQuery().ready(function(){ldelim} {if isset($plugins_cant_check)}
    -{'plugins_cant_check'|@translate} +{'Plugin versions can\'t be checked'|@translate}
    diff --git a/admin/template/goto/profile_content.tpl b/admin/template/goto/profile_content.tpl index b81f97d47..fd8841a4e 100644 --- a/admin/template/goto/profile_content.tpl +++ b/admin/template/goto/profile_content.tpl @@ -25,7 +25,7 @@ {/if}
  • - +
    • @@ -40,60 +40,60 @@
    - {'preferences'|@translate} + {'Preferences'|@translate}
    • - +
    • - +
    • - + {html_options id=template name=template options=$template_options selected=$template_selection}
    • - + {html_options id=language name=language options=$language_options selected=$language_selection}
    • - +
    • - {'auto_expand'|@translate} + {'Expand all categories'|@translate} {html_radios name='expand' options=$radio_options selected=$EXPAND}
    • - {'show_nb_comments'|@translate} + {'Show number of comments'|@translate} {html_radios name='show_nb_comments' options=$radio_options selected=$NB_COMMENTS}
    • - {'show_nb_hits'|@translate} + {'Show number of hits'|@translate} {html_radios name='show_nb_hits' options=$radio_options selected=$NB_HITS}
    • - +
    • - +
      • diff --git a/admin/template/goto/rating.tpl b/admin/template/goto/rating.tpl index cd050f3a7..d7d3a85c9 100644 --- a/admin/template/goto/rating.tpl +++ b/admin/template/goto/rating.tpl @@ -1,4 +1,4 @@ -

      {'Rating'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]

      +

      {'elements'|@translate} [{$NB_ELEMENTS} {'elements'|@translate}]

      @@ -58,7 +58,7 @@
    - + {/foreach} {*rates*} {/foreach} {*images*} diff --git a/admin/template/goto/site_manager.tpl b/admin/template/goto/site_manager.tpl index ebabcf7f7..1cbdfbf87 100644 --- a/admin/template/goto/site_manager.tpl +++ b/admin/template/goto/site_manager.tpl @@ -13,11 +13,11 @@ {/if} {if isset($local_listing)} -{'remote_site_local_found'|@translate} {$local_listing.URL} +{'A local listing.xml file has been found for '|@translate} {$local_listing.URL} {if isset($local_listing.CREATE)}

    - {'remote_site_local_create'|@translate}: + {'Create this site'|@translate}: @@ -25,7 +25,7 @@ {/if} {if isset($local_listing.U_SYNCHRONIZE)} - {'site_synchronize'|@translate} + {'synchronize'|@translate}

    {/if} {/if} @@ -33,23 +33,23 @@ {if not empty($sites)}

    {$rate.RATE} {$rate.USER} {$rate.DATE}[{'delete'|@translate}][{'Delete'|@translate}]
    - + {foreach from=$sites item=site name=site}
    {'site_local'|@translate} / {'site_remote'|@translate}{'Remote'|@translate} / {'Remote'|@translate} {'Actions'|@translate}
    {$site.NAME}
    ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})     		- [{'site_synchronize'|@translate}] + [{'synchronize'|@translate}] {if isset($site.U_DELETE)} [{'site_delete'|@translate}] + title="{'delete'|@translate}" {$TAG_INPUT_ENABLED}>{'delete'|@translate}] {/if} {if isset($site.remote)}
    - [{'remote_site_test'|@translate}] - [{'remote_site_generate'|@translate}] - [{'remote_site_clean'|@translate}] + [{'test'|@translate}] + [{'generate listing'|@translate}] + [{'clean'|@translate}] {/if} {if not empty($site.plugin_links)}
    @@ -64,7 +64,7 @@

    - +

    diff --git a/admin/template/goto/site_update.tpl b/admin/template/goto/site_update.tpl index d67dd3f43..90a2562cf 100644 --- a/admin/template/goto/site_update.tpl +++ b/admin/template/goto/site_update.tpl @@ -2,33 +2,33 @@ {include file='include/resize.inc.tpl'}

    -

    {'title_update'|@translate}: {$SITE_URL}

    +

    {'Database synchronization with files'|@translate}: {$SITE_URL}

    {if isset($update_result)}

    {$L_RESULT_UPDATE}

      -
    • {$update_result.NB_NEW_CATEGORIES} {'update_nb_new_categories'|@translate}
      • -
    • {$update_result.NB_NEW_ELEMENTS} {'update_nb_new_elements'|@translate}
      • -
    • {$update_result.NB_DEL_CATEGORIES} {'update_nb_del_categories'|@translate}
      • -
    • {$update_result.NB_DEL_ELEMENTS} {'update_nb_del_elements'|@translate}
      • -
    • {$update_result.NB_UPD_ELEMENTS} {'update_nb_upd_elements'|@translate}
      • -
    • {$update_result.NB_ERRORS} {'update_nb_errors'|@translate}
      • +
    • {$update_result.NB_NEW_CATEGORIES} {'categories added in the database'|@translate}
      • +
    • {$update_result.NB_NEW_ELEMENTS} {'elements added in the database'|@translate}
      • +
    • {$update_result.NB_DEL_CATEGORIES} {'categories deleted in the database'|@translate}
      • +
    • {$update_result.NB_DEL_ELEMENTS} {'elements deleted in the database'|@translate}
      • +
    • {$update_result.NB_UPD_ELEMENTS} {'elements updated in the database'|@translate}
      • +
    • {$update_result.NB_ERRORS} {'errors during synchronization'|@translate}
    {/if} {if isset($metadata_result)}

    {$L_RESULT_METADATA}

      -
    • {$metadata_result.NB_ELEMENTS_DONE} {'update_nb_elements_metadata_sync'|@translate}
      • -
    • {$metadata_result.NB_ELEMENTS_CANDIDATES} {'update_nb_elements_metadata_available'|@translate}
      • -
    • {'update_used_metadata'|@translate} : {$METADATA_LIST}
      • +
    • {$metadata_result.NB_ELEMENTS_DONE} {'elements informations synchronized with files metadata'|@translate}
      • +
    • {$metadata_result.NB_ELEMENTS_CANDIDATES} {'images candidates for metadata synchronization'|@translate}
      • +
    • {'Used metadata'|@translate} : {$METADATA_LIST}
    {/if} {if not empty($sync_errors)} -

    {'update_error_list_title'|@translate}

    +

    {'Error list'|@translate}

      {foreach from=$sync_errors item=error} @@ -36,7 +36,7 @@ {/foreach}
    -

    {'update_errors_caption'|@translate}

    +

    {'Errors caption'|@translate}

      {foreach from=$sync_error_captions item=caption}
    • {$caption.TYPE}: {$caption.LABEL}
      • @@ -45,7 +45,7 @@ {/if} {if not empty($sync_infos)} -

      {'update_infos_title'|@translate}

      +

      {'Detailed informations'|@translate}

        {foreach from=$sync_infos item=info} @@ -56,18 +56,18 @@ {/if} {if isset($introduction)} -

        {'update_default_title'|@translate}

        +

        {'Choose an option'|@translate}

        - {'update_sync_files'|@translate} + {'synchronize files structure with database'|@translate}
          • -
          • +
          • -
        • +
          • -
            • +
          @@ -76,11 +76,11 @@
        - {'update_sync_metadata'|@translate} + {'synchronize files metadata with database elements informations'|@translate}
        • - +
        • @@ -90,11 +90,11 @@
          -
          +
          - {'update_cats_subset'|@translate} + {'reduce to single existing categories'|@translate}
            • -
            • +
          diff --git a/admin/template/goto/tags.tpl b/admin/template/goto/tags.tpl index 3db8417a6..27ee02693 100644 --- a/admin/template/goto/tags.tpl +++ b/admin/template/goto/tags.tpl @@ -46,7 +46,7 @@

          - +

        diff --git a/admin/template/goto/thumbnail.tpl b/admin/template/goto/thumbnail.tpl index c2f490a16..653f07cc3 100644 --- a/admin/template/goto/thumbnail.tpl +++ b/admin/template/goto/thumbnail.tpl @@ -1,15 +1,15 @@
        -

        {'title_thumbnails'|@translate}

        +

        {'Thumbnail creation'|@translate}

        {if isset($results) } -
        {'tn_results_title'|@translate}
        +
        {'Results of miniaturization'|@translate}
        - - - + + + {foreach from=$results.elements item=elt} @@ -25,26 +25,26 @@
        {'Path'|@translate}{'thumbnail'|@translate}{'tn_results_gen_time'|@translate}{'filesize'|@translate}{'Thumbnail'|@translate}{'generated in'|@translate}{'Filesize'|@translate} {'Dimensions'|@translate}
        - + - + - + - + - + - +
        {'tn_stats'|@translate}{'General statistics'|@translate}
        {'tn_stats_nb'|@translate}{'number of miniaturized pictures'|@translate} {$results.TN_NB}
        {'tn_stats_total'|@translate}{'total time'|@translate} {$results.TN_TOTAL}
        {'tn_stats_max'|@translate}{'max time'|@translate} {$results.TN_MAX}
        {'tn_stats_min'|@translate}{'min time'|@translate} {$results.TN_MIN}
        {'tn_stats_mean'|@translate}{'average time'|@translate} {$results.TN_AVERAGE}
        @@ -55,11 +55,11 @@
        - {'tn_params_title'|@translate} + {'Miniaturization parameters'|@translate}
        • - {'tn_params_GD'|@translate} + {'GD version'|@translate} @@ -87,7 +87,7 @@ - +
        @@ -97,12 +97,12 @@ {/if} {*isset params*} {if !empty($remainings) } -
        {$TOTAL_NB_REMAINING} {'tn_alone_title'|@translate}
        +
        {$TOTAL_NB_REMAINING} {'pictures without thumbnail (jpeg and png only)'|@translate}
        - + {foreach from=$remainings item=elt name=remain_loop} @@ -115,5 +115,5 @@ {/foreach}
          {'Path'|@translate}{'filesize'|@translate}{'Filesize'|@translate} {'Dimensions'|@translate}
        {else} -
        [ {'tn_no_missing'|@translate} ]
        +
        [ {'No missing thumbnail'|@translate} ]
        {/if} diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl index 612698593..a5424c9e6 100644 --- a/admin/template/goto/upgrade.tpl +++ b/admin/template/goto/upgrade.tpl @@ -48,7 +48,7 @@ textarea { margin-left: 20px; } - +
        {'language'|@translate}{'Language'|@translate}

        +

        {/if} diff --git a/admin/template/goto/upload.tpl b/admin/template/goto/upload.tpl index 849faee0a..cc56d9a02 100644 --- a/admin/template/goto/upload.tpl +++ b/admin/template/goto/upload.tpl @@ -1,16 +1,16 @@
        -

        {'waiting'|@translate} {$TABSHEET_TITLE}

        +

        {'Waiting'|@translate} {$TABSHEET_TITLE}

        -

        {'title_upload'|@translate}

        +

        {'Pictures waiting for validation'|@translate}

        - + - - + + diff --git a/admin/template/goto/user_list.tpl b/admin/template/goto/user_list.tpl index 4418e3970..2a7d4c690 100644 --- a/admin/template/goto/user_list.tpl +++ b/admin/template/goto/user_list.tpl @@ -1,5 +1,5 @@
        -

        {'title_liste_users'|@translate}

        +

        {'User list'|@translate}

        @@ -62,10 +62,10 @@ - + - + {if not empty($plugin_user_list_column_titles)} {foreach from=$plugin_user_list_column_titles item=title} @@ -87,7 +87,7 @@ {/foreach} - +
        {'category'|@translate}{'Category'|@translate} {'Date'|@translate}{'file'|@translate}{'thumbnail'|@translate}{'File'|@translate}{'Thumbnail'|@translate} {'Author'|@translate}  
          {'Username'|@translate}{'user_status'|@translate}{'User status'|@translate} {'Email address'|@translate} {'Groups'|@translate}{'properties'|@translate}{'Properties'|@translate}{$title}{$data} - {'permissions'|@translate} + {'Permissions'|@translate} {'Profile'|@translate} {foreach from=$user.plugin_actions item=data} {$data} @@ -123,7 +123,7 @@ {if isset($adviser)}
        {'adviser'|@translate}{'Adviser'|@translate} / {'set to'|@translate} @@ -162,12 +162,12 @@ {* Properties *}
        - {'properties'|@translate} + {'Properties'|@translate} - +
        {'enabled_high'|@translate}{'High definition enabled'|@translate} / {'set to'|@translate} @@ -196,7 +196,7 @@ - + - + - + - + - + - + - + - + - + - +
        {'nb_image_per_row'|@translate}{'Number of images per row'|@translate} @@ -206,7 +206,7 @@
        {'nb_row_per_page'|@translate}{'Number of rows per page'|@translate} @@ -216,7 +216,7 @@
        {'theme'|@translate}{'Interface theme'|@translate} @@ -227,7 +227,7 @@
        {'language'|@translate}{'Language'|@translate} @@ -238,7 +238,7 @@
        {'recent_period'|@translate}{'Recent period'|@translate} @@ -248,7 +248,7 @@
        {'auto_expand'|@translate}{'Expand all categories'|@translate} / {'set to'|@translate} @@ -258,7 +258,7 @@
        {'show_nb_comments'|@translate}{'Show number of comments'|@translate} / {'set to'|@translate} @@ -268,7 +268,7 @@
        {'show_nb_hits'|@translate}{'Show number of hits'|@translate} / {'set to'|@translate} @@ -278,7 +278,7 @@
        {'maxwidth'|@translate}{'Maximum width of the pictures'|@translate} @@ -290,7 +290,7 @@
        {'maxheight'|@translate}{'Maximum height of the pictures'|@translate} diff --git a/admin/thumbnail.php b/admin/thumbnail.php index 7fc81dc3d..a1c7bbcd5 100644 --- a/admin/thumbnail.php +++ b/admin/thumbnail.php @@ -115,7 +115,7 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext) // creation and backup of final picture if (!is_writable($tndir)) { - array_push($page['errors'], '['.$tndir.'] : '.l10n('no_write_access')); + array_push($page['errors'], '['.$tndir.'] : '.l10n('no write access')); return false; } imagejpeg($destImage, $dest_file, $conf['tn_compression_level']); @@ -136,14 +136,14 @@ function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext) // error else { - echo l10n('tn_no_support')." "; + echo l10n('Picture unreachable or no support')." "; if ( isset( $extenstion ) ) { - echo l10n('tn_format').' '.$extension; + echo l10n('for the file format').' '.$extension; } else { - echo l10n('tn_thisformat'); + echo l10n('for this file format'); } exit(); } @@ -233,11 +233,11 @@ if (isset($_POST['submit'])) // checking criteria if (!preg_match('/^[0-9]{2,3}$/', $_POST['width']) or $_POST['width'] < 10) { - array_push($page['errors'], l10n('tn_err_width').' 10'); + array_push($page['errors'], l10n('width must be a number superior to').' 10'); } if (!preg_match('/^[0-9]{2,3}$/', $_POST['height']) or $_POST['height'] < 10) { - array_push($page['errors'], l10n('tn_err_height').' 10'); + array_push($page['errors'], l10n('height must be a number superior to').' 10'); } // picture miniaturization diff --git a/admin/user_list.php b/admin/user_list.php index 6054d0160..1583de0a1 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -168,10 +168,10 @@ include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); check_status(ACCESS_ADMINISTRATOR); $page['order_by_items'] = array( - 'id' => l10n('registration_date'), + 'id' => l10n('registration date'), 'username' => l10n('Username'), 'level' => l10n('Privacy level'), - 'language' => l10n('language'), + 'Language' => l10n('Language'), ); $page['direction_items'] = array( @@ -191,19 +191,19 @@ if ($conf['double_password_type_in_admin'] == true) { if(empty($_POST['password'])) { - array_push($page['errors'], l10n('Password is missing')); + array_push($page['errors'], l10n('Password is missing. Please enter the password.')); } else if(empty($_POST['password_conf'])) { - array_push($page['errors'], l10n('Password confirmation is missing')); + array_push($page['errors'], l10n('Password confirmation is missing. Please confirm the chosen password.')); } else if(empty($_POST['email'])) { - array_push($page['errors'], l10n('Email address is missing')); + array_push($page['errors'], l10n('Email address is missing. Please specify an email address.')); } else if ($_POST['password'] != $_POST['password_conf']) { - array_push($page['errors'], l10n('Password confirmation error')); + array_push($page['errors'], l10n('Password confirmation error.')); } else { @@ -215,7 +215,7 @@ if ($conf['double_password_type_in_admin'] == true) array_push( $page['infos'], sprintf( - l10n('user "%s" added'), + l10n('user \"%s\" added'), $_POST['login'] ) ); @@ -235,7 +235,7 @@ else if ($conf['double_password_type_in_admin'] == false) array_push( $page['infos'], sprintf( - l10n('user "%s" added'), + l10n('user \"%s\" added'), $_POST['login'] ) ); @@ -693,7 +693,7 @@ foreach ($visible_user_list as $local_user) } $properties[] = (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) - ? l10n('is_high_enabled') : l10n('is_high_disabled'); + ? l10n('') : l10n(''); $template->append( 'users', @@ -704,12 +704,12 @@ foreach ($visible_user_list as $local_user) 'U_PERM' => $perm_url.$local_user['id'], 'USERNAME' => stripslashes($local_user['username']) .($local_user['id'] == $conf['guest_id'] - ? '
        ['.l10n('is_the_guest').']' : '') + ? '
        ['.l10n('guest').']' : '') .($local_user['id'] == $conf['default_user_id'] - ? '
        ['.l10n('is_the_default').']' : ''), + ? '
        ['.l10n('default values').']' : ''), 'STATUS' => l10n('user_status_'. $local_user['status']).(($local_user['adviser'] == 'true') - ? '
        ['.l10n('adviser').']' : ''), + ? '
        ['.l10n('Adviser').']' : ''), 'EMAIL' => get_email_address_as_display_text($local_user['email']), 'GROUPS' => $groups_string, 'PROPERTIES' => implode( ', ', $properties), diff --git a/admin/user_perm.php b/admin/user_perm.php index 2156982c0..5f91eb972 100644 --- a/admin/user_perm.php +++ b/admin/user_perm.php @@ -126,12 +126,12 @@ $template->assign( array( 'TITLE' => sprintf( - l10n('Manage permissions for user "%s"'), + l10n('Manage permissions for user \"%s\"'), get_username($page['user'] ) ), - 'L_CAT_OPTIONS_TRUE'=>l10n('authorized'), - 'L_CAT_OPTIONS_FALSE'=>l10n('forbidden'), + 'L_CAT_OPTIONS_TRUE'=>l10n('Authorized'), + 'L_CAT_OPTIONS_FALSE'=>l10n('Forbidden'), 'F_ACTION' => PHPWG_ROOT_PATH. -- cgit v1.2.3