From 34da741fbb6c8d4993b66e0604772a8156ea1adf Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 31 Jul 2015 12:25:48 +0200 Subject: [PATCH 1/7] Translated using Weblate (French) Currently translated at 99.8% (3190 of 3194 strings) [CI skip] --- po/fr.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/fr.po b/po/fr.po index 45aae7009d..2e70234c0d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-23 03:54-0700\n" -"PO-Revision-Date: 2015-07-30 13:52+0200\n" +"PO-Revision-Date: 2015-07-31 12:25+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: French " "\n" @@ -14031,17 +14031,16 @@ msgstr "Début d'énoncé non attendu." #: libraries/sql-parser/src/Parser.php:370 msgid "Unrecognized statement type." -msgstr "" +msgstr "Type d'énoncé non reconnu." #: libraries/sql-parser/src/Statement.php:201 -#, fuzzy #| msgid "Unexpected characters on line %s." msgid "Unexpected token." -msgstr "Caractères imprévus à la ligne %s." +msgstr "Jeton inattendu." #: libraries/sql-parser/src/Statement.php:251 msgid "Unrecognized keyword." -msgstr "" +msgstr "Mot clé non reconnu." #: libraries/sql-parser/src/Statements/CreateStatement.php:293 #, fuzzy From dea0956fab866ddd04e7b1d29f171a1f21515356 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 31 Jul 2015 12:28:38 +0200 Subject: [PATCH 2/7] Translated using Weblate (French) Currently translated at 99.8% (3190 of 3194 strings) [CI skip] --- po/fr.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 2e70234c0d..9e55909722 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-07-23 03:54-0700\n" -"PO-Revision-Date: 2015-07-31 12:25+0200\n" +"PO-Revision-Date: 2015-07-31 12:28+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: French " "\n" @@ -3058,7 +3058,7 @@ msgstr "Règle invalide à la ligne %s." #: libraries/Advisor.class.php:423 #, php-format msgid "Unexpected characters on line %s." -msgstr "Caractères imprévus à la ligne %s." +msgstr "Caractères inattendus à la ligne %s." #: libraries/Advisor.class.php:438 #, php-format @@ -14003,7 +14003,7 @@ msgstr "Une opération de renommage était attendue." #: libraries/sql-parser/src/Lexer.php:252 #| msgid "Unexpected characters on line %s." msgid "Unexpected character." -msgstr "Caractère imprévu." +msgstr "Caractère inattendu." #: libraries/sql-parser/src/Lexer.php:280 msgid "Expected whitespace(s) before delimiter." @@ -14027,7 +14027,7 @@ msgstr "Un nom de variable était attendu." #: libraries/sql-parser/src/Parser.php:355 #| msgid "at beginning of table" msgid "Unexpected beginning of statement." -msgstr "Début d'énoncé non attendu." +msgstr "Début d'énoncé inattendu." #: libraries/sql-parser/src/Parser.php:370 msgid "Unrecognized statement type." From 3be360f062095f631ee0e4959858b7e465a583fb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 31 Jul 2015 07:06:31 -0400 Subject: [PATCH 3/7] Improve a message Signed-off-by: Marc Delisle --- libraries/replication_gui.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index bc45bfb4da..c3deaa43dd 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -87,12 +87,12 @@ function PMA_getHtmlForMasterConfiguration() $html = '
'; $html .= '' . __('Master configuration') . ''; $html .= __( - 'This server is not configured as master server in a ' + 'This server is not configured as a master server in a ' . 'replication process. You can choose from either replicating ' - . 'all databases and ignoring certain (useful if you want to replicate ' - . 'majority of databases) or you can choose to ignore all databases by ' - . 'default and allow only certain databases to be replicated. ' - . 'Please select the mode:' + . 'all databases and ignoring some of them (useful if you want to ' + . 'replicate a majority of the databases) or you can choose to ignore ' + . 'all databases by default and allow only certain databases to be ' + . 'replicated. Please select the mode:' ) . '

'; $html .= '