Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4

phpmyadmin · Jun 16, 2015 · f4438b1 · f4438b1
2 parents 7c236e1 + 24ed972
commit f4438b1
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 150 deletions.
diff --git a/po/da.po b/po/da.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.4.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-05-05 15:46-0400\n"
-"PO-Revision-Date: 2015-03-16 19:34+0200\n"
-"Last-Translator: Jonas <jonas.den.smarte@gmail.com>\n"
-"Language-Team: Danish <https://hosted.weblate.org/projects/phpmyadmin/4-4/da/"
-">\n"
+"PO-Revision-Date: 2015-06-10 23:03+0200\n"
+"Last-Translator: Aputsiaĸ Niels Janussen <aj@isit.gl>\n"
+"Language-Team: Danish "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-4/da/>\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 
 #: changelog.php:36 license.php:28
 #, php-format
@@ -679,16 +679,16 @@ msgid "Import has been successfully finished, %d queries executed."
 msgstr "Importen er korrekt gennemført, %d forespørgsler udført."
 
 #: import.php:665
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "Script timeout passed, if you want to finish import, please resubmit same "
 #| "file and import will resume."
 msgid ""
 "Script timeout passed, if you want to finish import, please %sresubmit the "
 "same file%s and import will resume."
 msgstr ""
-"Script timeout nået, hvis du vil afslutte importen, indsend venligst samme "
-"fil igen og importen vil blive genoptaget."
+"Tidsudløb for skriptet blev nået. Hvis du vil afslutte importen, så %"
+"sindsend venligst den samme fil igen%s og importen vil blive genoptaget."
 
 #: import.php:675
 msgid ""
@@ -1685,10 +1685,9 @@ msgid "Processing Request"
 msgstr "Udfører forespørgsel"
 
 #: js/messages.php:268
-#, fuzzy
 #| msgid "Request Aborted!!"
 msgid "Request Failed!!"
-msgstr "Forespørgsel afbrudt!"
+msgstr "Forespørgsel mislykkedes!"
 
 #: js/messages.php:269
 msgid "Error in Processing Request"