summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-02-10 14:27:00 +0100
committerJonas Smedegaard <dr@jones.dk>2013-10-12 14:25:57 +0200
commit0e6ff999a3e1d255bf4f88c61ffa96e54452f512 (patch)
treef9401f04d0a73782d85bccdc1ef2642b7bcda5ec /editconflict.tmpl
parent67b676bd50fb475c3b6c314942be14b4677e426b (diff)
Translate to danish.
Diffstat (limited to 'editconflict.tmpl')
-rw-r--r--editconflict.tmpl6
1 files changed, 3 insertions, 3 deletions
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>