The branch, master has been updated via e7547794e5a8badd79eda3d03f8af40d80d6783c (commit) via 2bdce6de130cfdf38990c2fa464b391cf13717bf (commit) via 4cc7bc87a9edcc70f67839da5ea25eac9a573239 (commit) from aa6fec0532a9dd48d4e35831c1b1c9785c124dd7 (commit)

- Log ----------------------------------------------------------------- commit e7547794e5a8badd79eda3d03f8af40d80d6783c Merge: aa6fec0532a9dd48d4e35831c1b1c9785c124dd7 2bdce6de130cfdf38990c2fa464b391cf13717bf Author: Michal Čihař mcihar@novell.com Date: Tue Dec 7 13:35:11 2010 +0100

Merge remote branch 'pootle/master'

commit 2bdce6de130cfdf38990c2fa464b391cf13717bf Merge: 4cc7bc87a9edcc70f67839da5ea25eac9a573239 bef58c45190f73bb3572122aa3d092677bc6affd Author: Pootle server pootle@cihar.com Date: Tue Dec 7 12:40:11 2010 +0100

Merge remote branch 'origin/master'

commit 4cc7bc87a9edcc70f67839da5ea25eac9a573239 Author: Marc Delisle marc@infomarc.info Date: Tue Dec 7 13:03:37 2010 +0200

Translation update done using Pootle.

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

Summary of changes: po/fr.po | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/po/fr.po b/po/fr.po index 4c64d2e..a3d986b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8773,6 +8773,8 @@ msgstr "Cacher le graphique des requêtes" #: server_status.php:717 msgid "Note: Generating the query chart can take a long time." msgstr "" +"Remarque : la génération du graphique des requêtes peut prendre un certain " +"temps."

#: server_status.php:855 msgid "Replication status"

hooks/post-receive