From 37b10cdf2246eea40294c7f37c8076f224a360a5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:45:21 +0200 Subject: [PATCH 01/43] Translation update done using Pootle. --- po/en_GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 1ce274eea..f0c8f74fc 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-15 19:14+0200\n" +"PO-Revision-Date: 2010-12-27 13:45+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: english-gb \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1083,7 +1083,7 @@ msgstr "Inline Edit" #: js/messages.php:89 msgid "Hide search criteria" -msgstr "" +msgstr "Hide search criteria" #: js/messages.php:90 #, fuzzy From 6c0206cbc1fd7e6cb9a10f90587672858148f634 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:45:29 +0200 Subject: [PATCH 02/43] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index f0c8f74fc..f2891c07c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1086,10 +1086,9 @@ msgid "Hide search criteria" msgstr "Hide search criteria" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Show query chart" +msgstr "Show search criteria" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 From e419185d28c7a5f35b7db45b32f9b680c598cc9a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:45:43 +0200 Subject: [PATCH 03/43] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index f2891c07c..078886ac2 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -9567,10 +9567,9 @@ msgid "Browse distinct values" msgstr "Browse distinct values" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Adding Primary Key" +msgstr "Add primary key" #: tbl_structure.php:167 tbl_structure.php:168 #, fuzzy From 13b9bf62a0a9b198d6fbeef01f9bd46a814b7322 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:45:49 +0200 Subject: [PATCH 04/43] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 078886ac2..10a9f33c8 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -9572,10 +9572,9 @@ msgid "Add primary key" msgstr "Add primary key" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Apply index(s)" +msgstr "Add index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" From 4f7018e58e15c0a4c0a0671ae8bd6c23ba7e0764 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:45:55 +0200 Subject: [PATCH 05/43] Translation update done using Pootle. --- po/en_GB.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/en_GB.po b/po/en_GB.po index 10a9f33c8..b1168c2df 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -9578,7 +9578,7 @@ msgstr "Add index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Add unique index" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" From 517996369f91c49d4ccc3a53115599d681632a57 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:46:00 +0200 Subject: [PATCH 06/43] Translation update done using Pootle. --- po/en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index b1168c2df..58655318c 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 13:45+0200\n" +"PO-Revision-Date: 2010-12-27 13:46+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -9582,7 +9582,7 @@ msgstr "Add unique index" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Add FULLTEXT index" #: tbl_structure.php:384 msgctxt "None for default" From 9260acdc24f4fc481e10bcce1ac58dd973e3c5d5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:46:44 +0200 Subject: [PATCH 07/43] Translation update done using Pootle. --- po/fr.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 8c1b93daf..fd385a33e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-15 19:13+0200\n" +"PO-Revision-Date: 2010-12-27 13:46+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" @@ -1095,10 +1095,9 @@ msgid "Inline Edit" msgstr "Édition en place" #: js/messages.php:89 -#, fuzzy #| msgid "Hide query chart" msgid "Hide search criteria" -msgstr "Cacher le graphique des requêtes" +msgstr "Cacher les critères de recherche" #: js/messages.php:90 #, fuzzy From 141fcf91a6adf86aeffa75447060cfeb2d3bfe05 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:47:01 +0200 Subject: [PATCH 08/43] Translation update done using Pootle. --- po/fr.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/fr.po b/po/fr.po index fd385a33e..5160dd4b1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 13:46+0200\n" +"PO-Revision-Date: 2010-12-27 13:47+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -1100,10 +1100,9 @@ msgid "Hide search criteria" msgstr "Cacher les critères de recherche" #: js/messages.php:90 -#, fuzzy #| msgid "Show query chart" msgid "Show search criteria" -msgstr "Afficher le graphique des requêtes" +msgstr "Afficher les critères de recherche" #: js/messages.php:93 tbl_change.php:294 tbl_indexes.php:198 #: tbl_indexes.php:223 From cea623a412d1531620ff9da3234e1504909be829 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:47:14 +0200 Subject: [PATCH 09/43] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5160dd4b1..5ec9864ca 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9715,10 +9715,9 @@ msgid "Browse distinct values" msgstr "Affiche les valeurs distinctes" #: tbl_structure.php:165 tbl_structure.php:166 -#, fuzzy #| msgid "Adding Primary Key" msgid "Add primary key" -msgstr "Ajout de clé primaire" +msgstr "Ajouter une clé primaire" #: tbl_structure.php:167 tbl_structure.php:168 #, fuzzy From 83b8cbea00232c497d537c46f3aa45c60b00166a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:47:25 +0200 Subject: [PATCH 10/43] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5ec9864ca..4c15b1fae 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9720,10 +9720,9 @@ msgid "Add primary key" msgstr "Ajouter une clé primaire" #: tbl_structure.php:167 tbl_structure.php:168 -#, fuzzy #| msgid "Apply index(s)" msgid "Add index" -msgstr "Appliquer des index" +msgstr "Ajouter un index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" From 788a1feb0d69a2b97044dab2e230bac31db5a900 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:47:33 +0200 Subject: [PATCH 11/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 4c15b1fae..5bcf94db1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9726,7 +9726,7 @@ msgstr "Ajouter un index" #: tbl_structure.php:169 tbl_structure.php:170 msgid "Add unique index" -msgstr "" +msgstr "Ajouter un index unique" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" From bbc6eaadb25d48dbcd62bc67857a5ebd71956dab Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:47:44 +0200 Subject: [PATCH 12/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 5bcf94db1..0cf40232c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9730,7 +9730,7 @@ msgstr "Ajouter un index unique" #: tbl_structure.php:171 tbl_structure.php:172 msgid "Add FULLTEXT index" -msgstr "" +msgstr "Ajouter un index FULLTEXT" #: tbl_structure.php:384 msgctxt "None for default" From 64d3cc1542f5d87746f63ae334c394d376921509 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:55:37 +0200 Subject: [PATCH 13/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 0cf40232c..502692905 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 13:47+0200\n" +"PO-Revision-Date: 2010-12-27 13:55+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -821,7 +821,7 @@ msgid "" "File %s already exists on server, change filename or check overwrite option." msgstr "" "Le fichier %s existe déjà sur le serveur, veuillez changer le nom, ou cocher " -"l'option «écraser»." +"l'option d'écrasement des fichiers existants." #: export.php:311 export.php:315 #, php-format From 976b9d90d7bb7a51c4b808549a17aaf560f35b9e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:58:44 +0200 Subject: [PATCH 14/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 502692905..754fffb20 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 13:55+0200\n" +"PO-Revision-Date: 2010-12-27 13:58+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -230,7 +230,7 @@ msgstr "Imprimer" #: db_export.php:30 msgid "View dump (schema) of database" -msgstr "Schéma et données de la base" +msgstr "Voir une exportation (schéma) de la base de données" #: db_export.php:34 db_printview.php:94 db_qbe.php:98 db_tracking.php:47 #: export.php:371 navigation.php:308 From af4caf710544301deabc6db7def393cc2aeaac04 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:59:08 +0200 Subject: [PATCH 15/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 754fffb20..9569d7b37 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 13:58+0200\n" +"PO-Revision-Date: 2010-12-27 13:59+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -564,7 +564,7 @@ msgstr "Effectuer une nouvelle recherche dans la base de données" #: db_search.php:299 msgid "Word(s) or value(s) to search for (wildcard: \"%\"):" -msgstr "Mot ou valeur à rechercher (passe-partout: «%») :" +msgstr "Mot(s) ou valeur(s) à rechercher (passe-partout: «%») :" #: db_search.php:304 msgid "Find:" From 5d537db2245dd9822a3f75e6cf7d16dcf1be906e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 13:59:57 +0200 Subject: [PATCH 16/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 9569d7b37..289544c7b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1862,7 +1862,7 @@ msgstr "Indice de serveur invalide: %s" #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." msgstr "" -"Nom d'hôte (hostname) invalide pour le serveur %1$s. Veuillez vérifier votre " +"Nom d'hôte invalide pour le serveur %1$s. Veuillez vérifier votre " "configuration." #: libraries/common.inc.php:637 libraries/config/messages.inc.php:482 From cf488bc416835f72ecaaa2dd19cd9a2778ae3626 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:00:34 +0200 Subject: [PATCH 17/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 289544c7b..81b52963f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 13:59+0200\n" +"PO-Revision-Date: 2010-12-27 14:00+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -2246,7 +2246,7 @@ msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" msgstr "" "Si activé, permet d'entrer un nom de serveur MySQL sur le panneau de " -"connexion (mode cookie)" +"connexion en mode cookie" #: libraries/config/messages.inc.php:18 msgid "Allow login to any MySQL server" From aacc14b0c3619a780fd0ae41ed4dbc847bfc0a5a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:00:52 +0200 Subject: [PATCH 18/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 81b52963f..9c8c59018 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2260,7 +2260,7 @@ msgid "" msgstr "" "Activer ceci permet à une page située dans un domaine différent d'appeler " "phpMyAdmin à l'intérieur d'un cadre et représente un trou potentiel de " -"sécurité pour les attaques de script inter-cadre (cross-frame)." +"sécurité pour les attaques de script inter-cadre" #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" From af173c6cc38e9cff870957defdad386e905f229b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:01:09 +0200 Subject: [PATCH 19/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 9c8c59018..34940f657 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:00+0200\n" +"PO-Revision-Date: 2010-12-27 14:01+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -2327,7 +2327,7 @@ msgstr "Édition des colonnes CHAR" #: libraries/config/messages.inc.php:32 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "Nombre de colonnes pour les textareas CHAR/VARCHAR)" +msgstr "Nombre de colonnes pour les textareas CHAR/VARCHAR" #: libraries/config/messages.inc.php:33 msgid "CHAR textarea columns" From 8a41d38a74a4e10c382665e59deedf5b4228db8c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:01:14 +0200 Subject: [PATCH 20/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 34940f657..34d0d7149 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2335,7 +2335,7 @@ msgstr "Taille horizontale pour un textarea contenant un CHAR" #: libraries/config/messages.inc.php:34 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "Nombre de lignes pour les textareas CHAR/VARCHAR)" +msgstr "Nombre de lignes pour les textareas CHAR/VARCHAR" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea rows" From 129e29b906f70ccc83cbc48345b4b7d4e91c5b03 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:01:50 +0200 Subject: [PATCH 21/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 34d0d7149..a27e0e494 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2367,8 +2367,8 @@ msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" msgstr "" -"Un message devrait-il s'afficher quand vous êtes sur le point de perdre des " -"données" +"Un message (Êtes-vous certain...) devrait-il s'afficher quand vous êtes sur " +"le point de perdre des données" #: libraries/config/messages.inc.php:41 msgid "Confirm DROP queries" From 6f5170c418aac1bff7c1acde04cabce6984aef46 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:02:04 +0200 Subject: [PATCH 22/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index a27e0e494..58aabfdac 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:01+0200\n" +"PO-Revision-Date: 2010-12-27 14:02+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -2372,7 +2372,7 @@ msgstr "" #: libraries/config/messages.inc.php:41 msgid "Confirm DROP queries" -msgstr "Confirmer les requêtes de suppression (DROP)" +msgstr "Confirmer les requêtes de suppression DROP" #: libraries/config/messages.inc.php:42 msgid "Debug SQL" From 587e029831a772f3c1a62e94a8ebfff4315df379 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:02:16 +0200 Subject: [PATCH 23/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 58aabfdac..fae1e81eb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2420,7 +2420,7 @@ msgstr "Onglet par défaut pour tables" #: libraries/config/messages.inc.php:52 msgid "Show binary contents as HEX by default" -msgstr "Montrer par défaut le contenu binaire en hexadécimal (HEX)" +msgstr "Montrer par défaut le contenu binaire en hexadécimal" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" From 6d9e57cbd1c6a2ae9e3fc17ff74c5250eceec798 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:02:22 +0200 Subject: [PATCH 24/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index fae1e81eb..16287214b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2424,7 +2424,7 @@ msgstr "Montrer par défaut le contenu binaire en hexadécimal" #: libraries/config/messages.inc.php:53 libraries/display_tbl.lib.php:597 msgid "Show binary contents as HEX" -msgstr "Montrer le contenu binaire en hexadécimal (HEX)" +msgstr "Montrer le contenu binaire en hexadécimal" #: libraries/config/messages.inc.php:54 msgid "Show database listing as a list instead of a drop down" From fe14cb0f8ad78897e9035c255415a14d102e9f74 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:02:35 +0200 Subject: [PATCH 25/43] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 16287214b..667261f2c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2530,8 +2530,7 @@ msgstr "Remplacer NULL par" #: libraries/config/messages.inc.php:74 libraries/config/messages.inc.php:80 msgid "Remove CRLF characters within columns" -msgstr "" -"Enlève les caractères de fin de ligne (CRLF) à l'intérieur des colonnes" +msgstr "Enlève les caractères de fin de ligne à l'intérieur des colonnes" #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:240 #: libraries/config/messages.inc.php:248 libraries/import/csv.php:61 From eb307c0f202e312e80201471c4784457a36f50da Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:04:04 +0200 Subject: [PATCH 26/43] Translation update done using Pootle. --- po/fr.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 667261f2c..7c8f9543e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:02+0200\n" +"PO-Revision-Date: 2010-12-27 14:04+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -3146,7 +3146,9 @@ msgstr "Séparateur pour l'arborescence des bases de données" msgid "" "Only light version; display databases in a tree (determined by the separator " "defined below)" -msgstr "En affichage léger; déterminé par le séparateur)" +msgstr "" +"En affichage léger; afficher les bases de données en arborescence (déterminé " +"par le séparateur défini plus bas)" #: libraries/config/messages.inc.php:271 msgid "Display databases in a tree" From 834f4b8dd6735e0e92fa7a0e1148e1e9767b6fbd Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:04:28 +0200 Subject: [PATCH 27/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 7c8f9543e..f211241e4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3241,7 +3241,7 @@ msgid "" "Define whether the previous login should be recalled or not in cookie " "authentication mode" msgstr "" -"Sur le panneau de connexion (mode cookie ), le nom du précédent utilisateur " +"Sur le panneau de connexion du mode cookie, le nom du précédent utilisateur " "devrait-il apparaître?" #: libraries/config/messages.inc.php:290 From e4d77ec99e11ee207ee6bcf788e207d42c10f056 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:05:06 +0200 Subject: [PATCH 28/43] Translation update done using Pootle. --- po/fr.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index f211241e4..d03c0bce5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:04+0200\n" +"PO-Revision-Date: 2010-12-27 14:05+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -3255,10 +3255,10 @@ msgid "" "and will be deleted as soon as you close the browser window. This is " "recommended for non-trusted environments." msgstr "" -"Définit combien de secondes le cookie de connexion sera conservé dans le " -"fureteur. La valeur par défaut de 0 signifie qu'il ne sera conservé que pour " -"la session; ceci est recommandé si l'environnement n'est pas digne de " -"confiance." +"Définit pendant combien de temps (en secondes) le cookie de connexion sera " +"conservé dans le fureteur. La valeur par défaut de 0 signifie qu'il ne sera " +"conservé que pour la session; ceci est recommandé si l'environnement n'est " +"pas digne de confiance." #: libraries/config/messages.inc.php:292 msgid "Login cookie store" From 12279aaebe0ffedcc066566fdc739daec090f777 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:05:37 +0200 Subject: [PATCH 29/43] Translation update done using Pootle. --- po/fr.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index d03c0bce5..9321a4c9b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3266,7 +3266,8 @@ msgstr "Stockage du cookie" #: libraries/config/messages.inc.php:293 msgid "Define how long (in seconds) a login cookie is valid" -msgstr "Le nombre de secondes pendant lequel la connexion demeure valide" +msgstr "" +"Définit pendant combien de temps (en secondes) la connexion demeure valide" #: libraries/config/messages.inc.php:294 msgid "Login cookie validity" From 53cb832151ae20e5e2b85950b88e570f0b0badfb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:05:49 +0200 Subject: [PATCH 30/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 9321a4c9b..800113cbc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3271,7 +3271,7 @@ msgstr "" #: libraries/config/messages.inc.php:294 msgid "Login cookie validity" -msgstr "Durée de validité de la connexion (mode cookie)" +msgstr "Durée de validité de la connexion en mode cookie" #: libraries/config/messages.inc.php:295 msgid "Double size of textarea for LONGTEXT columns" From f3aa1a2ace92f0b4205de3c373b1e449b866d3be Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:06:35 +0200 Subject: [PATCH 31/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 800113cbc..52a4c38f8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:05+0200\n" +"PO-Revision-Date: 2010-12-27 14:06+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -3374,7 +3374,7 @@ msgstr "Ordre naturel" #: libraries/config/messages.inc.php:316 libraries/config/messages.inc.php:326 msgid "Use only icons, only text or both" -msgstr "Utiliser les icônes (true), du texte (false) ou les deux (both)" +msgstr "Afficher seulement des icônes, seulement du texte ou les deux" #: libraries/config/messages.inc.php:317 msgid "Iconic navigation bar" From f61dff6e8827e17b15577c3de0b2dc1792d71810 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:06:50 +0200 Subject: [PATCH 32/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 52a4c38f8..017bb373e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3440,8 +3440,8 @@ msgid "" "(lost by window close)." msgstr "" "Activer si vous désirez un historique permanent (nécessite le stockage de " -"configurations phpMyAdmin. Si désactivé, utilise Javascript pour afficher un " -"historique temporaire (sera perdu à la fermeture de la fenêtre)." +"configurations phpMyAdmin). Si désactivé, utilise Javascript pour afficher " +"un historique temporaire (sera perdu à la fermeture de la fenêtre)." #: libraries/config/messages.inc.php:331 msgid "Permanent query history" From 329432edeba2106ff4ab792b6c9264b74c6f60e3 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:07:05 +0200 Subject: [PATCH 33/43] Translation update done using Pootle. --- po/fr.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 017bb373e..14b936b02 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:06+0200\n" +"PO-Revision-Date: 2010-12-27 14:07+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -3540,9 +3540,7 @@ msgstr "Permettre une connexion à root" #: libraries/config/messages.inc.php:356 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" -"Domaine de protection (realm) à afficher lors d'une authentification HTTP " -"Basic" +msgstr "Domaine de protection à afficher lors d'une authentification HTTP Basic" #: libraries/config/messages.inc.php:357 msgid "HTTP Realm" From 51449c580587a18dcb75c7e228ab0c18c72f5399 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:07:34 +0200 Subject: [PATCH 34/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 14b936b02..d00bba202 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3594,7 +3594,7 @@ msgstr "Table pour informations sur les colonnes" #: libraries/config/messages.inc.php:366 msgid "Compress connection to MySQL server" -msgstr "(connexion au serveur MySQL)" +msgstr "Comprime la connexion au serveur MySQL" #: libraries/config/messages.inc.php:367 msgid "Compress connection" From 04279941304b5f9572f5c92919d41e2ed48e894b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:07:59 +0200 Subject: [PATCH 35/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index d00bba202..51447118a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3659,7 +3659,7 @@ msgstr "Empêcher l'accès à INFORMATION_SCHEMA" #: libraries/config/messages.inc.php:379 msgid "What PHP extension to use; you should use mysqli if supported" -msgstr "Quelle extension PHP utiliser (prenez mysqli si possible)" +msgstr "Quelle extension PHP utiliser; vous devriez choisir mysqli si possible" #: libraries/config/messages.inc.php:380 msgid "PHP extension to use" From 506631f04a58bc5d2918e89982ea07e18fe6f514 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:08:28 +0200 Subject: [PATCH 36/43] Translation update done using Pootle. --- po/fr.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 51447118a..98045a009 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:07+0200\n" +"PO-Revision-Date: 2010-12-27 14:08+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -3714,10 +3714,11 @@ msgid "" "alphabetical order." msgstr "" "Vous pouvez utiliser ces caractères passepartout MySQL (% et _), avec un " -"caractère d'échappement si vous les employez de manière littérale («ma" -"\\_base» et non «ma_base»). Ainsi vous pouvez trier la liste des bases de " -"données en entrant leurs noms et en utilisant [kbd]*[/kbd] en fin de liste " -"pour montrer le reste des noms de base de données en ordre alphabétique." +"caractère d'échappement si vous les employez de manière littérale, par " +"exemple «ma\\_base» et non «ma_base». Ainsi vous pouvez trier la liste des " +"bases de données en entrant leurs noms et en utilisant [kbd]*[/kbd] en fin " +"de liste pour montrer le reste des noms de base de données en ordre " +"alphabétique." #: libraries/config/messages.inc.php:391 msgid "Show only listed databases" From 97ff4126a185cb3a0a09e559c5c6273f984bc2be Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:09:02 +0200 Subject: [PATCH 37/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 98045a009..71aaf541a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:08+0200\n" +"PO-Revision-Date: 2010-12-27 14:09+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -4428,7 +4428,7 @@ msgstr "Le serveur ne répond pas" #: libraries/dbi/mysql.dbi.lib.php:357 libraries/dbi/mysqli.dbi.lib.php:411 msgid "(or the local MySQL server's socket is not correctly configured)" msgstr "" -"(ou l'interface de connexion (socket) vers le serveur MySQL local n'est pas " +"(ou l'interface de connexion vers le serveur MySQL local n'est pas " "correctement configurée)" #: libraries/dbi/mysql.dbi.lib.php:366 tbl_structure.php:700 From 7661ea07a7eb316e5fa374457e62e59d194405c6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:09:49 +0200 Subject: [PATCH 38/43] Translation update done using Pootle. --- po/fr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 71aaf541a..49f64cac6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4701,8 +4701,9 @@ msgid "" "however it can break transactions.)" msgstr "" "Permettre l'interruption de l'importation si la limite de temps configurée " -"dans PHP est sur le point d'être atteinte. Ceci pourrait aider à importer " -"des fichiers volumineux, au détriment du respect des transactions." +"dans PHP est sur le point d'être atteinte. (Ceci pourrait aider à " +"importer des fichiers volumineux, au détriment du respect des " +"transactions.)" #: libraries/display_import.lib.php:228 msgid "Number of rows to skip, starting from the first row:" From bc04ce72187fb6b8a870dc8967a414692cf61448 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:10:04 +0200 Subject: [PATCH 39/43] Translation update done using Pootle. --- po/fr.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 49f64cac6..9ff0bbe40 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:09+0200\n" +"PO-Revision-Date: 2010-12-27 14:10+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -4965,7 +4965,7 @@ msgid "" "The default pointer size in bytes, to be used by CREATE TABLE for MyISAM " "tables when no MAX_ROWS option is specified." msgstr "" -"La taille du pointeur (en octets) qui servira lors d'un CREATE TABLE sur une " +"La taille du pointeur en octets qui servira lors d'un CREATE TABLE sur une " "table MyISAM si aucune option MAX_ROWS n'est indiquée." #: libraries/engines/myisam.lib.php:27 From 6a505f123f28b56032b816934cca66bf106d4fd2 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:10:29 +0200 Subject: [PATCH 40/43] Translation update done using Pootle. --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr.po b/po/fr.po index 9ff0bbe40..76a6d83ed 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4965,7 +4965,7 @@ msgid "" "The default pointer size in bytes, to be used by CREATE TABLE for MyISAM " "tables when no MAX_ROWS option is specified." msgstr "" -"La taille du pointeur en octets qui servira lors d'un CREATE TABLE sur une " +"La taille en octets du pointeur qui servira lors d'un CREATE TABLE sur une " "table MyISAM si aucune option MAX_ROWS n'est indiquée." #: libraries/engines/myisam.lib.php:27 From 52dabea3a30d555fcaf2ebc264d817beaf02e3c1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Dec 2010 14:11:44 +0200 Subject: [PATCH 41/43] Translation update done using Pootle. --- po/fr.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index 76a6d83ed..13899aecb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-26 08:19-0500\n" -"PO-Revision-Date: 2010-12-27 14:10+0200\n" +"PO-Revision-Date: 2010-12-27 14:11+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -6487,7 +6487,8 @@ msgid "" "installed the necessary PHP extensions as described in the %sdocumentation%s." msgstr "" "Le validateur SQL n'a pas pu être initialisé. Vérifiez que les extensions " -"PHP nécessaires ont bien été installées (voir la %sdocumentation%s)." +"PHP nécessaires ont bien été installées tel que décrit dans la %" +"sdocumentation%s." #: libraries/tbl_links.inc.php:106 libraries/tbl_links.inc.php:107 msgid "Table seems to be empty!" From 62e17e3193e483dc0f4d90c0cb22cafd95068359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Dec 2010 13:17:09 +0100 Subject: [PATCH 42/43] Czech translation update. --- po/cs.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/po/cs.po b/po/cs.po index 1e5eae531..c84d30888 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-beta1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-27 07:14-0500\n" -"PO-Revision-Date: 2010-12-26 15:51+0100\n" +"PO-Revision-Date: 2010-12-27 13:17+0100\n" "Last-Translator: Michal Čihař \n" "Language-Team: czech \n" "MIME-Version: 1.0\n" @@ -617,8 +617,8 @@ msgstr "Sledování není zapnuté." #: db_structure.php:372 libraries/display_tbl.lib.php:1942 #, php-format msgid "" -"This view has at least this number of rows. Please refer to %sdocumentation%" -"s." +"This view has at least this number of rows. Please refer to %sdocumentation" +"%s." msgstr "" "Tento pohled má alespoň tolik řádek. Podrobnosti naleznete v %sdokumentaci%s." @@ -840,8 +840,8 @@ msgstr "Výpis byl uložen do souboru %s." #: import.php:58 #, php-format msgid "" -"You probably tried to upload too large file. Please refer to %sdocumentation%" -"s for ways to workaround this limit." +"You probably tried to upload too large file. Please refer to %sdocumentation" +"%s for ways to workaround this limit." msgstr "" "Pravděpodobně jste se pokusili nahrát příliš velký soubor. Přečtěte si " "prosím %sdokumentaci%s, jak toto omezení obejít." @@ -1606,8 +1606,8 @@ msgstr "Vítejte v %s" #: libraries/auth/config.auth.lib.php:106 #, php-format msgid "" -"You probably did not create a configuration file. You might want to use the %" -"1$ssetup script%2$s to create one." +"You probably did not create a configuration file. You might want to use the " +"%1$ssetup script%2$s to create one." msgstr "" "Pravděpodobná příčina je, že nemáte vytvořený konfigurační soubor. Pro jeho " "vytvoření by se vám mohl hodit %1$snastavovací skript%2$s." @@ -2078,7 +2078,7 @@ msgstr "Adresář určený pro upload souborů nemohl být otevřen" #: libraries/common.lib.php:2983 msgid "There are no files to upload" -msgstr "" +msgstr "Nebyl zvolen žádný soubor pro nahrání" #: libraries/config.values.php:95 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -4535,8 +4535,8 @@ msgstr ", @TABLE@ bude nahrazen jménem tabulky" #, php-format msgid "" "This value is interpreted using %1$sstrftime%2$s, so you can use time " -"formatting strings. Additionally the following transformations will happen: %" -"3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." +"formatting strings. Additionally the following transformations will happen: " +"%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" "Tato hodnota je interpretována pomocí %1$sstrftime%2$s, takže můžete použít " "libovolné řetězce pro formátování data a času. Dále budou provedena " @@ -6464,8 +6464,8 @@ msgid "" "For a list of available transformation options and their MIME type " "transformations, click on %stransformation descriptions%s" msgstr "" -"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na %" -"spopisy transformací%s" +"Pro seznam dostupných parametrů transformací a jejich MIME typů klikněte na " +"%spopisy transformací%s" #: libraries/tbl_properties.inc.php:143 msgid "Transformation options" @@ -6506,8 +6506,8 @@ msgid "" "No description is available for this transformation.
Please ask the " "author what %s does." msgstr "" -"Pro tuto transformaci není dostupný žádný popis.
Zeptejte se autora co %" -"s dělá." +"Pro tuto transformaci není dostupný žádný popis.
Zeptejte se autora co " +"%s dělá." #: libraries/tbl_properties.inc.php:725 server_engines.php:56 #: tbl_operations.php:352 @@ -7126,8 +7126,8 @@ msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." msgstr "" -"Více věcí můžete nastavit úpravou config.inc.php, např. použitím %" -"sNastavovacího skriptu%s." +"Více věcí můžete nastavit úpravou config.inc.php, např. použitím " +"%sNastavovacího skriptu%s." #: prefs_manage.php:302 msgid "Save to browser's storage" @@ -7575,8 +7575,8 @@ msgstr "Odstranit databáze se stejnými jmény jako uživatelé." msgid "" "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege " "tables. The content of these tables may differ from the privileges the " -"server uses, if they have been changed manually. In this case, you should %" -"sreload the privileges%s before you continue." +"server uses, if they have been changed manually. In this case, you should " +"%sreload the privileges%s before you continue." msgstr "" "Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto " "tabulek se může lišit od oprávnění, která server právě používá, pokud byly " @@ -9047,8 +9047,8 @@ msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." msgstr "" -"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie%" -"s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " +"Při použití přihlašování přes cookies a při %sUkládádání přihlašovaci cookie" +"%s vyšší než 0 musí být %sPlatnost přihlašovací cookie%s nastavena na vyšší " "hodnotu než je tato." #: setup/lib/index.lib.php:266 @@ -9059,8 +9059,8 @@ msgid "" "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." msgstr "" -"Pokud to považujete za nutné, použijte další možnosti zabezpečení - %" -"somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " +"Pokud to považujete za nutné, použijte další možnosti zabezpečení - " +"%somezení počítačů%s a %sseznam důvěryhodných proxy%s. Nicméně zabezpečení " "založené na IP adresách nemusí být spolehlivé, pokud je vaše IP adresa " "dynamicky přidělována poskytovatelem spolu s mnoha dalšími uživateli." From 8a8986d9da55d2ef7951f7fcb59ec7a01f9a8b63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Dec 2010 14:20:35 +0100 Subject: [PATCH 43/43] Update php-gettext to 1.0.11. There are two changes: - fix possible wrong result of npgettext - cosmetical renaming of some variables --- libraries/php-gettext/gettext.inc | 78 ++++++++++++++++--------------- libraries/php-gettext/gettext.php | 10 +++- 2 files changed, 48 insertions(+), 40 deletions(-) mode change 100644 => 100755 libraries/php-gettext/gettext.php diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc index 399a0f24b..00b966692 100644 --- a/libraries/php-gettext/gettext.inc +++ b/libraries/php-gettext/gettext.inc @@ -32,7 +32,6 @@ LC_MESSAGES 5 LC_ALL 6 */ - // LC_MESSAGES is not available if php-gettext is not loaded // while the other constants are already available from session extension. if (!defined('LC_MESSAGES')) { @@ -229,7 +228,9 @@ function _setlocale($category, $locale) { } // Allow locale to be changed on the go for one translation domain. global $text_domains, $default_domain; - unset($text_domains[$default_domain]->l10n); + if (array_key_exists($default_domain, $text_domains)) { + unset($text_domains[$default_domain]->l10n); + } return $CURRENTLOCALE; } } @@ -288,9 +289,9 @@ function __($msgid) { /** * Plural version of gettext. */ -function _ngettext($single, $plural, $number) { +function _ngettext($singular, $plural, $number) { $l10n = _get_reader(); - return _encode($l10n->ngettext($single, $plural, $number)); + return _encode($l10n->ngettext($singular, $plural, $number)); } /** @@ -304,9 +305,9 @@ function _dgettext($domain, $msgid) { /** * Plural version of dgettext. */ -function _dngettext($domain, $single, $plural, $number) { +function _dngettext($domain, $singular, $plural, $number) { $l10n = _get_reader($domain); - return _encode($l10n->ngettext($single, $plural, $number)); + return _encode($l10n->ngettext($singular, $plural, $number)); } /** @@ -319,9 +320,9 @@ function _dcgettext($domain, $msgid, $category) { /** * Plural version of dcgettext. */ -function _dcngettext($domain, $single, $plural, $number, $category) { +function _dcngettext($domain, $singular, $plural, $number, $category) { $l10n = _get_reader($domain, $category); - return _encode($l10n->ngettext($single, $plural, $number)); + return _encode($l10n->ngettext($singular, $plural, $number)); } /** @@ -405,29 +406,29 @@ function T_($msgid) { if (_check_locale_and_function()) return _($msgid); return __($msgid); } -function T_ngettext($single, $plural, $number) { +function T_ngettext($singular, $plural, $number) { if (_check_locale_and_function()) - return ngettext($single, $plural, $number); - else return _ngettext($single, $plural, $number); + return ngettext($singular, $plural, $number); + else return _ngettext($singular, $plural, $number); } function T_dgettext($domain, $msgid) { if (_check_locale_and_function()) return dgettext($domain, $msgid); else return _dgettext($domain, $msgid); } -function T_dngettext($domain, $single, $plural, $number) { +function T_dngettext($domain, $singular, $plural, $number) { if (_check_locale_and_function()) - return dngettext($domain, $single, $plural, $number); - else return _dngettext($domain, $single, $plural, $number); + return dngettext($domain, $singular, $plural, $number); + else return _dngettext($domain, $singular, $plural, $number); } function T_dcgettext($domain, $msgid, $category) { if (_check_locale_and_function()) return dcgettext($domain, $msgid, $category); else return _dcgettext($domain, $msgid, $category); } -function T_dcngettext($domain, $single, $plural, $number, $category) { +function T_dcngettext($domain, $singular, $plural, $number, $category) { if (_check_locale_and_function()) - return dcngettext($domain, $single, $plural, $number, $category); - else return _dcngettext($domain, $single, $plural, $number, $category); + return dcngettext($domain, $singular, $plural, $number, $category); + else return _dcngettext($domain, $singular, $plural, $number, $category); } function T_pgettext($context, $msgid) { @@ -451,26 +452,27 @@ function T_dcpgettext($domain, $context, $msgid, $category) { return _dcpgettext($domain, $context, $msgid, $category); } -function T_npgettext($context, $singular, $plural) { +function T_npgettext($context, $singular, $plural, $number) { if (_check_locale_and_function('npgettext')) - return npgettext($context, $single, $plural, $number); + return npgettext($context, $singular, $plural, $number); else - return _npgettext($context, $single, $plural, $number); + return _npgettext($context, $singular, $plural, $number); } -function T_dnpgettext($domain, $context, $singular, $plural) { +function T_dnpgettext($domain, $context, $singular, $plural, $number) { if (_check_locale_and_function('dnpgettext')) - return dnpgettext($domain, $context, $single, $plural, $number); + return dnpgettext($domain, $context, $singular, $plural, $number); else - return _dnpgettext($domain, $context, $single, $plural, $number); + return _dnpgettext($domain, $context, $singular, $plural, $number); } -function T_dcnpgettext($domain, $context, $singular, $plural, $category) { +function T_dcnpgettext($domain, $context, $singular, $plural, + $number, $category) { if (_check_locale_and_function('dcnpgettext')) - return dcnpgettext($domain, $context, $single, + return dcnpgettext($domain, $context, $singular, $plural, $number, $category); else - return _dcnpgettext($domain, $context, $single, + return _dcnpgettext($domain, $context, $singular, $plural, $number, $category); } @@ -494,39 +496,39 @@ if (!function_exists('gettext')) { function _($msgid) { return __($msgid); } - function ngettext($single, $plural, $number) { - return _ngettext($single, $plural, $number); + function ngettext($singular, $plural, $number) { + return _ngettext($singular, $plural, $number); } function dgettext($domain, $msgid) { return _dgettext($domain, $msgid); } - function dngettext($domain, $single, $plural, $number) { - return _dngettext($domain, $single, $plural, $number); + function dngettext($domain, $singular, $plural, $number) { + return _dngettext($domain, $singular, $plural, $number); } function dcgettext($domain, $msgid, $category) { return _dcgettext($domain, $msgid, $category); } - function dcngettext($domain, $single, $plural, $number, $category) { - return _dcngettext($domain, $single, $plural, $number, $category); + function dcngettext($domain, $singular, $plural, $number, $category) { + return _dcngettext($domain, $singular, $plural, $number, $category); } function pgettext($context, $msgid) { return _pgettext($context, $msgid); } - function npgettext($context, $single, $plural, $number) { - return _npgettext($context, $single, $plural, $number); + function npgettext($context, $singular, $plural, $number) { + return _npgettext($context, $singular, $plural, $number); } function dpgettext($domain, $context, $msgid) { return _dpgettext($domain, $context, $msgid); } - function dnpgettext($domain, $context, $single, $plural, $number) { - return _dnpgettext($domain, $context, $single, $plural, $number); + function dnpgettext($domain, $context, $singular, $plural, $number) { + return _dnpgettext($domain, $context, $singular, $plural, $number); } function dcpgettext($domain, $context, $msgid, $category) { return _dcpgettext($domain, $context, $msgid, $category); } - function dcnpgettext($domain, $context, $single, $plural, + function dcnpgettext($domain, $context, $singular, $plural, $number, $category) { - return _dcnpgettext($domain, $context, $single, $plural, + return _dcnpgettext($domain, $context, $singular, $plural, $number, $category); } } diff --git a/libraries/php-gettext/gettext.php b/libraries/php-gettext/gettext.php old mode 100644 new mode 100755 index 80d249709..5064047cb --- a/libraries/php-gettext/gettext.php +++ b/libraries/php-gettext/gettext.php @@ -418,8 +418,14 @@ class gettext_reader { } function npgettext($context, $singular, $plural, $number) { - $singular = $context . chr(4) . $singular; - return $this->ngettext($singular, $plural, $number); + $key = $context . chr(4) . $singular; + $ret = $this->ngettext($key, $plural, $number); + if (strpos($ret, "\004") !== FALSE) { + return $singular; + } else { + return $ret; + } + } }