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

This commit is contained in:
Marc Delisle 2013-05-07 13:01:18 -04:00
commit be4944cf1a

View File

@ -6,10 +6,10 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2013-05-07 15:39+0200\n"
"PO-Revision-Date: 2013-05-02 13:27+0200\n"
"PO-Revision-Date: 2013-05-07 18:40+0200\n"
"Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
"Language-Team: Estonian <http://l10n.cihar.com/projects/phpmyadmin/master/et/"
">\n"
"Language-Team: Estonian "
"<http://l10n.cihar.com/projects/phpmyadmin/master/et/>\n"
"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -5532,7 +5532,6 @@ msgid "Control host"
msgstr "Kontrollhost"
#: libraries/config/messages.inc.php:389
#, fuzzy
#| msgid ""
#| "An alternate host to hold the configuration storage; leave blank to use "
#| "the already defined host"
@ -5541,14 +5540,14 @@ msgid ""
"storage; leave blank to use the default port, or the already defined port, "
"if the controlhost equals host"
msgstr ""
"Seadistuse salvestuse säilitamise asendushost. Jäta tühjaks, kui soovid "
"kasutada juba määratud hosti"
"Alternatiivne port, et luua ühenud hostiga, kus hoiatakse konfiguratsioone. "
"Vaikimisi pordi kasutamiseks jäta tühjaks; kui juhthost on sama mis host, "
"siis kasuta juba defineeritud porti"
#: libraries/config/messages.inc.php:390
#, fuzzy
#| msgid "Control host"
msgid "Control port"
msgstr "Kontrollhost"
msgstr "Juhtport"
#: libraries/config/messages.inc.php:391
msgid "Count tables when showing database list"