summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
diff options
context:
space:
mode:
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>