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

This commit is contained in:
Madhura Jayaratne 2015-07-27 18:36:48 +05:30
commit 9e2e1b4c0e
2 changed files with 9 additions and 10 deletions

View File

@ -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-26 13:21+0200\n"
"PO-Revision-Date: 2015-07-27 14:47+0200\n"
"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
@ -13969,27 +13969,26 @@ msgstr "Une expression était attendue."
#: libraries/sql-parser/src/Components/FieldDefinition.php:255
msgid "A closing bracket was expected."
msgstr ""
msgstr "Une parenthèse droite était attendue."
#: libraries/sql-parser/src/Components/Limit.php:90
#: libraries/sql-parser/src/Components/Limit.php:112
msgid "An offset was expected."
msgstr ""
msgstr "Un décalage était prévu."
#: libraries/sql-parser/src/Components/OptionsArray.php:142
#, php-format
msgid "This option conflicts with \"%1$s\"."
msgstr ""
msgstr "Cette option entre en conflit avec « %1$s »."
#: libraries/sql-parser/src/Components/RenameOperation.php:102
#, fuzzy
#| msgid "The number of tables that are open."
msgid "The old name of the table was expected."
msgstr "Le nombre de tables qui sont ouvertes."
msgstr "L'ancien nom de la table était attendu."
#: libraries/sql-parser/src/Components/RenameOperation.php:112
msgid "Keyword \"TO\" was expected."
msgstr ""
msgstr "Le mot clé « TO » était attendu."
#: libraries/sql-parser/src/Components/RenameOperation.php:129
#, fuzzy

View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.5.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-27 09:03+0200\n"
"PO-Revision-Date: 2015-07-27 10:59+0200\n"
"Last-Translator: Andrey Aleksanyants <aaleksanyants@yahoo.com>\n"
"Language-Team: Armenian "
"<https://hosted.weblate.org/projects/phpmyadmin/master/hy/>\n"
@ -12309,7 +12309,7 @@ msgstr ""
#: libraries/server_status_monitor.lib.php:185
msgid "Select series:"
msgstr "Ընտրեք շարքերը"
msgstr "Ընտրեք շարքերը՝"
#: libraries/server_status_monitor.lib.php:187
msgid "Commonly monitored"
@ -14475,7 +14475,7 @@ msgstr ""
#: templates/index_form.phtml:86
msgid "Parser:"
msgstr "Վերլուծող՝"
msgstr "Վերլուծիչ՝"
#: templates/index_form.phtml:102
msgid "Comment:"