From d8ececfdbea5e5f65f9ef2988079bea5884113ae Mon Sep 17 00:00:00 2001 From: plegall Date: Mon, 31 Oct 2005 14:58:19 +0000 Subject: - bug 185 fixed: errors in language items. git-svn-id: http://piwigo.org/svn/trunk@921 68402e56-0260-453c-a942-63ccdbb3a9ee --- doc/ChangeLog | 4 ++++ language/en_UK.iso-8859-1/admin.lang.php | 17 +++++++++-------- language/en_UK.iso-8859-1/common.lang.php | 8 ++++---- language/fr_FR.iso-8859-1/admin.lang.php | 19 ++++++++++--------- language/fr_FR.iso-8859-1/common.lang.php | 8 ++++---- template/yoga/admin/element_set_global.tpl | 2 +- template/yoga/admin/element_set_unit.tpl | 14 +++++++------- 7 files changed, 39 insertions(+), 33 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index b4686224a..c66013493 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,7 @@ +2005-10-31 Pierrick LE GALL + + * bug 185 fixed: errors in language items. + 2005-10-31 Pierrick LE GALL * modification: use "filter" class for quickconnect box (with some diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index d17f86b49..ea42b3f2a 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -42,6 +42,7 @@ $lang['A new version of PhpWebGallery is available.'] = 'A new version of PhpWeb $lang['Actions'] = 'Actions'; $lang['Add a user'] = 'Add a user'; $lang['Add group'] = 'Add group'; +$lang['Add selected elements to caddie'] = 'Add selected elements to caddie'; $lang['Add'] = 'Add'; $lang['Associated'] = 'Associated'; $lang['Association to categories'] = 'Association to categories'; @@ -261,19 +262,19 @@ $lang['remove keyword'] = 'remove keyword'; $lang['selection'] = 'selection'; $lang['set to'] = 'set to'; $lang['singly represented'] = 'singly represented'; -$lang['stats_global_graph_title'] = 'Pages seen by month'; +$lang['stats_addr'] = 'IP Address'; +$lang['stats_category'] = 'Category'; $lang['stats_daily_graph_title'] = 'Pages seen by hour'; -$lang['stats_monthly_graph_title'] = 'Pages seen by day'; -$lang['stats_month_title'] = 'Monthly statistics'; $lang['stats_day_title'] = 'Daily statistics'; -$lang['stats_pages_seen'] = 'Pages seen'; -$lang['stats_title'] = 'Last year statistics'; +$lang['stats_file'] = 'File'; +$lang['stats_global_graph_title'] = 'Pages seen by month'; $lang['stats_hour'] = 'Hour'; $lang['stats_login'] = 'Login'; -$lang['stats_addr'] = 'IP Address'; -$lang['stats_category'] = 'Category'; -$lang['stats_file'] = 'File'; +$lang['stats_month_title'] = 'Monthly statistics'; +$lang['stats_monthly_graph_title'] = 'Pages seen by day'; +$lang['stats_pages_seen'] = 'Pages seen'; $lang['stats_picture'] = 'Picture'; +$lang['stats_title'] = 'Last year statistics'; $lang['status'] = 'status'; $lang['storage'] = 'Directory'; $lang['sub-categories'] = 'sub-categories'; diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index 5e8725407..9dcd70fb6 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -113,7 +113,7 @@ $lang['auto_expand'] = 'Expand all categories'; $lang['best_rated_cat'] = 'best rated'; $lang['best_rated_cat_hint'] = 'displays best rated items'; $lang['caddie'] = 'caddie'; -$lang['calendar'] = 'calendar'; +$lang['calendar'] = 'Calendar'; $lang['calendar_hint'] = 'displays each day with pictures, month per month'; $lang['calendar_picture_hint'] = 'displays pictures added on '; $lang['categories'] = 'Categories'; @@ -146,7 +146,7 @@ $lang['download_hint'] = 'download this file'; $lang['edit category informations'] = 'edit category informations'; $lang['edit'] = 'edit'; $lang['err_date'] = 'wrong date'; -$lang['favorite_cat'] = 'my favorites'; +$lang['favorite_cat'] = 'My favorites'; $lang['favorite_cat_hint'] = 'display my favorites pictures'; $lang['favorites'] = 'Favorites'; $lang['first_page'] = 'First'; @@ -192,7 +192,7 @@ $lang['month'][6] = 'June'; $lang['month'][7] = 'July'; $lang['month'][8] = 'August'; $lang['month'][9] = 'September'; -$lang['most_visited_cat'] = 'most visited'; +$lang['most_visited_cat'] = 'Most visited'; $lang['most_visited_cat_hint'] = 'displays most visited pictures'; $lang['nb_image_per_row'] = 'Number of images per row'; $lang['nb_row_per_page'] = 'Number of rows per page'; @@ -214,7 +214,7 @@ $lang['picture_show_metadata'] = 'Show file metadata'; $lang['powered_by'] = 'Powered by'; $lang['preferences'] = 'Preferences'; $lang['previous_page'] = 'Previous'; -$lang['random_cat'] = 'random pictures'; +$lang['random_cat'] = 'Random pictures'; $lang['random_cat_hint'] = 'Displays a set of random pictures'; $lang['recent_cats_cat'] = 'Last categories'; $lang['recent_cats_cat_hint'] = 'Displays recently updated categories'; diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 48f0c5344..d4cedabca 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -42,6 +42,7 @@ $lang['A new version of PhpWebGallery is available.'] = 'Une nouvelle version de $lang['Actions'] = 'Actions'; $lang['Add a user'] = 'Ajouter un utilisateur'; $lang['Add group'] = 'Ajouter un groupe'; +$lang['Add selected elements to caddie'] = 'Ajouter les éléments sélectionnés au panier'; $lang['Add'] = 'Ajouter'; $lang['Associated'] = 'Associée à'; $lang['Association to categories'] = 'Association aux catégories'; @@ -234,7 +235,7 @@ $lang['randomly represented'] = 'repr $lang['registration_date'] = 'date d\'enregistrement'; $lang['remote_site'] = 'Site distant'; $lang['remote_site_already_exists'] = 'Ce site existe déjà'; -$lang['remote_site_clean'] = 'nettouer'; +$lang['remote_site_clean'] = 'nettoyer'; $lang['remote_site_clean_hint'] = 'supprimer le fichier listing.xml distant'; $lang['remote_site_create'] = 'Créer un nouveau site distant : (donner son URL vers generate_file_listing.php)'; $lang['remote_site_created'] = 'créé'; @@ -259,19 +260,19 @@ $lang['remove keyword'] = 'supprimer mot-clef'; $lang['selection'] = 'sélection'; $lang['set to'] = 'changer en'; $lang['singly represented'] = 'représentant fixe'; -$lang['stats_global_graph_title'] = 'Pages vues par mois'; -$lang['stats_monthly_graph_title'] = 'Pages vues par jour'; +$lang['stats_addr'] = 'Adresse IP'; +$lang['stats_category'] = 'Catégorie'; $lang['stats_daily_graph_title'] = 'Pages vues par heure'; -$lang['stats_month_title'] = 'Statistiques mensuelles'; $lang['stats_day_title'] = 'Statistiques journalières'; -$lang['stats_pages_seen'] = 'Pages vues'; -$lang['stats_title'] = 'Statistiques de la dernière année'; +$lang['stats_file'] = 'Fichier'; +$lang['stats_global_graph_title'] = 'Pages vues par mois'; $lang['stats_hour'] = 'Heure'; $lang['stats_login'] = 'Identifiant'; -$lang['stats_addr'] = 'Adresse IP'; -$lang['stats_category'] = 'Categorie'; -$lang['stats_file'] = 'Fichier'; +$lang['stats_month_title'] = 'Statistiques mensuelles'; +$lang['stats_monthly_graph_title'] = 'Pages vues par jour'; +$lang['stats_pages_seen'] = 'Pages vues'; $lang['stats_picture'] = 'Image'; +$lang['stats_title'] = 'Statistiques de la dernière année'; $lang['status'] = 'statut'; $lang['storage'] = 'Répertoire'; $lang['sub-categories'] = 'sous-catégories'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index 3b015df6a..f0061ddb4 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -113,7 +113,7 @@ $lang['ascending'] = 'croissant'; $lang['auto_expand'] = 'Développer toutes les catégories'; $lang['best_rated_cat'] = 'Mieux notées'; $lang['best_rated_cat_hint'] = 'affiche les images les mieux notées'; -$lang['caddie'] = 'panier'; +$lang['caddie'] = 'Panier'; $lang['calendar'] = 'Calendrier'; $lang['calendar_hint'] = 'affichage année par année, mois par mois, jour par jour'; $lang['calendar_picture_hint'] = 'affiche les images du '; @@ -126,10 +126,10 @@ $lang['comment_to_validate'] = 'Un administrateur doit valider votre commentaire $lang['comment_user_exists'] = 'Ce nom d\'utilisateur est déjà pris'; $lang['comments'] = 'Commentaires'; $lang['comments_add'] = 'Ajouter un commentaire'; -$lang['comments_del'] = 'supprimer ce commentaire'; +$lang['comments_del'] = 'Supprimer ce commentaire'; $lang['comments_title'] = 'Commentaires des utilisateurs'; $lang['confirm_password_hint'] = 'Vous n\'avez à confirmer votre mot de passe que si vous désirez en changer.'; -$lang['customize'] = 'personnaliser'; +$lang['customize'] = 'Personnaliser'; $lang['customize_page_title'] = 'Personnalisation de votre affichage '; $lang['customize_title'] = 'Personnaliser'; $lang['day'][0] = 'Dimanche'; @@ -220,7 +220,7 @@ $lang['preferences'] = 'Pr $lang['previous_page'] = 'Précédent'; $lang['random_cat'] = 'Images au hasard'; $lang['random_cat_hint'] = 'Affiche un ensemble aléatoire d\'images'; -$lang['recent_cats_cat'] = 'Dernière catégories'; +$lang['recent_cats_cat'] = 'Dernières catégories'; $lang['recent_cats_cat_hint'] = 'Affiche les catégories récemment mises à jour ou créées'; $lang['recent_image'] = 'Image de moins de'; $lang['recent_period'] = 'Période récente'; diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl index b6a069c65..de15c637b 100644 --- a/template/yoga/admin/element_set_global.tpl +++ b/template/yoga/admin/element_set_global.tpl @@ -22,7 +22,7 @@ -
  • Add selected elements to caddie
    • +
  • {lang:Add selected elements to caddie}
    • diff --git a/template/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl index b71130efd..7dba4a2bf 100644 --- a/template/yoga/admin/element_set_unit.tpl +++ b/template/yoga/admin/element_set_unit.tpl @@ -3,8 +3,8 @@

    {CATEGORIES_NAV}

    - global mode - | unit mode + {lang:global mode} + | {lang:unit mode}

    @@ -13,13 +13,13 @@
    - Display options + {lang:Display options} -

    elements per page : +

    {lang:elements per page} : 5 | 10 | 50 - | all + | {lang:all}

    @@ -47,8 +47,8 @@ {lang:Creation date} - - set to + + {lang:set to}