The branch, master has been updated via 56f55dcaf69ee60889ba6c7fef9921daf17bc3de (commit) via 860bacccbf3177fd9ff4ea228ba47408dc75cd85 (commit) via 575e4a0d37e379e5f6f2c6f3c6cca0c032bb1e05 (commit) via e8a8c7e2bcbb36055cec8c7fc60d469b6dd3f043 (commit) from aa129ac3551cfa576863c310bd1f83537a958e0a (commit)

- Log ----------------------------------------------------------------- commit 56f55dcaf69ee60889ba6c7fef9921daf17bc3de Merge: aa129ac3551cfa576863c310bd1f83537a958e0a 860bacccbf3177fd9ff4ea228ba47408dc75cd85 Author: Michal Čihař mcihar@suse.cz Date: Tue Jul 19 14:35:04 2011 +0200

Merge remote-tracking branch 'pootle/master'

Conflicts: po/da.po

commit 860bacccbf3177fd9ff4ea228ba47408dc75cd85 Author: opensource opensource@jth.net Date: Tue Jul 19 14:33:48 2011 +0200

Translation update done using Pootle.

commit 575e4a0d37e379e5f6f2c6f3c6cca0c032bb1e05 Author: opensource opensource@jth.net Date: Tue Jul 19 14:33:00 2011 +0200

Translation update done using Pootle.

commit e8a8c7e2bcbb36055cec8c7fc60d469b6dd3f043 Author: opensource opensource@jth.net Date: Tue Jul 19 14:32:25 2011 +0200

Translation update done using Pootle.

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

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

diff --git a/po/da.po b/po/da.po index f8aea36..744d39c 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:31+0200\n" +"PO-Revision-Date: 2011-07-19 14:33+0200\n" "Last-Translator: opensource@jth.net\n" "Language-Team: danish da@li.org\n" "Language: da\n" @@ -5923,16 +5923,15 @@ msgstr ""

#: libraries/export/sql.php:107 libraries/export/sql.php:162 #: libraries/export/sql.php:167 -#, fuzzy, php-format +#, php-format #| msgid "Statements" msgid "Add %s statement" -msgstr "Erklæringer" +msgstr "Tilføj %s forespørgsel"

#: libraries/export/sql.php:145 -#, fuzzy #| msgid "Statements" msgid "Add statements:" -msgstr "Erklæringer" +msgstr "Tilføj forespørgsler"

#: libraries/export/sql.php:197 msgid "" @@ -6039,10 +6038,9 @@ msgid "Object creation options (all are recommended)" msgstr ""

#: libraries/export/xml.php:40 -#, fuzzy #| msgid "View" msgid "Views" -msgstr "Visning" +msgstr "Views"

#: libraries/export/xml.php:47 msgid "Export contents"

hooks/post-receive