The branch, master has been updated via 446657e543faac8fe7f03ee4891e0ff612253c5d (commit) via 792c0c90e4630ae4eba1147a12ae96be93c31f35 (commit) via 342afd751e8d7d9eaecfd822e3ec5051c93ef8f9 (commit) via 7467fac26bb5e848a4c84fd0c5db80d3b0e2645e (commit) via f0f351b5a54f8585e11cd3061cca5f9049f95207 (commit) via d98622702588719274446cbd1f568d76fc904db5 (commit) via 938aade65d4b5672d941268b0621b6209ac49833 (commit) from 4d9fd005671b05c4d74615d5939ed45e4d019e4c (commit)

- Log ----------------------------------------------------------------- commit 446657e543faac8fe7f03ee4891e0ff612253c5d Merge: 4d9fd005671b05c4d74615d5939ed45e4d019e4c 792c0c90e4630ae4eba1147a12ae96be93c31f35 Author: Michal Čihař mcihar@novell.com Date: Tue Dec 7 12:04:00 2010 +0100

Merge remote branch 'pootle/master'

Conflicts: po/fr.po

commit 792c0c90e4630ae4eba1147a12ae96be93c31f35 Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:03:00 2010 +0200

Translation update done using Pootle.

commit 342afd751e8d7d9eaecfd822e3ec5051c93ef8f9 Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:02:43 2010 +0200

Translation update done using Pootle.

commit 7467fac26bb5e848a4c84fd0c5db80d3b0e2645e Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:02:19 2010 +0200

Translation update done using Pootle.

commit f0f351b5a54f8585e11cd3061cca5f9049f95207 Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:02:12 2010 +0200

Translation update done using Pootle.

commit d98622702588719274446cbd1f568d76fc904db5 Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:02:00 2010 +0200

Translation update done using Pootle.

commit 938aade65d4b5672d941268b0621b6209ac49833 Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:01:51 2010 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/fr.po | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/po/fr.po b/po/fr.po index 54a0cb0..4c64d2e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ 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 05:59-0500\n" -"PO-Revision-Date: 2010-12-03 19:36+0200\n" +"PO-Revision-Date: 2010-12-07 13:03+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "MIME-Version: 1.0\n" @@ -7886,28 +7886,24 @@ msgid "Reset slave" msgstr "Réinitialiser l'esclave"

#: server_replication.php:326 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Start SQL Thread only" -msgstr "%s seulement le fil d'exécution SQL" +msgstr "Démarrer seulement le fil d'exécution SQL"

#: server_replication.php:328 -#, fuzzy #| msgid "SQL Thread %s only" msgid "Stop SQL Thread only" -msgstr "%s seulement le fil d'exécution SQL" +msgstr "Arrêter seulement le fil d'exécution SQL"

#: server_replication.php:331 -#, fuzzy #| msgid "IO Thread %s only" msgid "Start IO Thread only" -msgstr "%s seulement le fil d'exécution des entrées-sorties" +msgstr "Démarrer seulement le fil d'exécution des entrées-sorties"

#: server_replication.php:333 -#, fuzzy #| msgid "IO Thread %s only" msgid "Stop IO Thread only" -msgstr "%s seulement le fil d'exécution des entrées-sorties" +msgstr "Arrêter seulement le fil d'exécution des entrées-sorties"

#: server_replication.php:338 msgid "Error management:" @@ -8765,16 +8761,14 @@ msgid "Query type" msgstr "Type de requête"

#: server_status.php:709 server_status.php:710 -#, fuzzy #| msgid "Show query box" msgid "Show query chart" -msgstr "Montrer zone SQL" +msgstr "Afficher le graphique des requêtes"

#: server_status.php:714 server_status.php:715 -#, fuzzy #| msgid "Hide query box" msgid "Hide query chart" -msgstr "Cacher zone SQL" +msgstr "Cacher le graphique des requêtes"

#: server_status.php:717 msgid "Note: Generating the query chart can take a long time."

hooks/post-receive