Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

This commit is contained in:
Marc Delisle 2013-07-14 07:42:32 -04:00
commit ddbdc6e16c
2 changed files with 8 additions and 9 deletions

View File

@ -4,10 +4,9 @@ msgstr ""
"Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
"PO-Revision-Date: 2013-07-12 15:29+0200\n"
"PO-Revision-Date: 2013-07-14 01:43+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/master/fr/"
">\n"
"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/master/fr/>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -1668,7 +1667,7 @@ msgstr "Ajouter %d valeur(s)"
#: js/messages.php:259
msgid ""
"Note: If the file contains multiple tables, they will be combined into one."
msgstr "Note : si le fichier contient plusieurs tables, elles seront combinées"
msgstr "Note : si le fichier contient plusieurs tables, elles seront combinées."
#: js/messages.php:262
msgid "Hide query box"
@ -2848,7 +2847,7 @@ msgstr "La clé primaire a été effacée"
#: libraries/Index.class.php:608
#, php-format
msgid "Index %s has been dropped."
msgstr "L'index %s a été effacé"
msgstr "L'index %s a été effacé."
#: libraries/Index.class.php:731
#, php-format
@ -3829,7 +3828,7 @@ msgstr ""
#: libraries/Util.class.php:3441 libraries/insert_edit.lib.php:1183
#: libraries/sql_query_form.lib.php:483
msgid "The directory you set for upload work cannot be reached."
msgstr "Le répertoire de transfert est inaccessible"
msgstr "Le répertoire de transfert est inaccessible."
#: libraries/Util.class.php:3452
msgid "There are no files to upload"
@ -8015,7 +8014,7 @@ msgstr "Le fichier %s ne contient pas d'identifiant de clé"
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:176
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:196
msgid "Hardware authentication failed!"
msgstr "L'authentification matérielle a échoué"
msgstr "L'authentification matérielle a échoué !"
#: libraries/plugins/auth/swekey/swekey.auth.lib.php:183
msgid "No valid authentication key plugged"

View File

@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
"PO-Revision-Date: 2013-07-12 20:53+0200\n"
"PO-Revision-Date: 2013-07-14 12:36+0200\n"
"Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
"Language-Team: Turkish "
"<http://l10n.cihar.com/projects/phpmyadmin/master/tr/>\n"
@ -3932,7 +3932,7 @@ msgstr "%s %s veya sonrasına yükseltmelisiniz."
#: libraries/common.inc.php:1075
msgid "Error: Token mismatch"
msgstr "Hata: Belirti uyuşmazlığı"
msgstr "Hata: Belirt uyuşmazlığı"
#: libraries/common.inc.php:1119
msgid "GLOBALS overwrite attempt"