The branch, master has been updated via aa129ac3551cfa576863c310bd1f83537a958e0a (commit) via ebfc50a2f46e5a22c9a49a6cdbeccfff9ed32e40 (commit) via f39b30a95595f19555ada49b3328976666f0c0ff (commit) via cdb12b5c686294dd3d7d9a8f767d1774a7c148da (commit) via 257c0ac6a3428250366c83a768834131fb2b3fd8 (commit) from 69c289eca9c2c98d73ccff4d3da68feb9b16c78e (commit)

- Log ----------------------------------------------------------------- commit aa129ac3551cfa576863c310bd1f83537a958e0a Merge: 69c289eca9c2c98d73ccff4d3da68feb9b16c78e ebfc50a2f46e5a22c9a49a6cdbeccfff9ed32e40 Author: Michal Čihař mcihar@suse.cz Date: Tue Jul 19 14:32:09 2011 +0200

Merge remote-tracking branch 'pootle/master'

Conflicts: po/da.po

commit ebfc50a2f46e5a22c9a49a6cdbeccfff9ed32e40 Author: opensource opensource@jth.net Date: Tue Jul 19 14:31:21 2011 +0200

Translation update done using Pootle.

commit f39b30a95595f19555ada49b3328976666f0c0ff Author: opensource opensource@jth.net Date: Tue Jul 19 14:31:07 2011 +0200

Translation update done using Pootle.

commit cdb12b5c686294dd3d7d9a8f767d1774a7c148da Author: opensource opensource@jth.net Date: Tue Jul 19 14:30:04 2011 +0200

Translation update done using Pootle.

commit 257c0ac6a3428250366c83a768834131fb2b3fd8 Author: opensource opensource@jth.net Date: Tue Jul 19 14:29:47 2011 +0200

Translation update done using Pootle.

-----------------------------------------------------------------------

Summary of changes: po/da.po | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/po/da.po b/po/da.po index 64bff6e..f8aea36 100644 --- a/po/da.po +++ b/po/da.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-07-19 14:25+0200\n" -"PO-Revision-Date: 2011-07-19 14:29+0200\n" +"PO-Revision-Date: 2011-07-19 14:31+0200\n" "Last-Translator: opensource@jth.net\n" "Language-Team: danish da@li.org\n" "Language: da\n" @@ -5847,10 +5847,9 @@ msgstr "Vis kommentarer"

#: libraries/export/latex.php:63 libraries/export/odt.php:49 #: libraries/export/sql.php:61 -#, fuzzy #| msgid "Available MIME types" msgid "Display MIME types" -msgstr "Tilgængelige MIME-typer" +msgstr "Vis MIME-typer"

#: libraries/export/latex.php:129 libraries/export/sql.php:456 #: libraries/export/xml.php:95 libraries/header_printview.inc.php:56 @@ -5890,7 +5889,6 @@ msgid "(Generates a report containing the data of a single table)" msgstr "(Genererer en rapport indeholdende dataene fra en enkelt tabel)"

#: libraries/export/pdf.php:25 -#, fuzzy #| msgid "Report title" msgid "Report title:" msgstr "Rapporttitel" @@ -5906,10 +5904,11 @@ msgid "" msgstr ""

#: libraries/export/sql.php:43 -#, fuzzy #| msgid "Add custom comment into header (\n splits lines)" msgid "Additional custom header comment (\n splits lines):" -msgstr "Tilføj tilpassede kommentarer i headeren (\n deler linjer)" +msgstr "" +"Ekstra kommentarer i headeren (\n" +" deler linjer):"

#: libraries/export/sql.php:48 msgid ""

hooks/post-receive