-Your changes conflict with other changes made to the page.
+Dine rettelser er i strid med andre retttelser foretaget på siden.
-Conflict markers have been inserted into the page content. Reconcile the
-conflict and commit again to save your changes.
+Modstridende områder er blevet markert i sidens indhold. Løs problemet og
+aflevér igen for at gemme dine rettelser.
-Failed to save your changes.
+Kunne ikke gemme dine rettelser.
-Your changes were not able to be saved to disk. The system gave the error:
+Dine rettelser kunne ikke arkiveres til disk. Systemet gav følgende fejlmelding:
-Your changes are preserved below, and you can try again to save them.
+Dine rettelser er bevaret nedenfor, og du kan prøve at gemme dem igen.
-The page you were editing has disappeared.
+Siden du redigerede er forsvundet.
-Perhaps someone else has deleted it or moved it. If you want to recreate
-this page with your text, click "Save Page" again.
+Måske har nogen slettet den eller flyttet den. Hvis du vil gendanne denne side
+med din tekst, så vælg "Gem side" igen.
-While you were creating this page, someone else independently created a page
-with the same name.
+Mens du oprettede denne side, har nogen andre uafhængigt af dig oprettet en
+side med det samme navn.
-The edit box below contains the page's current content, followed by the
-content you entered previously, to allow you to merge the two
-together before saving.
+Redigeringsområdet nedenfor indeholder sidens nuværende indhold, efterfulgt af
+indholdet du skrev tidligere, så du har mulighed for at slå de to sammen før du
+gemmer.
@@ -45,8 +45,8 @@ together before saving.
-Page location:
-Page type:
+Sideplacering:
+Sidetype:
@@ -54,7 +54,7 @@ Page type:
-Optional comment about this change:
+Valgfri kommentar om denne ændring:
@@ -64,7 +64,7 @@ Optional comment about this change:
diff --git a/notifymail.tmpl b/notifymail.tmpl
index e3a1dd3..e40e09a 100644
--- a/notifymail.tmpl
+++ b/notifymail.tmpl
@@ -1,4 +1,4 @@
-The following change was made by :
+Rettelserne nedenfor blev lavet af :
diff --git a/page.tmpl b/page.tmpl
index a02345f..40e9b98 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -30,16 +30,16 @@
diff --git a/passwordmail.tmpl b/passwordmail.tmpl
index 8484d39..63abfb9 100644
--- a/passwordmail.tmpl
+++ b/passwordmail.tmpl
@@ -1,10 +1,10 @@
-Someone[1], possibly you, requested that you be emailed the password for user
- on [2].
+Nogen[1], muligvis dig, har bedt om at du fik tilsendt adgangskode for brugeren
+ ved [2].
-The password is:
+Adgangskoden er:
--
ikiwiki
-[1] The user requesting the password was at IP address
-[2] Located at
+[1] Brugeren som bad om adgangskoden havde IP-adressen
+[2] Ved adressen
diff --git a/recentchanges.tmpl b/recentchanges.tmpl
index e954503..2a3182d 100644
--- a/recentchanges.tmpl
+++ b/recentchanges.tmpl
@@ -24,9 +24,9 @@