# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1276959971 -7200
# Node ID 9b404640d7958abd102e928055454f81bfe653f6
# Parent  11cd65611f3fa92121b5a0b486de8300173cf7a4# Parent  b2c0bc41165f5f374e2a81ecb30b5f76e9f1cfba
Merge with hg-i18n

diff -r 11cd65611f3f -r 9b404640d795 i18n/da.po
--- a/i18n/da.po	Tue Apr 06 22:30:50 2010 -0300
+++ b/i18n/da.po	Sat Jun 19 17:06:11 2010 +0200
@@ -18,7 +18,7 @@
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2010-04-05 01:22+0200\n"
-"PO-Revision-Date: 2010-04-05 01:37+0200\n"
+"PO-Revision-Date: 2010-06-18 00:44+0200\n"
 "Last-Translator:  <mg@lazybytes.net>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -617,8 +617,8 @@
 "  diff.changed = white\n"
 "  diff.trailingwhitespace = bold red_background\n"
 "\n"
-"  resolve.unresolved = red bold\\n\"\n"
-"  resolve.resolved = green bold\\n\"\n"
+"  resolve.unresolved = red bold\n"
+"  resolve.resolved = green bold\n"
 "\n"
 "  bookmarks.current = green\n"