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

po/et.po

@@ -6,10 +6,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2016-02-22 14:22+0100\n"
-"PO-Revision-Date: 2016-02-17 13:22+0000\n"
+"PO-Revision-Date: 2016-02-23 09:36+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
-"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/et/>\n"
+"Language-Team: Estonian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -6617,10 +6617,9 @@ msgid "Show row links anyway"
 msgstr "Kuva ridade viidad ikkagi"
 
 #: libraries/config/messages.inc.php:552 libraries/config/messages.inc.php:553
-#, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Disable shortcut keys"
-msgstr "Keela võõrvõtme kontrollid"
+msgstr "Keela kiirklahvid"
 
 #: libraries/config/messages.inc.php:555
 msgid "Use natural order for sorting table and database names."
@@ -14749,7 +14748,6 @@ msgid "Tracking is not active."
 msgstr "Jälgimist pole aktiveeritud."
 
 #: templates/error/report_form.phtml:7
-#, fuzzy
 #| msgid ""
 #| "phpMyAdmin has encountered an error. We have collected data about this "
 #| "error as well as information about relevant configuration settings to "
@@ -14759,15 +14757,16 @@ msgid ""
 "about relevant configuration settings. It will be sent to the phpMyAdmin "
 "team for debugging the error."
 msgstr ""
-"phpMyAdminis juhtus viga. Me kogusime andmeid selle vea kohta ja samuti "
-"sätete olulist informatsiooni, et need saata phpMyAdmini arendajatele "
-"probleemist paremaks arusaamiseks."
+"See raport kaasab automaatselt andmed vea kohta ja veaga seonduvad "
+"häälestuse sätted. Raport saadetakse vea silumiseks phpMyAdmini arendajatele."
 
 #: templates/error/report_form.phtml:14
 msgid ""
 "Can you tell us the steps leading to this error? It decisively helps in "
 "debugging:"
 msgstr ""
+"Kas sa oskad meile kirjeldada sammud, mis viisid selle veani? See lihtsustab "
+"tunduvalt silumist:"
 
 #: templates/error/report_form.phtml:21
 msgid "You may examine the data in the error report:"
@@ -15445,23 +15444,21 @@ msgstr "Oodati võtmesõna \"RETURNS\"."
 
 #: vendor/phpmyadmin/sql-parser/tests/Lexer/LexerTest.php:21
 #: vendor/phpmyadmin/sql-parser/tests/Parser/ParserTest.php:58
-#, fuzzy
 #| msgid "errors."
 msgid "error #1"
-msgstr "viga."
+msgstr "viga #1"
 
 #: vendor/phpmyadmin/sql-parser/tests/Lexer/LexerTest.php:23
 #: vendor/phpmyadmin/sql-parser/tests/Parser/ParserTest.php:59
 #, php-format
 msgid "%2$s #%1$d"
-msgstr ""
+msgstr "%2$s #%1$d"
 
 #: vendor/phpmyadmin/sql-parser/tests/Lexer/LexerTest.php:48
 #: vendor/phpmyadmin/sql-parser/tests/Parser/ParserTest.php:80
-#, fuzzy
 #| msgid "Gather errors"
 msgid "strict error"
-msgstr "Loe vigu"
+msgstr "otsene viga"
 
 #: view_create.php:233
 msgid "VIEW name"