The branch, master has been updated via de4f571a7ff69f831f75476eb9f266ce2901c836 (commit) via a4df15ba03cb669e5a8fb8d7e527308a102cc9d1 (commit) from 9f4dc046919871544b5fa4503d78d11c04049d23 (commit) - Log ----------------------------------------------------------------- commit de4f571a7ff69f831f75476eb9f266ce2901c836 Merge: 9f4dc046919871544b5fa4503d78d11c04049d23 a4df15ba03cb669e5a8fb8d7e527308a102cc9d1 Author: Michal Čihař <mcihar@novell.com> Date: Fri Nov 5 11:39:16 2010 +0100 Merge remote branch 'pootle/master' commit a4df15ba03cb669e5a8fb8d7e527308a102cc9d1 Author: Marc Delisle <marc@infomarc.info> Date: Thu Nov 4 18:59:30 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/fr.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7184364..6a336a5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2010-11-03 12:13-0400\n" -"PO-Revision-Date: 2010-11-03 14:05+0200\n" +"PO-Revision-Date: 2010-11-04 18:59+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" @@ -6868,9 +6868,9 @@ msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." msgstr "" -"La durée du stockage du cookie sur le serveur est plus petite que la durée " -"du cookie configurée dans phpMyAdmin; donc, votre session de travail " -"expirera plus tôt." +"La valeur du paramètre LoginCookieStore est plus petite que la valeur de " +"LoginCookieValidity; donc, votre session de travail expirera plus tôt que la " +"valeur configurée dans phpMyAdmin." #: main.php:287 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." hooks/post-receive -- phpMyAdmin