Merge remote branch 'upstream/master'

This commit is contained in:
Chanaka Indrajith 2013-02-16 20:17:06 +05:30
commit 4674857f61

View File

@ -4,16 +4,16 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-beta1\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-02-13 14:38+0100\n"
"PO-Revision-Date: 2013-02-10 16:40+0200\n"
"PO-Revision-Date: 2013-02-16 14:58+0200\n"
"Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
"Language-Team: Russian <http://l10n.cihar.com/projects/phpmyadmin/master/ru/"
">\n"
"Language-Team: Russian "
"<http://l10n.cihar.com/projects/phpmyadmin/master/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Generator: Weblate 1.5-dev\n"
#: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344
@ -745,10 +745,9 @@ msgid "Server"
msgstr "Сервер"
#: index.php:234
#, fuzzy
#| msgid "Server port"
msgid "Server type"
msgstr "Порт сервера"
msgstr "Тип сервера"
#: index.php:238 libraries/plugins/export/ExportLatex.class.php:225
#: libraries/plugins/export/ExportSql.class.php:612