From af78fa6193f7fec2bad09315aa1fb512d3c9a6fc Mon Sep 17 00:00:00 2001 From: nikrou Date: Sat, 20 Mar 2010 22:35:39 +0000 Subject: Fix some language keys problems Need translations ! git-svn-id: http://piwigo.org/svn/trunk@5207 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_modify.php | 2 +- admin/include/c13y_internal.class.php | 4 ++-- admin/include/functions_permalinks.php | 2 +- admin/site_update.php | 6 +++--- admin/themes/default/template/permalinks.tpl | 2 +- admin/themes/default/template/rating.tpl | 2 +- install.php | 2 +- language/de_DE/admin.lang.php | 12 ++++++------ language/en_UK/admin.lang.php | 24 ++++++++++++++++++------ language/en_UK/common.lang.php | 5 +++++ language/es_ES/admin.lang.php | 12 ++++++------ language/fr_FR/admin.lang.php | 24 ++++++++++++++++++------ language/fr_FR/common.lang.php | 5 +++++ language/it_IT/admin.lang.php | 12 ++++++------ language/nl_NL/admin.lang.php | 12 ++++++------ language/pl_PL/admin.lang.php | 12 ++++++------ language/templates/admin.lang.php | 11 +++++++++++ language/templates/common.lang.php | 6 ++++++ themes/Sylvia/icon/del_all_favorites.png | Bin 0 -> 872 bytes themes/default/template/comment_list.tpl | 4 ++-- themes/default/template/picture.tpl | 2 +- upgrade.php | 2 +- 22 files changed, 107 insertions(+), 56 deletions(-) create mode 100644 themes/Sylvia/icon/del_all_favorites.png diff --git a/admin/cat_modify.php b/admin/cat_modify.php index 635f4d7d4..039317285 100644 --- a/admin/cat_modify.php +++ b/admin/cat_modify.php @@ -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/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php index 5b0d89ebc..373829e36 100644 --- a/admin/include/c13y_internal.class.php +++ b/admin/include/c13y_internal.class.php @@ -208,7 +208,7 @@ class c13y_internal create_user_infos($id); - $page['infos'][] = sprintf(l10n('User \"%s\" created with \"%s\" like password'), $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('Status of user \"%s\" updated'), get_username($id)); + $page['infos'][] = sprintf(l10n('Status of user "%s" updated'), get_username($id)); $result = true; } diff --git a/admin/include/functions_permalinks.php b/admin/include/functions_permalinks.php index fc5846b1f..3a613f96b 100644 --- a/admin/include/functions_permalinks.php +++ b/admin/include/functions_permalinks.php @@ -140,7 +140,7 @@ function set_cat_permalink( $cat_id, $permalink, $save ) if ( $sanitized_permalink != $permalink or preg_match( '#^(\d)+(-.*)?$#', $permalink) ) { - $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 \"-\"'); + $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; } diff --git a/admin/site_update.php b/admin/site_update.php index a3cac9c6b..4d63ca936 100644 --- a/admin/site_update.php +++ b/admin/site_update.php @@ -56,11 +56,11 @@ define('CURRENT_DATE', $dbnow); $error_labels = array( 'PWG-UPDATE-1' => array( l10n('wrong filename'), - l10n('The name of directories and files must be composed of letters, numbers, \"-\", \"_\" or \".\"') + l10n('The name of directories and files must be composed of letters, numbers, "-", "_" or "."') ), 'PWG-UPDATE-2' => array( 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']) + 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('File/directory read error'), @@ -72,7 +72,7 @@ $error_labels = array( ), 'PWG-ERROR-NOLISTING' => array( 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') + 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(); diff --git a/admin/themes/default/template/permalinks.tpl b/admin/themes/default/template/permalinks.tpl index ef5c7f802..e7674c7c2 100644 --- a/admin/themes/default/template/permalinks.tpl +++ b/admin/themes/default/template/permalinks.tpl @@ -60,7 +60,7 @@ {$permalink.date_deleted} {$permalink.last_hit} {$permalink.hit} - [{'Delete'|@translate}] + [{'Delete'|@translate}] {/foreach} diff --git a/admin/themes/default/template/rating.tpl b/admin/themes/default/template/rating.tpl index d7d3a85c9..a736470c6 100644 --- a/admin/themes/default/template/rating.tpl +++ b/admin/themes/default/template/rating.tpl @@ -58,7 +58,7 @@ {$rate.RATE} {$rate.USER} {$rate.DATE} - [{'Delete'|@translate}] + [{'Delete'|@translate}] {/foreach} {*rates*} {/foreach} {*images*} diff --git a/install.php b/install.php index 8c09745cf..2f9832b60 100644 --- a/install.php +++ b/install.php @@ -267,7 +267,7 @@ if ( isset( $_POST['install'] )) if ( empty($webmaster)) array_push( $errors, l10n('enter a login for webmaster') ); else if ( preg_match( '/[\'"]/', $webmaster ) ) - array_push( $errors, l10n('webmaster login can\'t contain characters \' or \"') ); + array_push( $errors, l10n('webmaster login can\'t contain characters \' or "') ); if ( $admin_pass1 != $admin_pass2 || empty($admin_pass1) ) array_push( $errors, l10n('please enter your password again') ); if ( empty($admin_mail)) diff --git a/language/de_DE/admin.lang.php b/language/de_DE/admin.lang.php index b9fde4d1d..b606cd240 100644 --- a/language/de_DE/admin.lang.php +++ b/language/de_DE/admin.lang.php @@ -597,12 +597,12 @@ $lang['Caddie is currently empty'] = "Der Sammelkorb ist derzeit leer."; $lang['Upload'] = "Upload"; $lang['Show upload link every time'] = "Den Uploadlink immer anzeigen"; $lang['User access level to upload'] = "dürfen Bilder hochladen"; -$lang['Free access'] = "Frei"; -$lang['Access to all'] = "Alle"; -$lang['Access to subscribed'] = "Mitglieder"; -$lang['Access to administrators'] = "Administratoren"; -$lang['Access to webmasters'] = "Webmaster"; -$lang['No access'] = "Keine Benutzer"; +$lang['ACCESS_0'] = "Frei"; +$lang['ACCESS_1'] = "Alle"; +$lang['ACCESS_2'] = "Mitglieder"; +$lang['ACCESS_3'] = "Administratoren"; +$lang['ACCESS_4'] = "Webmaster"; +$lang['ACCESS_5'] = "Keine Benutzer"; $lang['Demo'] = "Demo"; $lang['Piwigo home'] = "Home Piwigo"; $lang['Support'] = "Support"; diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 9f5e83a3a..9dc700610 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -597,12 +597,12 @@ $lang['Caddie is currently empty'] = "Caddie is currently empty"; $lang['Upload'] = "Upload"; $lang['Show upload link every time'] = "Show upload link every time"; $lang['User access level to upload'] = "User access level to upload"; -$lang['Free access'] = "Free access"; -$lang['Access to all'] = "Access to all"; -$lang['Access to subscribed'] = "Access to subscribed"; -$lang['Access to administrators'] = "Access to administrators"; -$lang['Access to webmasters'] = "Access to webmasters"; -$lang['No access'] = "No access"; +$lang['ACCESS_0'] = "Free access"; +$lang['ACCESS_1'] = "Access to all"; +$lang['ACCESS_2'] = "Access to subscribed"; +$lang['ACCESS_3'] = "Access to administrators"; +$lang['ACCESS_4'] = "Access to webmasters"; +$lang['ACCESS_5'] = "No access"; $lang['Demo'] = "Demo"; $lang['Piwigo home'] = "Piwigo home"; $lang['Support'] = "Support"; @@ -667,4 +667,16 @@ $lang['Email administrators when a comment is modified'] = "Email administrators $lang['Email administrators when a comment is deleted'] = "Email administrators when a comment is deleted"; $lang['Cannot delete the old permalink !'] = "Cannot delete the old permalink !"; $lang['Hit'] = "Hit"; + +$lang['Tools'] = "Tools"; +$lang['Photos'] = "Photos"; +$lang['Themes'] = "Themes"; +$lang['Instructions to use Piwigo'] = "Instructions to use Piwigo"; +$lang['Order alphanumerically'] = "Order alphanumerically"; +$lang['Order alphanumerically reverse'] = "Order alphanumerically reverse"; +$lang['Installed Themes'] = "Installed Themes"; +$lang['Add New Theme'] = "Add New Theme"; +$lang['Forbid this theme to users'] = "Forbid this theme to users"; +$lang['Set as default theme for unregistered and new users'] = "Set as default theme for unregistered and new users"; +$lang['unknown'] = 'unknown'; ?> \ No newline at end of file diff --git a/language/en_UK/common.lang.php b/language/en_UK/common.lang.php index 98602b69a..254251bea 100644 --- a/language/en_UK/common.lang.php +++ b/language/en_UK/common.lang.php @@ -367,4 +367,9 @@ $lang['Reset to default values'] = "Reset to default values"; $lang['delete all images from your favorites'] = "delete all images from your favorites"; $lang['Sent by'] = "Sent by"; $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Cookies are blocked or not supported by your browser. You must enable cookies to connect."; + +$lang['Some info about this picture'] = "Some info about this picture"; +$lang['Some more (technical) info about this picture'] = "Some more (technical) info about this picture"; +$lang['edit this comment'] = "edit this comment"; +$lang['Edit a comment'] = "Edit a comment"; ?> \ No newline at end of file diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php index dd4c2163e..3d4f2201e 100644 --- a/language/es_ES/admin.lang.php +++ b/language/es_ES/admin.lang.php @@ -596,12 +596,12 @@ $lang['Caddie is currently empty'] = "La cesta actualmente está vacía"; $lang['Upload'] = "Descargar"; $lang['Show upload link every time'] = "Mostrar el lazo de añadido de imagen todo el tiempo"; $lang['User access level to upload'] = "Nivel de acceso usuario para cargar"; -$lang['Free access'] = "Acceso libre"; -$lang['Access to all'] = "Acceso todos"; -$lang['Access to subscribed'] = "Acceso inscritos"; -$lang['Access to administrators'] = "Acceso administradores"; -$lang['Access to webmasters'] = "Acceso webmestres"; -$lang['No access'] = "Ningún acceso"; +$lang['ACCESS_0'] = "Acceso libre"; +$lang['ACCESS_1'] = "Acceso todos"; +$lang['ACCESS_2'] = "Acceso inscritos"; +$lang['ACCESS_3'] = "Acceso administradores"; +$lang['ACCESS_4'] = "Acceso webmestres"; +$lang['ACCESS_5'] = "Ningún acceso"; $lang['Demo'] = "Demo"; $lang['Piwigo home'] = "Acogida Piwigo"; $lang['Support'] = "Ayuda"; diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php index ca1500d69..b16947f6c 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -596,12 +596,12 @@ $lang['Caddie is currently empty'] = "Le panier est actuellement vide."; $lang['Upload'] = "Téléchargement"; $lang['Show upload link every time'] = "Afficher le lien d'ajout d'image tout le temps"; $lang['User access level to upload'] = "Niveau d'accès utilisateur pour télécharger"; -$lang['Free access'] = "Accès libre"; -$lang['Access to all'] = "Accès à tous"; -$lang['Access to subscribed'] = "Accès aux inscrits"; -$lang['Access to administrators'] = "Accès aux administrateurs"; -$lang['Access to webmasters'] = "Accès aux webmestres"; -$lang['No access'] = "Pas d'accès"; +$lang['ACCESS_0'] = "Accès libre"; +$lang['ACCESS_1'] = "Accès à tous"; +$lang['ACCESS_2'] = "Accès aux inscrits"; +$lang['ACCESS_3'] = "Accès aux administrateurs"; +$lang['ACCESS_4'] = "Accès aux webmestres"; +$lang['ACCESS_5'] = "Pas d'accès"; $lang['Demo'] = "Démo"; $lang['Piwigo home'] = "Accueil Piwigo"; $lang['Support'] = "Support"; @@ -666,4 +666,16 @@ $lang['Email administrators when a comment is modified'] = "Notifier les adminis $lang['Email administrators when a comment is deleted'] = "Notifier les administrateurs quand un commentaire est supprimé"; $lang['Cannot delete the old permalink !'] = "Impossible de supprimer cet ancien lien permanent !"; $lang['Hit'] = "score"; + +$lang['Tools'] = "Outils"; +$lang['Photos'] = "Photos"; +$lang['Themes'] = "Thèmes"; +$lang['Instructions to use Piwigo'] = "Aide pour utiliser Piwigo"; +$lang['Order alphanumerically'] = "Ordre alphanumérique"; +$lang['Order alphanumerically reverse'] = "Ordre alphanumérique inverse"; +$lang['Installed Themes'] = "Thèmes installés"; +$lang['Add New Theme'] = "Ajouter un thème"; +$lang['Forbid this theme to users'] = "Interdire ce thème aux utilisateurs"; +$lang['Set as default theme for unregistered and new users'] = "Thème par défaut pour les invités et les nouveaux utilisateurs"; +$lang['unknown'] = 'inconnu'; ?> \ No newline at end of file diff --git a/language/fr_FR/common.lang.php b/language/fr_FR/common.lang.php index a85a5c93b..8a86c325d 100644 --- a/language/fr_FR/common.lang.php +++ b/language/fr_FR/common.lang.php @@ -367,4 +367,9 @@ $lang['Reset to default values'] = "Rétablir les valeurs par défaut"; $lang['delete all images from your favorites'] = "supprimer toutes les images de vos favoris"; $lang['Sent by'] = "Envoyé par"; $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = "Les cookies sont bloqués ou non supportés par votre navigateur web. Vous devez activer les cookies pour vous connecter."; + +$lang['Some info about this picture'] = "Informations sur cette image"; +$lang['Some more (technical) info about this picture'] = "Informations (techniques) sur cette image"; +$lang['edit this comment'] = "editer ce commentaire"; +$lang['Edit a comment'] = "Editer ce commentaire"; ?> \ No newline at end of file diff --git a/language/it_IT/admin.lang.php b/language/it_IT/admin.lang.php index 7bb287107..53e70879a 100644 --- a/language/it_IT/admin.lang.php +++ b/language/it_IT/admin.lang.php @@ -596,12 +596,12 @@ $lang['Caddie is currently empty'] = "Il cestino è attualente vuoto."; $lang['Upload'] = "Upload"; $lang['Show upload link every time'] = "Sempre visualizzare il link per aggiungere le immagini"; $lang['User access level to upload'] = "Livello d'accesso utente per l'upload"; -$lang['Free access'] = "Accesso libero"; -$lang['Access to all'] = "Accesso a tutti"; -$lang['Access to subscribed'] = "Accesso agli iscritti"; -$lang['Access to administrators'] = "Accesso agli amministratori"; -$lang['Access to webmasters'] = "Accesso agli webmaster"; -$lang['No access'] = "Nessun accesso"; +$lang['ACCESS_0'] = "Accesso libero"; +$lang['ACCESS_1'] = "Accesso a tutti"; +$lang['ACCESS_2'] = "Accesso agli iscritti"; +$lang['ACCESS_3'] = "Accesso agli amministratori"; +$lang['ACCESS_4'] = "Accesso agli webmaster"; +$lang['ACCESS_5'] = "Nessun accesso"; $lang['Demo'] = "Demo"; $lang['Piwigo home'] = "Home Piwigo"; $lang['Support'] = "Forum"; diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php index ce27b7d87..8c3266be8 100644 --- a/language/nl_NL/admin.lang.php +++ b/language/nl_NL/admin.lang.php @@ -597,12 +597,12 @@ $lang['Caddie is currently empty'] = "Caddie is momenteel leeg"; $lang['Upload'] = "Upload"; $lang['Show upload link every time'] = "Show upload link altijd"; $lang['User access level to upload'] = "Gebruiker toegangsniveau om te uploaden"; -$lang['Free access'] = "Gratis toegang"; -$lang['Access to all'] = "Toegang tot alles"; -$lang['Access to subscribed'] = "Toegang tot geabbonnneerde"; -$lang['Access to administrators'] = "Toegang voor beheerders"; -$lang['Access to webmasters'] = "Toegang voor webmasters"; -$lang['No access'] = "Geen toegang"; +$lang['ACCESS_0'] = "Gratis toegang"; +$lang['ACCESS_1'] = "Toegang tot alles"; +$lang['ACCESS_2'] = "Toegang tot geabbonnneerde"; +$lang['ACCESS_3'] = "Toegang voor beheerders"; +$lang['ACCESS_4'] = "Toegang voor webmasters"; +$lang['ACCESS_5'] = "Geen toegang"; $lang['Demo'] = "Demo"; $lang['Piwigo home'] = "Piwigo Home"; $lang['Support'] = "Bijstand"; diff --git a/language/pl_PL/admin.lang.php b/language/pl_PL/admin.lang.php index 9feaae9a9..316552234 100644 --- a/language/pl_PL/admin.lang.php +++ b/language/pl_PL/admin.lang.php @@ -597,12 +597,12 @@ $lang['Caddie is currently empty'] = "Koszyk jest aktualnie pusty"; $lang['Upload'] = "Upload"; $lang['Show upload link every time'] = "Zawsze pokazuj link upload"; $lang['User access level to upload'] = "Poziom uprawnień użytkoników dla upload'u"; -$lang['Free access'] = "Wolny dostęp"; -$lang['Access to all'] = "Dostęp dla wszystkich"; -$lang['Access to subscribed'] = "Dostep dla zapisanych"; -$lang['Access to administrators'] = "Dostęp dla Administratorów"; -$lang['Access to webmasters'] = "Dostęp dla webmasterów"; -$lang['No access'] = "Brak dostępu"; +$lang['ACCESS_0'] = "Wolny dostęp"; +$lang['ACCESS_1'] = "Dostęp dla wszystkich"; +$lang['ACCESS_2'] = "Dostep dla zapisanych"; +$lang['ACCESS_3'] = "Dostęp dla Administratorów"; +$lang['ACCESS_4'] = "Dostęp dla webmasterów"; +$lang['ACCESS_5'] = "Brak dostępu"; $lang['Demo'] = "Demo"; $lang['Piwigo home'] = "Strona domowa Piwigo"; $lang['Support'] = "Wsparcie"; diff --git a/language/templates/admin.lang.php b/language/templates/admin.lang.php index 465ed9855..000b00a2d 100644 --- a/language/templates/admin.lang.php +++ b/language/templates/admin.lang.php @@ -667,4 +667,15 @@ $lang['Cannot delete the old permalink !'] = 'Cannot delete the old permalink !' $lang['Deleted on'] = 'Deleted on'; $lang['Last hit'] = 'Last hit'; $lang['Hit'] = 'Hit'; + +$lang['Tools'] = "Tools"; +$lang['Photos'] = "Photos"; +$lang['Themes'] = "Themes"; +$lang['Instructions to use Piwigo'] = "Instructions to use Piwigo"; +$lang['Order alphanumerically'] = "Order alphanumerically"; +$lang['Order alphanumerically reverse'] = "Order alphanumerically reverse"; +$lang['Installed Themes'] = "Installed Themes"; +$lang['Add New Theme'] = "Add New Theme"; +$lang['Forbid this theme to users'] = "Forbid this theme to users"; +$lang['Set as default theme for unregistered and new users'] = "Set as default theme for unregistered and new users"; ?> \ No newline at end of file diff --git a/language/templates/common.lang.php b/language/templates/common.lang.php index 05b28c5e6..0c5f223d6 100644 --- a/language/templates/common.lang.php +++ b/language/templates/common.lang.php @@ -370,4 +370,10 @@ $lang['Reset_To_Default'] = 'Reset to default values'; $lang['del_all_favorites_hint'] = 'delete all images from your favorites'; $lang['Sent by'] = 'Sent by'; $lang['Cookies are blocked or not supported by your browser. You must enable cookies to connect.'] = 'Cookies are blocked or not supported by your browser. You must enable cookies to connect.'; + +$lang['Some info about this picture'] = "Some info about this picture"; +$lang['Some more (technical) info about this picture'] = "Some more (technical) info about this picture"; +$lang['edit this comment'] = "edit this comment"; +$lang['Edit a comment'] = "Edit a comment"; + ?> diff --git a/themes/Sylvia/icon/del_all_favorites.png b/themes/Sylvia/icon/del_all_favorites.png new file mode 100644 index 000000000..bea4720cf Binary files /dev/null and b/themes/Sylvia/icon/del_all_favorites.png differ diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 87da2158d..117979bce 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -22,7 +22,7 @@ {/if} {if isset($comment.U_EDIT) and !isset($comment.IN_EDIT)}
  • - + [edit]
    • @@ -41,7 +41,7 @@
    - Edit a comment + {'Edit a comment'|@translate} diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl index 54d3b538b..e5dd470e9 100644 --- a/themes/default/template/picture.tpl +++ b/themes/default/template/picture.tpl @@ -109,7 +109,7 @@ y.callService( {/if} - +
    diff --git a/upgrade.php b/upgrade.php index 498d1f114..e4b92834d 100644 --- a/upgrade.php +++ b/upgrade.php @@ -194,7 +194,7 @@ $template = new Template(PHPWG_ROOT_PATH.'admin/themes', 'roma'); $template->set_filenames(array('upgrade'=>'upgrade.tpl')); $template->assign(array( 'RELEASE' => PHPWG_VERSION, - 'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on Piwigo message board.'), PHPWG_URL.'/forum'), + 'L_UPGRADE_HELP' => sprintf(l10n('Need help ? Ask your question on Piwigo message board.'), PHPWG_URL.'/forum'), ) ); -- cgit v1.2.3
    {'Author'|@translate} {if isset($INFO_AUTHOR)}{$INFO_AUTHOR}{else}{'N/A'|@translate}{/if}