From f20efb0cfa8f792808cc85266563fef708b7b9a5 Mon Sep 17 00:00:00 2001 From: gweltas Date: Thu, 18 Nov 2004 14:57:00 +0000 Subject: Unification of "Return to main page" entry in the language files. git-svn-id: http://piwigo.org/svn/trunk@607 68402e56-0260-453c-a942-63ccdbb3a9ee --- about.php | 3 ++- admin.php | 2 +- admin/cat_list.php | 4 ++-- admin/cat_modify.php | 2 +- comments.php | 3 ++- language/en_UK.iso-8859-1/common.lang.php | 39 ++++++++++++++++--------------- language/fr_FR.iso-8859-1/common.lang.php | 29 ++++++++++++----------- picture.php | 6 ++--- search.php | 2 +- template/default/about.tpl | 2 +- template/default/comments.tpl | 2 +- template/default/search.tpl | 2 +- upload.php | 3 ++- 13 files changed, 52 insertions(+), 47 deletions(-) diff --git a/about.php b/about.php index 0053c418b..9265462e1 100644 --- a/about.php +++ b/about.php @@ -39,7 +39,8 @@ $template->set_filenames(array('about'=>'about.tpl')); $template->assign_vars(array( 'PAGE_TITLE' => $title, 'L_ABOUT' => $lang['about_message'], - 'L_RETURN' => $lang['return_main_page'], + 'L_RETURN' => $lang['home'], + 'L_RETURN_HINT' => $lang['home_hint'], 'U_RETURN' => add_session_id(PHPWG_ROOT_PATH.'category.php?'.$_SERVER['QUERY_STRING']) ) ); diff --git a/admin.php b/admin.php index 9dd06ba8e..a18da82ee 100644 --- a/admin.php +++ b/admin.php @@ -173,7 +173,7 @@ $template->set_filenames( array('admin'=>'admin.tpl') ); $template->assign_vars(array( 'L_TITLE'=>$lang['admin_panel'], 'L_LINKS'=>$lang['links'], - 'L_GALLERY_INDEX'=>$lang['gallery_index'], + 'L_GALLERY_INDEX'=>$lang['home'], 'L_GENERAL'=>$lang['general'], 'L_DEFAULT'=>$lang['gallery_default'], 'L_PHPINFO'=>$lang['phpinfos'], diff --git a/admin/cat_list.php b/admin/cat_list.php index c57840481..0c85eebc9 100644 --- a/admin/cat_list.php +++ b/admin/cat_list.php @@ -36,7 +36,7 @@ include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php'); $errors = array(); $infos = array(); $categories = array(); -$navigation = $lang['gallery_index']; +$navigation = $lang['home']; // +-----------------------------------------------------------------------+ // | virtual categories management | // +-----------------------------------------------------------------------+ @@ -136,7 +136,7 @@ if (isset($_GET['parent_id'])) $base_url = PHPWG_ROOT_PATH.'admin.php?page=cat_list'; $navigation = ''; - $navigation.= $lang['gallery_index']; + $navigation.= $lang['home']; $navigation.= ''; $navigation.= $separator; diff --git a/admin/cat_modify.php b/admin/cat_modify.php index a7259eeb3..e4d2ffaff 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -125,7 +125,7 @@ foreach (array('comment','dir') as $nullable) $current_category = get_cat_info($_GET['cat_id']); $url = PHPWG_ROOT_PATH.'admin.php?page=cat_list&parent_id='; $navigation = ''; -$navigation.= $lang['gallery_index'].'->'; +$navigation.= $lang['home'].'->'; $navigation.= get_cat_display_name($current_category['name'], '->', $url); $form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='.$_GET['cat_id']; diff --git a/comments.php b/comments.php index 230de3406..4f9530eeb 100644 --- a/comments.php +++ b/comments.php @@ -79,7 +79,8 @@ $template->assign_vars( array( 'L_COMMENT_TITLE' => $title, 'L_COMMENT_STATS' => $lang['stats_last_days'], - 'L_COMMENT_RETURN' => $lang['return_main_page'], + 'L_COMMENT_RETURN' => $lang['home'], + 'L_COMMENT_RETURN_HINT' => $lang['home_hint'], 'L_DELETE' =>$lang['delete'], 'L_VALIDATE'=>$lang['submit'], diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index 3e04b345e..693906548 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -33,7 +33,6 @@ $lang_info['direction'] = 'ltr'; $lang_info['code'] = 'en'; // Main words -$lang['gallery_index'] = 'Home'; $lang['category'] = 'Category'; $lang['categories'] = 'Categories'; $lang['thumbnail'] = 'Thumbnail'; @@ -67,7 +66,23 @@ $lang['delete'] = 'Delete'; $lang['reset'] = 'Reset'; // Navigation -$lang['return_main_page'] = 'Back to the index page'; +$lang['home'] = 'Home'; +$lang['home_hint'] = 'Back to the home page'; +$lang['special_categories'] = 'Specials'; +$lang['favorite_cat'] = 'my favorites'; +$lang['favorite_cat_hint'] = 'display my favorites pictures'; +$lang['most_visited_cat'] = 'most visited'; +$lang['most_visited_cat_hint'] = 'displays most visited pictures'; +$lang['best_rated_cat'] = 'best rated'; +$lang['best_rated_cat_hint'] = 'displays best rated items'; +$lang['recent_pics_cat'] = 'Last pictures'; +$lang['recent_pics_cat_hint'] = 'Displays most recent pictures'; +$lang['recent_cats_cat'] = 'Last categories'; +$lang['recent_cats_cat_hint'] = 'Displays recently updated categories'; +$lang['about'] = 'about'; +$lang['hint_about'] = 'more informations on PhpWebGallery...'; +$lang['admin'] = 'Administration'; +$lang['hint_admin'] = 'available for administrators only'; // Identification $lang['login'] = 'Login'; @@ -165,12 +180,7 @@ $lang['change_login'] = 'change login'; $lang['hint_login'] = 'identification enables site\'s appareance customization'; $lang['hint_customize'] = 'customize the appareance of the gallery'; $lang['hint_search'] = 'search'; -$lang['favorite_cat'] = 'my favorites'; -$lang['favorite_cat_hint'] = 'display my favorites pictures'; -$lang['about'] = 'about'; -$lang['hint_about'] = 'more informations on PhpWebGallery...'; -$lang['admin'] = 'Administration'; -$lang['hint_admin'] = 'available for administrators only'; + $lang['no_category'] = 'Home'; $lang['page_number'] = 'page number'; $lang['previous_page'] = 'Previous'; @@ -249,15 +259,8 @@ $lang['IP'] = 'IP'; $lang['errors_title'] = 'Errors'; $lang['infos_title'] = 'Informations'; $lang['category_representative'] = 'representative'; -$lang['special_categories'] = 'specials'; -$lang['most_visited_cat_hint'] = 'displays most visited pictures'; -$lang['most_visited_cat'] = 'most visited'; -$lang['best_rated_cat'] = 'best rated'; -$lang['best_rated_cat_hint'] = 'displays best rated items'; -$lang['recent_pics_cat_hint'] = 'Displays most recent pictures'; -$lang['recent_pics_cat'] = 'Last pictures'; -$lang['recent_cats_cat_hint'] = 'Displays recently updated categories'; -$lang['recent_cats_cat'] = 'Last categories'; + + $lang['visited'] = 'visited'; $lang['times'] = 'times'; $lang['slideshow'] = 'slideshow'; @@ -300,6 +303,4 @@ $lang['standard_deviation'] = 'STD'; $lang['random_cat'] = 'random pictures'; $lang['random_cat_hint'] = 'Displays a set of random pictures'; $lang['picture_high'] = 'Click on the picture to see it in high definition'; -$lang['up_hint'] = 'Up to the thumbnails'; -$lang['up_alt'] = 'up'; ?> \ No newline at end of file diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index 5caa96a7c..c24aba279 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -33,7 +33,6 @@ $lang_info['direction'] = 'ltr'; $lang_info['code'] = 'fr'; // Main words -$lang['gallery_index'] = 'Accueil'; $lang['category'] = 'Catégorie'; $lang['categories'] = 'Catégories'; $lang['thumbnail'] = 'Miniature'; @@ -74,16 +73,25 @@ $lang['identification'] = 'Identification'; $lang['remember_me'] = 'Connexion auto'; // Navigation -$lang['special_categories'] = 'Special'; +$lang['home'] = 'Accueil'; +$lang['home_hint'] = 'Retour à la page des miniatures'; +$lang['special_categories'] = 'Spécial'; $lang['favorite_cat'] = 'Favoris'; $lang['favorite_cat_hint'] = 'Afficher vos favoris'; -$lang['recent_pics_cat_hint'] = 'Affiche les images les plus récentes'; +$lang['most_visited_cat'] = 'plus vues'; +$lang['most_visited_cat_hint'] = 'affiche les images les plus visitées'; +$lang['best_rated_cat'] = 'mieux notées'; +$lang['best_rated_cat_hint'] = 'affiche les images les mieux notées'; $lang['recent_pics_cat'] = 'Nouvelles images'; -$lang['recent_cats_cat_hint'] = 'Affiche les catégories les plus récentes'; +$lang['recent_pics_cat_hint'] = 'Affiche les images les plus récentes'; $lang['recent_cats_cat'] = 'Nouvelles catégories'; +$lang['recent_cats_cat_hint'] = 'Affiche les catégories les plus récentes'; $lang['random_cat'] = 'Images au hasard'; $lang['random_cat_hint'] = 'Affiche plusieurs images choisies au hasard'; -$lang['return_main_page'] = 'Retour à la page des miniatures'; +$lang['about'] = 'A propos'; +$lang['hint_about'] = 'Quelques informations sur PhpWebGallery...'; +$lang['admin'] = 'Administration'; +$lang['hint_admin'] = 'Partie accessible uniquement aux administrateurs'; //Calendar $lang['calendar'] = 'Calendrier'; @@ -155,7 +163,6 @@ $lang['search_mode_and'] = 'tous les mots'; $lang['search_comments'] = 'séparer les différents mots avec un espace'; $lang['search_title'] = 'Recherche'; $lang['search_field_search'] = 'Rechercher'; -$lang['search_return_main_page'] = 'Retour à la page des miniatures'; $lang['Search_author_explain'] = 'Utilisez * comme un joker pour des recherches partielles'; $lang['Look_up_user'] = 'Rechercher l\'utilisateur'; $lang['Find_username'] = 'Trouver un nom d\'utilisateur'; @@ -176,10 +183,7 @@ $lang['hint_login'] = 's'identifier permet de personnaliser l'apparenc $lang['hint_customize'] = 'personnaliser votre affichage'; $lang['hint_search'] = 'lancer une recherche'; -$lang['about'] = 'à propos'; -$lang['hint_about'] = 'des infos sur PhpWebGallery...'; -$lang['admin'] = 'Administration'; -$lang['hint_admin'] = 'accessible uniquement aux administrateurs'; + $lang['no_category'] = 'Accueil'; $lang['page_number'] = 'numéro de page'; $lang['previous_page'] = 'Précédente'; @@ -260,10 +264,7 @@ $lang['stats_last_days'] = 'derniers jours'; $lang['menu_login'] = 'Connexion'; $lang['connected_user'] = 'utilisateur connecté'; $lang['hint_comments'] = 'Voir les derniers commentaires des visiteurs'; -$lang['most_visited_cat_hint'] = 'affiche les images les plus visitées'; -$lang['most_visited_cat'] = 'plus vues'; -$lang['best_rated_cat_hint'] = 'affiche les images les mieux notées'; -$lang['best_rated_cat'] = 'mieux notées'; + $lang['visited'] = 'visité'; $lang['times'] = 'fois'; diff --git a/picture.php b/picture.php index 7e1af41d2..6176fbb38 100644 --- a/picture.php +++ b/picture.php @@ -443,7 +443,7 @@ $template->assign_vars(array( 'WIDTH_IMG' => $picture_size[0], 'HEIGHT_IMG' => $picture_size[1], - 'L_HOME' => $lang['gallery_index'], + 'L_HOME' => $lang['home'], 'L_SLIDESHOW' => $lang['slideshow'], 'L_STOP_SLIDESHOW' => $lang['slideshow_stop'], 'L_PREV_IMG' =>$lang['previous_image'].' : ', @@ -459,8 +459,8 @@ $template->assign_vars(array( 'L_DOWNLOAD_HINT' => $lang['download_hint'], 'L_PICTURE_METADATA' => $lang['picture_show_metadata'], 'L_PICTURE_HIGH' => $lang['picture_high'], - 'L_UP_HINT' => $lang['up_hint'], - 'L_UP_ALT' => $lang['up_alt'], + 'L_UP_HINT' => $lang['home_hint'], + 'L_UP_ALT' => $lang['home'], 'U_HOME' => add_session_id(PHPWG_ROOT_PATH.'category.php'), 'U_UP' => add_session_id($url_up), diff --git a/search.php b/search.php index 673112424..5fb9c9b25 100644 --- a/search.php +++ b/search.php @@ -236,7 +236,7 @@ $template->set_filenames( array('search'=>'search.tpl') ); $template->assign_vars(array( 'L_TITLE' => $lang['search_title'], 'L_SEARCH_COMMENTS' => $lang['search_comments'], - 'L_RETURN' => $lang['gallery_index'], + 'L_RETURN' => $lang['home'], 'L_SUBMIT' => $lang['submit'], 'L_SEARCH_OR'=>$lang['search_mode_or'], 'L_SEARCH_AND'=>$lang['search_mode_and'], diff --git a/template/default/about.tpl b/template/default/about.tpl index 34616f83c..d5fadc1bf 100644 --- a/template/default/about.tpl +++ b/template/default/about.tpl @@ -3,7 +3,7 @@ {L_ABOUT}
-{L_RETURN} +[{L_RETURN}]
php logo diff --git a/template/default/comments.tpl b/template/default/comments.tpl index d74963d9f..18877fbbd 100644 --- a/template/default/comments.tpl +++ b/template/default/comments.tpl @@ -9,7 +9,7 @@ {L_COMMENT_STATS} ] - [ {L_COMMENT_RETURN} ] + [ {L_COMMENT_RETURN} ]
diff --git a/template/default/search.tpl b/template/default/search.tpl index d68f4fb49..dfb465528 100644 --- a/template/default/search.tpl +++ b/template/default/search.tpl @@ -115,4 +115,4 @@ {L_SEARCH_OR_CLAUSES} {L_SEARCH_AND_CLAUSES}



-[ {L_RETURN} ] +[ {L_RETURN} ] diff --git a/upload.php b/upload.php index b95946731..4f1ac6c69 100644 --- a/upload.php +++ b/upload.php @@ -301,7 +301,8 @@ $template->assign_vars(array( 'L_AUTHOR' => $lang['upload_author'], 'L_CREATION_DATE' => $lang['upload_creation_date'], 'L_COMMENT' => $lang['upload_comment'], - 'L_RETURN' => $lang['search_return_main_page'], + 'L_RETURN' => $lang['home'], + 'L_RETURN_HINT' => $lang['home_hint'], 'L_UPLOAD_DONE' => $lang['upload_successful'], 'L_MANDATORY' => $lang['mandatory'], -- cgit v1.2.3