From 0e6ff999a3e1d255bf4f88c61ffa96e54452f512 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 10 Feb 2011 14:27:00 +0100
Subject: Translate to danish.

---
 editconflict.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'editconflict.tmpl')

diff --git a/editconflict.tmpl b/editconflict.tmpl
index 1252033..10e4b85 100644
--- a/editconflict.tmpl
+++ b/editconflict.tmpl
@@ -1,7 +1,7 @@
 <p class="error">
-<b>Your changes conflict with other changes made to the page.</b>
+<b>Dine rettelser er i strid med andre retttelser foretaget på siden.</b>
 </p>
 <p>
-Conflict markers have been inserted into the page content. Reconcile the
-conflict and commit again to save your changes.
+Modstridende områder er blevet markeret i sidens indhold. Løs problemet og
+aflevér igen for at gemme dine rettelser.
 </p>
-- 
cgit v1.2.3