The branch, master has been updated via af33ed507185e32cf7ff9ceed301a0423259232b (commit) via a30826f8b5dd64da81dedf38aecbb9bcfb511c9b (commit) via cb34bad7e97661ebc95b8c05364be3661e59e76a (commit) via f51afe09ce22641a1c671be1965f3b315976abcc (commit) via 327982273337df84c7be830231a11634f2c0652d (commit) via 36508eb4853ad9fe9adf9950e5860eb1c0c3bbe1 (commit) via d8c1eaf53139c3eec8a121a79f6c515e5fc13185 (commit) via 3218db99f9e885d1516a686a8ad4944c19395f01 (commit) via 842d07a6e48697f315705e7712992bef9d728069 (commit) via 3c09b3bfb2f5f21c6622844a295eedae99b11e4c (commit) via 4403fd5713c8d25969d4808878a593d2a4706019 (commit) via 27dae5449489f4976d421b8a47555f26589b4733 (commit) via 819ff6a87c404883db4f04f24b9948943d961aea (commit) via 2a2fda69ccfbc9673bbc79671a5223c4f36c976f (commit) via d6ae7c68a81862decefab2f6b28651a35c127885 (commit) via 51b627f6c56643a413ef73d9aee795bceaa2bed2 (commit) via c9609af3653e064200dff722190e8a0200d8f516 (commit) via 46dfd7e055c3ebcc1f700784267ed263f4dbe6e3 (commit) via e0be79388ab982ff2b0ab98f339743f6e1d712bb (commit) via 959da9c16875fe9833efa0985e51ed4e0bab1327 (commit) via 53a8c871b1393414e1dcdd9a5776789eabdd5c43 (commit) from b70efd36b8c734c96296dd4acb61872ebe45c0c2 (commit)
- Log ----------------------------------------------------------------- commit af33ed507185e32cf7ff9ceed301a0423259232b Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:48:10 2010 +0200
Translation update done using Pootle.
commit a30826f8b5dd64da81dedf38aecbb9bcfb511c9b Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:48:02 2010 +0200
Translation update done using Pootle.
commit cb34bad7e97661ebc95b8c05364be3661e59e76a Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:54 2010 +0200
Translation update done using Pootle.
commit f51afe09ce22641a1c671be1965f3b315976abcc Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:47 2010 +0200
Translation update done using Pootle.
commit 327982273337df84c7be830231a11634f2c0652d Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:42 2010 +0200
Translation update done using Pootle.
commit 36508eb4853ad9fe9adf9950e5860eb1c0c3bbe1 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:35 2010 +0200
Translation update done using Pootle.
commit d8c1eaf53139c3eec8a121a79f6c515e5fc13185 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:27 2010 +0200
Translation update done using Pootle.
commit 3218db99f9e885d1516a686a8ad4944c19395f01 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:17 2010 +0200
Translation update done using Pootle.
commit 842d07a6e48697f315705e7712992bef9d728069 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:10 2010 +0200
Translation update done using Pootle.
commit 3c09b3bfb2f5f21c6622844a295eedae99b11e4c Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:47:01 2010 +0200
Translation update done using Pootle.
commit 4403fd5713c8d25969d4808878a593d2a4706019 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:46:52 2010 +0200
Translation update done using Pootle.
commit 27dae5449489f4976d421b8a47555f26589b4733 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:46:44 2010 +0200
Translation update done using Pootle.
commit 819ff6a87c404883db4f04f24b9948943d961aea Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:46:35 2010 +0200
Translation update done using Pootle.
commit 2a2fda69ccfbc9673bbc79671a5223c4f36c976f Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:46:25 2010 +0200
Translation update done using Pootle.
commit d6ae7c68a81862decefab2f6b28651a35c127885 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:45:30 2010 +0200
Translation update done using Pootle.
commit 51b627f6c56643a413ef73d9aee795bceaa2bed2 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:45:18 2010 +0200
Translation update done using Pootle.
commit c9609af3653e064200dff722190e8a0200d8f516 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:45:07 2010 +0200
Translation update done using Pootle.
commit 46dfd7e055c3ebcc1f700784267ed263f4dbe6e3 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:44:53 2010 +0200
Translation update done using Pootle.
commit e0be79388ab982ff2b0ab98f339743f6e1d712bb Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:44:39 2010 +0200
Translation update done using Pootle.
commit 959da9c16875fe9833efa0985e51ed4e0bab1327 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:44:21 2010 +0200
Translation update done using Pootle.
commit 53a8c871b1393414e1dcdd9a5776789eabdd5c43 Author: Marc Delisle marc@infomarc.info Date: Wed Dec 8 12:43:54 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes: po/en_GB.po | 47 ++++++++++++++++++----------------------------- po/fr.po | 21 ++++++++------------- 2 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po index e83bf9e..8e15b5f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-07 09:47-0500\n" -"PO-Revision-Date: 2010-12-03 19:38+0200\n" +"PO-Revision-Date: 2010-12-08 12:48+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: english-gb en_GB@li.org\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"
@@ -3091,10 +3091,9 @@ msgid "Display servers selection" msgstr "Display servers selection"
#: libraries/config/messages.inc.php:267 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Minimum number of tables to display the table filter box" -msgstr "Maximum number of tables displayed in table list" +msgstr "Minimum number of tables to display the table filter box"
#: libraries/config/messages.inc.php:268 msgid "String that separates databases into different tree levels" @@ -4426,38 +4425,35 @@ msgid "Could not load export plugins, please check your installation!" msgstr "Could not load export plug-ins, please check your installation!"
#: libraries/display_export.lib.php:87 -#, fuzzy #| msgid "Exporting databases in the current server" msgid "Exporting databases from the current server" -msgstr "Exporting databases in the current server" +msgstr "Exporting databases from the current server"
#: libraries/display_export.lib.php:89 -#, fuzzy, php-format +#, php-format #| msgid "Exporting tables in the database "%s"" msgid "Exporting tables from "%s" database" -msgstr "Exporting tables in the database "%s"" +msgstr "Exporting tables from "%s" database"
#: libraries/display_export.lib.php:91 -#, fuzzy, php-format +#, php-format #| msgid "Exporting rows in the table "%s"" msgid "Exporting rows from "%s" table" -msgstr "Exporting rows in the table "%s"" +msgstr "Exporting rows from "%s" table"
#: libraries/display_export.lib.php:97 msgid "Export Method:" msgstr "Export Method:"
#: libraries/display_export.lib.php:113 -#, fuzzy #| msgid "Quick - display only the minimal options to configure" msgid "Quick - display only the minimal options" -msgstr "Quick - display only the minimal options to configure" +msgstr "Quick - display only the minimal options"
#: libraries/display_export.lib.php:129 -#, fuzzy #| msgid "Custom - display all possible options to configure" msgid "Custom - display all possible options" -msgstr "Custom - display all possible options to configure" +msgstr "Custom - display all possible options"
#: libraries/display_export.lib.php:137 msgid "Database(s):" @@ -4564,10 +4560,9 @@ msgid "Format:" msgstr "Format:"
#: libraries/display_export.lib.php:336 -#, fuzzy #| msgid "Format-Specific Options:" msgid "Format-specific options:" -msgstr "Format-Specific Options:" +msgstr "Format-specific options:"
#: libraries/display_export.lib.php:345 libraries/display_import.lib.php:260 msgid "Encoding Conversion:" @@ -7797,28 +7792,24 @@ msgid "Reset slave" msgstr "Reset slave"
#: server_replication.php:326 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Start SQL Thread only" -msgstr "SQL Thread %s only" +msgstr "Start SQL Thread only"
#: server_replication.php:328 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Stop SQL Thread only" -msgstr "SQL Thread %s only" +msgstr "Stop SQL Thread only"
#: server_replication.php:331 -#, fuzzy #| msgid "IO Thread %s only" msgid "Start IO Thread only" -msgstr "IO Thread %s only" +msgstr "Start IO Thread only"
#: server_replication.php:333 -#, fuzzy #| msgid "IO Thread %s only" msgid "Stop IO Thread only" -msgstr "IO Thread %s only" +msgstr "Stop IO Thread only"
#: server_replication.php:338 msgid "Error management:" @@ -8653,20 +8644,18 @@ msgid "Query type" msgstr "Query type"
#: server_status.php:709 server_status.php:710 -#, fuzzy #| msgid "Show query box" msgid "Show query chart" -msgstr "Show query box" +msgstr "Show query chart"
#: server_status.php:714 server_status.php:715 -#, fuzzy #| msgid "Hide query box" msgid "Hide query chart" -msgstr "Hide query box" +msgstr "Hide query chart"
#: server_status.php:717 msgid "Note: Generating the query chart can take a long time." -msgstr "" +msgstr "Note: Generating the query chart can take a long time."
#: server_status.php:855 msgid "Replication status" diff --git a/po/fr.po b/po/fr.po index 09efb59..36d1068 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-alpha3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-12-07 09:47-0500\n" -"PO-Revision-Date: 2010-12-07 13:03+0200\n" +"PO-Revision-Date: 2010-12-08 12:45+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"
@@ -3123,10 +3123,9 @@ msgid "Display servers selection" msgstr "Affiche la liste des serveurs"
#: libraries/config/messages.inc.php:267 -#, fuzzy #| msgid "Maximum number of tables displayed in table list" msgid "Minimum number of tables to display the table filter box" -msgstr "Nombre maximum de tables affichées dans la liste des tables" +msgstr "Nombre minimum de tables pour afficher la boîte de filtre de table"
#: libraries/config/messages.inc.php:268 msgid "String that separates databases into different tree levels" @@ -4479,19 +4478,18 @@ msgid "Could not load export plugins, please check your installation!" msgstr "Erreur lors du chargement des modules d'exportation !"
#: libraries/display_export.lib.php:87 -#, fuzzy #| msgid "Exporting databases in the current server" msgid "Exporting databases from the current server" -msgstr "Exportation des bases de données du serveur actuel" +msgstr "Exportation des bases de données depuis le serveur courant"
#: libraries/display_export.lib.php:89 -#, fuzzy, php-format +#, php-format #| msgid "Exporting tables in the database "%s"" msgid "Exporting tables from "%s" database" -msgstr "Exportation des tables dans la base de données «%s»" +msgstr "Exportation des tables depuis la base de données «%s»"
#: libraries/display_export.lib.php:91 -#, fuzzy, php-format +#, php-format #| msgid "Exporting rows in the table "%s"" msgid "Exporting rows from "%s" table" msgstr "Exportation des lignes de la table «%s»" @@ -4501,13 +4499,11 @@ msgid "Export Method:" msgstr "Méthode d'exportation:"
#: libraries/display_export.lib.php:113 -#, fuzzy #| msgid "Quick - display only the minimal options to configure" msgid "Quick - display only the minimal options" -msgstr "Rapide - n'afficher qu'un minimum d'options à configurer" +msgstr "Rapide - n'afficher qu'un minimum d'options"
#: libraries/display_export.lib.php:129 -#, fuzzy #| msgid "Custom - display all possible options to configure" msgid "Custom - display all possible options" msgstr "Personnalisée - afficher toutes les options possibles" @@ -4618,7 +4614,6 @@ msgid "Format:" msgstr "Format:"
#: libraries/display_export.lib.php:336 -#, fuzzy #| msgid "Format-Specific Options:" msgid "Format-specific options:" msgstr "Options spécifiques au format:"
hooks/post-receive