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

This commit is contained in:
Madhura Jayaratne 2016-01-14 12:51:32 +11:00
commit 78a4d09c6f
2 changed files with 9 additions and 8 deletions

View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-01-08 16:50+0100\n"
"PO-Revision-Date: 2016-01-08 17:57+0000\n"
"Last-Translator: dingo thirteen <dingo13@gmail.com>\n"
"PO-Revision-Date: 2016-01-13 22:12+0000\n"
"Last-Translator: Erwin Bronkhorst <erwinbronkhorst@yahoo.com>\n"
"Language-Team: Dutch "
"<https://hosted.weblate.org/projects/phpmyadmin/master/nl/>\n"
"Language: nl\n"
@ -3817,7 +3817,7 @@ msgstr ""
msgid ""
"Linting is disabled for this query because it exceeds the maximum length."
msgstr ""
"Linting is uitgeschakeld voor deze query omdat het de maximum lengte "
"Linting is uitgeschakeld voor deze query omdat het de maximumlengte "
"overschrijdt."
#: libraries/Linter.php:165

View File

@ -9,15 +9,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.6.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-01-08 16:50+0100\n"
"PO-Revision-Date: 2015-12-31 08:41+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
"PO-Revision-Date: 2016-01-13 15:59+0000\n"
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
"Language-Team: Vietnamese "
"<https://hosted.weblate.org/projects/phpmyadmin/master/vi/>\n"
"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Gtranslator 2.91.7\n"
"X-Generator: Weblate 2.5-dev\n"
#: changelog.php:37 license.php:33
#, php-format
@ -8666,7 +8667,7 @@ msgstr "Hiện truy vấn SQL"
#: libraries/insert_edit.lib.php:1969 libraries/sql.lib.php:1341
#, php-format
msgid "Inserted row id: %1$d"
msgstr "Chỉ số id người dùng kép: %d"
msgstr "Chỉ số id người dùng kép: %1$d"
#. l10n: This is currently used only in Japanese locales
#: libraries/kanji-encoding.lib.php:150