diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 15:27:52 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-19 15:27:52 +0200 |
| commit | ee62a82c4be0125da6b4758e43e231a3c28c857f (patch) | |
| tree | d59f108cf63fd0629904ec3806443e95ad94475b /editconflict.tmpl | |
| parent | 1d3b4d36c35138fd4a3af8bd285f9da2c1ad5004 (diff) | |
Apply gettext translation.
Diffstat (limited to 'editconflict.tmpl')
| -rw-r--r-- | editconflict.tmpl | 6 |
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> |