From 3081155427d0dc52c00db7ba803a54d279d1d7ef Mon Sep 17 00:00:00 2001 From: plegall Date: Fri, 2 Jun 2006 20:05:36 +0000 Subject: merge -r1334:1335 from branch 1.6 to trunk (bug 390 fixed) git-svn-id: http://piwigo.org/svn/trunk@1336 68402e56-0260-453c-a942-63ccdbb3a9ee --- language/en_UK.iso-8859-1/admin.lang.php | 2 ++ language/en_UK.iso-8859-1/common.lang.php | 7 ++++--- language/fr_FR.iso-8859-1/admin.lang.php | 2 ++ language/fr_FR.iso-8859-1/common.lang.php | 5 +++-- 4 files changed, 11 insertions(+), 5 deletions(-) (limited to 'language') diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index 466ad5611..88355bdc3 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -159,8 +159,10 @@ $lang['Status'] = 'Status'; $lang['Storage category'] = 'Storage category'; $lang['Submit'] = 'Submit'; $lang['Sum of rates'] = 'Sum of rates'; +$lang['Tag "%s" was added'] = 'Tag "%s" was added'; $lang['Tag selection'] = 'Tag selection'; $lang['Take selected elements out of caddie'] = 'Take selected elements out of caddie'; +$lang['The %d following tags were deleted : %s'] = 'The %d following tags were deleted : %s'; $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Unable to check for upgrade since allow_url_fopen is disabled.'; $lang['User comments validation'] = 'User comments validation'; $lang['Users'] = 'Users'; diff --git a/language/en_UK.iso-8859-1/common.lang.php b/language/en_UK.iso-8859-1/common.lang.php index 6273e9f88..c75b3294e 100644 --- a/language/en_UK.iso-8859-1/common.lang.php +++ b/language/en_UK.iso-8859-1/common.lang.php @@ -40,6 +40,7 @@ $lang['%d new comments'] = '%d new comments'; $lang['%d new elements'] = '%d new elements'; $lang['%d new users'] = '%d new users'; $lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags'; +$lang['%d pictures'] = '%d pictures'; $lang['%d waiting elements'] = '%d waiting elements'; $lang['About'] = 'About'; $lang['All tags must match'] = 'All tags must match'; @@ -245,8 +246,8 @@ $lang['nb_row_per_page'] = 'Number of rows per page'; $lang['nbm_unknown_identifier'] = 'Unknown identifier'; $lang['new_password'] = 'New password'; $lang['new_password_hint'] = 'You only have to give a password if you wish to change it.'; -$lang['next_page'] = 'Next'; $lang['new_rate'] = 'Rate this picture'; +$lang['next_page'] = 'Next'; $lang['no'] = 'No'; $lang['no_category'] = 'Home'; $lang['no_rate'] = 'no rate'; @@ -259,6 +260,7 @@ $lang['periods_error'] = 'Recent period must be a positive integer value'; $lang['picture'] = 'picture'; $lang['picture_high'] = 'Click on the picture to see it in high definition'; $lang['picture_show_metadata'] = 'Show file metadata'; +$lang['pictures'] = 'pictures'; $lang['powered_by'] = 'Powered by'; $lang['preferences'] = 'Preferences'; $lang['previous_page'] = 'Previous'; @@ -270,6 +272,7 @@ $lang['recent_image'] = 'Image within the'; $lang['recent_period'] = 'Recent period'; $lang['recent_pics_cat'] = 'Last pictures'; $lang['recent_pics_cat_hint'] = 'displays most recent pictures'; +$lang['redirect_msg'] = 'Redirection...'; $lang['reg_confirm'] = 'Confirm password'; $lang['reg_err_login1'] = 'Please, enter a login'; $lang['reg_err_login2'] = 'login mustn\'t end with a space character'; @@ -342,6 +345,4 @@ $lang['upload_username'] = 'Username'; $lang['useful when password forgotten'] = 'useful when password forgotten'; $lang['w_month'] = 'Month'; $lang['yes'] = 'Yes'; -$lang['redirect_msg'] = 'Redirection...'; -$lang['pictures'] = 'pictures'; ?> diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 8fa0a180c..0032c307e 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -161,8 +161,10 @@ $lang['Submit'] = 'Valider'; $lang['Sum of rates'] = 'Somme des notes'; $lang['Tag "%s" already exist'] = 'Le tag "%s" existe déjà'; $lang['Tag "%s" was added'] = 'Le tag "%s" a été ajouté'; +$lang['Tag "%s" was added'] = 'Tag "%s" was added'; $lang['Tag selection'] = 'Sélection de tags'; $lang['Take selected elements out of caddie'] = 'Sortir les éléments sélectionnés du panier'; +$lang['The %d following tags were deleted : %s'] = 'The %d following tags were deleted : %s'; $lang['Unable to check for upgrade since allow_url_fopen is disabled.'] = 'Impossible de connaître la dernière version cat la fonction allow_url_fopen est désactivée.'; $lang['User comments validation'] = 'Validation des commentaires utilisateur'; $lang['Users'] = 'Utilisateurs'; diff --git a/language/fr_FR.iso-8859-1/common.lang.php b/language/fr_FR.iso-8859-1/common.lang.php index dda9819cb..3c474a271 100644 --- a/language/fr_FR.iso-8859-1/common.lang.php +++ b/language/fr_FR.iso-8859-1/common.lang.php @@ -40,6 +40,7 @@ $lang['%d new comments'] = '%d nouveaux commentaires utilisateur'; $lang['%d new elements'] = '%d nouveaux éléments'; $lang['%d new users'] = '%d nouveaux utilisateurs'; $lang['%d pictures are also linked to current tags'] = '%d images sont également liées aux tags courants'; +$lang['%d pictures'] = '%d images'; $lang['About'] = 'À propos'; $lang['All tags must match'] = 'Tous les tags doivent correspondre'; $lang['All tags'] = 'Tous les tags'; @@ -258,6 +259,7 @@ $lang['periods_error'] = 'La p $lang['picture'] = 'image'; $lang['picture_high'] = 'Cliquer sur l\'image pour la visualiser en haute définition'; $lang['picture_show_metadata'] = 'Montrer les méta-données du fichier'; +$lang['pictures'] = 'images'; $lang['powered_by'] = 'Propulsé par'; $lang['preferences'] = 'Préférences'; $lang['previous_page'] = 'Précédent'; @@ -269,6 +271,7 @@ $lang['recent_image'] = 'Image de moins de'; $lang['recent_period'] = 'Période récente'; $lang['recent_pics_cat'] = 'Dernières images'; $lang['recent_pics_cat_hint'] = 'afficher les images les plus récentes'; +$lang['redirect_msg'] = 'Redirection...'; $lang['reg_confirm'] = 'Confirmer le mot de passe'; $lang['reg_err_login1'] = 'S\'il vous plaît, entrer un nom utilisateur'; $lang['reg_err_login2'] = 'le nom utilisateur ne doit pas se terminer par un espace'; @@ -342,6 +345,4 @@ $lang['upload_username'] = 'Nom d\'utilisateur'; $lang['useful when password forgotten'] = 'utile en cas d\'oubli de mot de passe'; $lang['w_month'] = 'Mois'; $lang['yes'] = 'Oui'; -$lang['redirect_msg'] = 'Redirection...'; -$lang['pictures'] = 'images'; ?> \ No newline at end of file -- cgit v1.2.3