Merge remote-tracking branch 'weblate-master/master'

Conflicts:
	po/az.po
This commit is contained in:
Michal Čihař 2014-11-14 09:19:16 +01:00
commit 6916c56fc2

View File

@ -3,11 +3,12 @@ msgid ""
msgstr ""
"Project-Id-Version: phpMyAdmin 4.3.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2014-11-13 11:57-0500\n"
"PO-Revision-Date: 2014-11-06 17:33+0200\n"
"Last-Translator: Mircəlal <01youknowme@gmail.com>\n"
"Language-Team: Azerbaijani <https://hosted.weblate.org/projects/phpmyadmin/"
"master/az/>\n"
"POT-Creation-Date: 2014-11-05 10:04+0100\n"
"PO-Revision-Date: 2014-11-06 18:49+0200\n"
"Last-Translator: Ziyaddin Sadigov <ziyaddinsadigov@gmail.com>\n"
"Language-Team: Azerbaijani "
"<https://hosted.weblate.org/projects/phpmyadmin/master/az/>\n"
"Language: az\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -583,7 +584,7 @@ msgstr "Davam"
#: gis_data_editor.php:412
msgid "Output"
msgstr ""
msgstr "Məhsul"
#: gis_data_editor.php:415
msgid ""