From bada6f24ac2a3e50bb6075c6745e69dfb9b50eb8 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Wed, 5 Feb 2014 11:06:27 +0100 Subject: [PATCH 1/3] Translated using Weblate (Danish) Currently translated at 99.8% (2746 of 2749) --- po/da.po | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/po/da.po b/po/da.po index 3e58eb0c03..76f400b4af 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2013-12-16 19:53+0200\n" +"PO-Revision-Date: 2014-02-05 11:06+0200\n" "Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: Danish \n" "Language: da\n" @@ -428,6 +428,7 @@ msgstr "" #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." msgstr "" +"Hvis du stødte på problemer, så indsend venligst en fejlrapport manuelt." #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." @@ -435,7 +436,7 @@ msgstr "Tak for indsendelsen af denne rapport." #: error_report.php:74 msgid "Unfortunately the submission failed." -msgstr "" +msgstr "Desværre mislykkedes afsendelsen." #: export.php:171 msgid "Bad type!" @@ -1560,7 +1561,7 @@ msgstr "Indlæser…" #: js/messages.php:230 msgid "Request Aborted!!" -msgstr "" +msgstr "Forespørgsel afbrudt!" #: js/messages.php:231 msgid "Processing Request" @@ -4436,7 +4437,6 @@ msgid "Highlight pointer" msgstr "Fremhæv pointer" #: libraries/config/messages.inc.php:28 -#, fuzzy #| msgid "" #| "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " #| "import and export operations" @@ -4445,7 +4445,7 @@ msgid "" "import operations" msgstr "" "Aktivér komprimering af [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] ved " -"import -og eksport arbejdsgange" +"importhandlinger" #: libraries/config/messages.inc.php:29 msgid "Bzip2" @@ -4523,7 +4523,6 @@ msgid "Check config file permissions" msgstr "Tjek tilladelser på konfigurationsfil" #: libraries/config/messages.inc.php:43 -#, fuzzy #| msgid "" #| "Compress gzip/bzip2 exports on the fly without the need for much memory; " #| "if you encounter problems with created gzip/bzip2 files disable this " @@ -4533,8 +4532,8 @@ msgid "" "encounter problems with created gzip files disable this feature" msgstr "" "Pak gzip/bzip2-eksporter under eksporten uden behov for ret meget " -"hukommelse. Hvis du får problemer med de dannede gzip/bzip2-filer, så " -"deaktiver denne funktion" +"hukommelse. Hvis du får problemer med de dannede gzip-filer, så deaktiver " +"denne funktion" #: libraries/config/messages.inc.php:44 msgid "Compress on the fly" @@ -10225,7 +10224,6 @@ msgid "Use text field" msgstr "Brug tekstfelt" #: libraries/server_privileges.lib.php:1310 -#, fuzzy #| msgid "" #| "An account already exists with the same username but possibly a different " #| "hostname. Are you sure you wish to proceed?" @@ -10234,7 +10232,7 @@ msgid "" "hostname. " msgstr "" "Der findes allerede en konto med samme brugernavn, men muligvis med et andet " -"værtsnavn. Er du sikker på at du vil fortsætte?" +"værtsnavn. " #: libraries/server_privileges.lib.php:1446 msgid "Do not change the password" From a404f7ef6c35de2a321679a756729b1c01758fb7 Mon Sep 17 00:00:00 2001 From: Dieter Date: Wed, 5 Feb 2014 13:05:05 +0100 Subject: [PATCH 2/3] Translated using Weblate (Dutch) Currently translated at 100.0% (2749 of 2749) --- po/nl.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/nl.po b/po/nl.po index 924c8379d3..7f02e8326e 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-19 16:38+0200\n" -"Last-Translator: Dieter Adriaenssens \n" +"PO-Revision-Date: 2014-02-05 13:05+0200\n" +"Last-Translator: Dieter \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -5127,8 +5127,8 @@ msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." msgstr "" -"Bijhouden van wijzigingen in de databank. Dit vereist een geconfigureerde " -"configuratie-opslag van phpMyAdmin." +"Bijhouden van wijzigingen in de databank. Dit vereist de configuratie-opslag " +"van phpMyAdmin." #: libraries/config/messages.inc.php:208 msgid "Customize export options" @@ -5724,9 +5724,9 @@ msgid "" "(lost by window close)." msgstr "" "Schakel dit in wanneer u wil dat SQL-querygeschiedenis wordt bijgehouden in " -"een databank (vereist configuratie-opslag). Indien uitgeschakeld worden JS-" -"routines gebruikt om querygeschiedenis te tonen (deze gaat verloren bij het " -"sluiten van het venster)." +"een databank (configuratie-opslag van phpMyAdmin is vereist). Indien " +"uitgeschakeld, worden JS-routines gebruikt om querygeschiedenis te tonen " +"(deze gaat verloren bij het sluiten van het venster)." #: libraries/config/messages.inc.php:351 msgid "Permanent query history" From 109eb9e1f2b068238be50a86e45b728a76395f20 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Thu, 6 Feb 2014 00:04:29 +0530 Subject: [PATCH 3/3] Fix bug#4274 index_div was being added twice Signed-off-by: Atul Pratap Singh --- libraries/display_structure.inc.php | 3 --- libraries/structure.lib.php | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/display_structure.inc.php b/libraries/display_structure.inc.php index 60eeba3c00..dade7f4938 100644 --- a/libraries/display_structure.inc.php +++ b/libraries/display_structure.inc.php @@ -225,9 +225,6 @@ $response->addHTML( if (! $tbl_is_view && ! $db_is_information_schema) { $response->addHTML('
'); $response->addHTML(PMA_getHtmlForAddColumn($columns_list)); - $response->addHTML( - '
' - ); } /** diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php index 5339872e9b..38951b8049 100644 --- a/libraries/structure.lib.php +++ b/libraries/structure.lib.php @@ -1798,9 +1798,7 @@ function getHtmlForRowStatsTable($showtable, $tbl_collation, ); } $html_output .= '' - . '' - . '' - . '
'; + . ''; return $html_output; } @@ -2240,6 +2238,9 @@ function PMA_getHtmlForDisplayTableStats($showtable, $table_info_num_rows, (isset ($avg_size) ? $avg_size : ''), (isset ($avg_unit) ? $avg_unit : '') ); + + $html_output .= '' + . ''; return $html_output; }