The branch, master has been updated via 2cad4eaae881da53a2b6a5dd203efdbe472eaf46 (commit) via 6d2ccdfdf8e2f5bd1d34b0cf6c1031cfb7a4cd46 (commit) from 3a5203e33e529190e7afd875f9bde094f4eee4a2 (commit)

- Log ----------------------------------------------------------------- commit 2cad4eaae881da53a2b6a5dd203efdbe472eaf46 Merge: 6d2ccdf 3a5203e Author: Pootle server pootle@cihar.com Date: Tue Jan 24 18:40:28 2012 +0100

Merge remote-tracking branch 'origin/master'

commit 6d2ccdfdf8e2f5bd1d34b0cf6c1031cfb7a4cd46 Author: Marc Delisle marc@infomarc.info Date: Tue Jan 24 12:18:46 2012 +0200

Translation update done using Pootle.

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

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

diff --git a/po/fr.po b/po/fr.po index ac9d2f4..4e33dea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-beta1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-01-22 04:34-0500\n" -"PO-Revision-Date: 2012-01-21 14:01+0200\n" +"PO-Revision-Date: 2012-01-24 12:17+0200\n" "Last-Translator: Marc Delisle marc@infomarc.info\n" "Language-Team: french fr@li.org\n" "Language: fr\n" @@ -7535,7 +7535,7 @@ msgstr "Définition"

#: libraries/rte/rte_events.lib.php:471 msgid "On completion preserve" -msgstr "À la fin, préserver" +msgstr "Suite à l'exécution, conserver"

#: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:933 #: libraries/rte/rte_triggers.lib.php:360

hooks/post-receive