The branch, master has been updated via c1608b6bd6ccc8a3f93e35cf32cf35b5fc97255c (commit) via f2ba09ac65252764427cf56307c44df0539eb370 (commit) via 30ee064e26bc1f3f1ce017666b0098cc923f5b47 (commit) via 31fc4aeba76e5ded187271ecc2c363b9a7b347ae (commit) via 8f34422f18741af8a13aba6326bef0fe8d95f3e0 (commit) via debeddb7df64b53698a7fb03e95139023d22ca47 (commit) via d267f44ef24e0d252bf59131c8d0a4bf899bc9c4 (commit) via 5351fe129795909e604f4fc47392759181ffff59 (commit) via 601e44aa0d7efd3ac8991d06f5668c4e9f4bf27c (commit) via 57b49731db9b98637d268559c692f060f7e7bfe3 (commit) via 6a60549ff390b1ccf9870c50f56be01be3608087 (commit) via 928e465ab1cd5b6631b56432f3faf5283a6b9486 (commit) via 55799d26c579178496bcb8134a621b227c7f0fdb (commit) via 14b2e056142d0a63018db9c90a32739235e79814 (commit) via cd67b6aaa9b661b5a4129ae36288ef8431927dfc (commit) via dc91c0a94c1471b7588bba32fcd2b01b773a76d4 (commit) via b11b50767efd00792b66b0ef9466ca90aef9bc36 (commit) via 22f54574d8983311a204d495dfc5f6dbdc88c2ab (commit) via 153b52efe7be00f1f2c86002375036cebf88fe65 (commit) via 5ad10fc78dd3f02852126f1130d7bf5de940048c (commit) via a7f77a81a4b4e73fbe943b2e27953edecb8d4773 (commit) via ffae916a7b46926acd7a2198f5f5b5743bf89082 (commit) via 79d44e9cd366ba0f398bbbdbcee6b7c99b798060 (commit) via e169b746e0aa2c7f964c18816fb3477360e46e45 (commit) via 1c3cec31cf021b3f3bfa2068082749e8372c0220 (commit) via de6020ef9baac83668f7362097483e97c633c419 (commit) via fee5cb15ec4038a96b9480042f20b663c74580c7 (commit) via 52cb0cb68ea7f5648fd8783eef4e99e5adcf4718 (commit) via a4aab78ae078445be7d059cfbfd688f255f84559 (commit) from 1bee5260eae82ef49acd9a6265794688450a5f6e (commit)
- Log ----------------------------------------------------------------- commit c1608b6bd6ccc8a3f93e35cf32cf35b5fc97255c Merge: 1bee526 f2ba09a Author: Michal Čihař mcihar@suse.cz Date: Mon Sep 19 15:53:54 2011 +0200
Merge remote-tracking branch 'pootle/master'
Conflicts: po/es.po po/fr.po
commit f2ba09ac65252764427cf56307c44df0539eb370 Author: Matías Bellone matiasbellone@gmail.com Date: Mon Sep 19 15:13:07 2011 +0200
Translation update done using Pootle.
commit 30ee064e26bc1f3f1ce017666b0098cc923f5b47 Author: Matías Bellone matiasbellone@gmail.com Date: Mon Sep 19 15:12:47 2011 +0200
Translation update done using Pootle.
commit 31fc4aeba76e5ded187271ecc2c363b9a7b347ae Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:09:02 2011 +0200
Translation update done using Pootle.
commit 8f34422f18741af8a13aba6326bef0fe8d95f3e0 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:07:27 2011 +0200
Translation update done using Pootle.
commit debeddb7df64b53698a7fb03e95139023d22ca47 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:06:48 2011 +0200
Translation update done using Pootle.
commit d267f44ef24e0d252bf59131c8d0a4bf899bc9c4 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:06:15 2011 +0200
Translation update done using Pootle.
commit 5351fe129795909e604f4fc47392759181ffff59 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:06:02 2011 +0200
Translation update done using Pootle.
commit 601e44aa0d7efd3ac8991d06f5668c4e9f4bf27c Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:04:09 2011 +0200
Translation update done using Pootle.
commit 57b49731db9b98637d268559c692f060f7e7bfe3 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:02:52 2011 +0200
Translation update done using Pootle.
commit 6a60549ff390b1ccf9870c50f56be01be3608087 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:02:26 2011 +0200
Translation update done using Pootle.
commit 928e465ab1cd5b6631b56432f3faf5283a6b9486 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:02:12 2011 +0200
Translation update done using Pootle.
commit 55799d26c579178496bcb8134a621b227c7f0fdb Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 15:01:53 2011 +0200
Translation update done using Pootle.
commit 14b2e056142d0a63018db9c90a32739235e79814 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:54:34 2011 +0200
Translation update done using Pootle.
commit cd67b6aaa9b661b5a4129ae36288ef8431927dfc Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:53:55 2011 +0200
Translation update done using Pootle.
commit dc91c0a94c1471b7588bba32fcd2b01b773a76d4 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:53:37 2011 +0200
Translation update done using Pootle.
commit b11b50767efd00792b66b0ef9466ca90aef9bc36 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:53:11 2011 +0200
Translation update done using Pootle.
commit 22f54574d8983311a204d495dfc5f6dbdc88c2ab Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:52:26 2011 +0200
Translation update done using Pootle.
commit 153b52efe7be00f1f2c86002375036cebf88fe65 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:51:49 2011 +0200
Translation update done using Pootle.
commit 5ad10fc78dd3f02852126f1130d7bf5de940048c Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:43:21 2011 +0200
Translation update done using Pootle.
commit a7f77a81a4b4e73fbe943b2e27953edecb8d4773 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:42:38 2011 +0200
Translation update done using Pootle.
commit ffae916a7b46926acd7a2198f5f5b5743bf89082 Merge: 79d44e9 483ec3b Author: Pootle server pootle@cihar.com Date: Mon Sep 19 14:40:22 2011 +0200
Merge remote-tracking branch 'origin/master'
commit 79d44e9cd366ba0f398bbbdbcee6b7c99b798060 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:39:06 2011 +0200
Translation update done using Pootle.
commit e169b746e0aa2c7f964c18816fb3477360e46e45 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:29:56 2011 +0200
Translation update done using Pootle.
commit 1c3cec31cf021b3f3bfa2068082749e8372c0220 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:29:43 2011 +0200
Translation update done using Pootle.
commit de6020ef9baac83668f7362097483e97c633c419 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:29:11 2011 +0200
Translation update done using Pootle.
commit fee5cb15ec4038a96b9480042f20b663c74580c7 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:28:22 2011 +0200
Translation update done using Pootle.
commit 52cb0cb68ea7f5648fd8783eef4e99e5adcf4718 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:19:21 2011 +0200
Translation update done using Pootle.
commit a4aab78ae078445be7d059cfbfd688f255f84559 Author: Marc Delisle marc@infomarc.info Date: Mon Sep 19 14:19:05 2011 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/es.po | 7 ++--- po/fr.po | 73 +++++++++++++++++++++++++++++++++---------------------------- 2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/po/es.po b/po/es.po index 03ffba7..a22f89d 100644 --- a/po/es.po +++ b/po/es.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-09-19 08:41-0400\n" -"PO-Revision-Date: 2011-09-17 17:48+0200\n" +"PO-Revision-Date: 2011-09-19 15:13+0200\n" "Last-Translator: Matías Bellone matiasbellone@gmail.com\n" "Language-Team: spanish es@li.org\n" "MIME-Version: 1.0\n" @@ -1681,7 +1681,7 @@ msgstr "OK"
#: js/messages.php:217 msgid "Click to dismiss this notification" -msgstr "" +msgstr "Pulse para descartar esta notificación"
#: js/messages.php:220 msgid "Renaming Databases" @@ -4943,7 +4943,6 @@ msgid "Automatically create versions" msgstr "Crear versiones automáticamente"
#: libraries/config/messages.inc.php:443 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -4952,7 +4951,7 @@ msgid "" "pma_userconfig[/kbd]" msgstr "" "Deje en blanco para eliminar soporte de almacenamiento de preferencias en " -"base de datos, valor sugerido : [kbd]pma_config[/kbd]" +"base de datos, valor sugerido : [kbd]pma_userconfig[/kbd]"
#: libraries/config/messages.inc.php:444 msgid "User preferences storage table" diff --git a/po/fr.po b/po/fr.po index 87c50fa..a8bcf87 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-09-19 08:41-0400\n" -"PO-Revision-Date: 2011-09-13 18:57+0200\n" +"PO-Revision-Date: 2011-09-19 15:09+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\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"
@@ -1673,7 +1673,7 @@ msgstr "OK"
#: js/messages.php:217 msgid "Click to dismiss this notification" -msgstr "" +msgstr "Cliquer pour éliminer ce message"
#: js/messages.php:220 msgid "Renaming Databases" @@ -4905,7 +4905,6 @@ msgid "Automatically create versions" msgstr "Création automatique de versions"
#: libraries/config/messages.inc.php:443 -#, fuzzy #| msgid "" #| "Leave blank for no user preferences storage in database, suggested: [kbd]" #| "pma_config[/kbd]" @@ -4914,7 +4913,7 @@ msgid "" "pma_userconfig[/kbd]" msgstr "" "Laisser vider pour désactiver les préférences utilisateur, valeur suggérée : " -"[kbd]pma_config[/kbd]" +"[kbd]pma_userconfig[/kbd]"
#: libraries/config/messages.inc.php:444 msgid "User preferences storage table" @@ -6555,7 +6554,6 @@ msgid "Add statements:" msgstr "Ajouter les énoncés :"
#: libraries/export/sql.php:211 -#, fuzzy #| msgid "" #| "Enclose table and field names with backquotes <i>(Protects field and " #| "table names formed with special characters or keywords)</i>" @@ -6563,8 +6561,8 @@ msgid "" "Enclose table and column names with backquotes <i>(Protects column and table " "names formed with special characters or keywords)</i>" msgstr "" -"Entourer les noms des tables et des colonnes par des guillemets obliques <i>" -"(Protège les noms de tables et de colonnes comportant des caractères " +"Entourer les noms des tables et des colonnes par des guillemets obliques " +"<i>(Protège les noms de tables et de colonnes comportant des caractères " "spéciaux ou des mots réservés)</i>"
#: libraries/export/sql.php:231 @@ -11661,10 +11659,9 @@ msgid "Show more actions" msgstr "Montrer d'autres actions"
#: tbl_structure.php:606 -#, fuzzy #| msgid "Print view" msgid "Edit view" -msgstr "Version imprimable" +msgstr "Modifier la vue"
#: tbl_structure.php:623 msgid "Relation view" @@ -11848,36 +11845,30 @@ msgid "Create version" msgstr "Créer une version"
#: tbl_zoom_select.php:135 -#, fuzzy -#| msgid "Do a "query by example" (wildcard: "%")" msgid "Do a "query by example" (wildcard: "%") for two different columns" -msgstr "Recherche «par valeur» (passepartout: «% ») " +msgstr "" +"Faites une recherche «par valeur» (passepartout: «% ») sur deux colonnes " +"différentes"
#: tbl_zoom_select.php:145 -#, fuzzy -#| msgid "Hide search criteria" msgid "Additional search criteria" -msgstr "Cacher les critères de recherche" +msgstr "Critères de recherche supplémentaires"
#: tbl_zoom_select.php:276 msgid "Use this column to label each point" msgstr ""
#: tbl_zoom_select.php:296 -#, fuzzy -#| msgid "Maximum number of rows to display" msgid "Maximum rows to plot" -msgstr "Nombre maximum de lignes à afficher" +msgstr "Nombre maximum de lignes de données à utiliser pour le graphique"
#: tbl_zoom_select.php:410 msgid "Browse/Edit the points" -msgstr "" +msgstr "Afficher/Modifier les points"
#: tbl_zoom_select.php:417 -#, fuzzy -#| msgid "Control user" msgid "How to use" -msgstr "Utilisateur de contrôle" +msgstr "Consignes d'utilisation"
#: themes.php:28 msgid "Get more themes!" @@ -11921,79 +11912,89 @@ msgstr "Changer le nom de la vue pour"
#: po/advisory_rules.php:5 msgid "Uptime below one day" -msgstr "" +msgstr "Le temps de disponibilité est inférieur à un jour"
#: po/advisory_rules.php:6 msgid "Uptime is less than 1 day, performance tuning may not be accurate." -msgstr "" +msgstr "Les informations de réglage peuvent être inexactes."
#: po/advisory_rules.php:7 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" msgstr "" +"Pour obtenir de meilleurs résultats, il est recommandé de laisser le serveur " +"en marche plus d'un jour avant d'utiliser l'analyseur."
#: po/advisory_rules.php:8 #, php-format msgid "The uptime is only %s" -msgstr "" +msgstr "Le temps de disponibilité n'est que %s."
#: po/advisory_rules.php:10 -#, fuzzy #| msgid "Questions" msgid "Questions below 1,000" -msgstr "Questions" +msgstr "Moins de 1000 questions"
#: po/advisory_rules.php:11 msgid "" "Fewer than 1,000 questions have been run against this server. The " "recommendations may not be accurate." msgstr "" +"Moins de 1000 questions ont été traitées par ce serveur. Les recommandations " +"peuvent être inexactes."
#: po/advisory_rules.php:12 msgid "" "Let the server run for a longer time until it has executed a greater amount " "of queries." msgstr "" +"Laissez le serveur fonctionner plus longtemps jusqu'à ce qu'il ait traité un " +"plus grand nombre de requêtes."
#: po/advisory_rules.php:13 -#, fuzzy, php-format +#, php-format #| msgid "Current connection" msgid "Current amount of Questions: %s" -msgstr "Connexion actuelle" +msgstr "Nombre actuel de questions: %s"
#: po/advisory_rules.php:15 -#, fuzzy #| msgid "Show SQL queries" msgid "Percentage of slow queries" -msgstr "Afficher les requêtes SQL" +msgstr "Pourcentage de requêtes lentes"
#: po/advisory_rules.php:16 msgid "" "There is a lot of slow queries compared to the overall amount of Queries." msgstr "" +"Il y a un grand nombre de requêtes lentes par rapport au nombre total de " +"requêtes."
#: po/advisory_rules.php:17 po/advisory_rules.php:22 msgid "" "You might want to increase {long_query_time} or optimize the queries listed " "in the slow query log" msgstr "" +"Veuillez augmenter la valeur du paramètre {long_query_time} ou optimiser les " +"requêtes qui apparaissent dans le journal de requêtes lentes."
#: po/advisory_rules.php:18 #, php-format msgid "The slow query rate should be below 5%%, your value is %s%%." msgstr "" +"Le taux de requêtes lentes devrait être sous 5%%, dans votre cas c'est %s%%."
#: po/advisory_rules.php:20 -#, fuzzy #| msgid "Flush query cache" msgid "Slow query rate" -msgstr "Vider la cache des requêtes" +msgstr "Taux de requêtes lentes"
#: po/advisory_rules.php:21 msgid "" "There is a high percentage of slow queries compared to the server uptime." msgstr "" +"Le pourcentage de requêtes lentes par rapport au temps de disponibilité du " +"serveur est élevé."
#: po/advisory_rules.php:23 #, php-format @@ -12001,6 +12002,8 @@ msgid "" "You have a slow query rate of %s per hour, you should have less than 1%% per " "hour." msgstr "" +"Le taux de requêtes lentes est de %s par heure, vous devriez en avoir moins " +"de 1%% par heure."
#: po/advisory_rules.php:25 #, fuzzy @@ -12013,6 +12016,8 @@ msgid "" "long_query_time is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." msgstr "" +"Le paramètre long_query_time est de 10 secondes ou plus, donc seules les " +"requêtes lentes prenant plus de 10 secondes sont mises au journal."
#: po/advisory_rules.php:27 msgid ""
hooks/post-receive
-
Michal Čihař