revert massive l10n refersh

This reverts commit 5a82bc5e8799e2569cd256ef8274f00e8eff5d76
and commit 55dc24616892497a32e48ad349ebd16fac71e738.

That turns out to not be the way l10n of underlays is handled, instead
these changes are being made to the l10n branch, and the Danish
underlay translation update will be copied into master from that
branch.

This is necessary to avoid tying that branch up in a state where
it is horribly diverged from master and cannot be updated anymore.

1 files changed, 35 insertions, 59 deletions

diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po
index f47344f8a..c31957002 100644
--- a/po/underlays/basewiki/templates.de.po
+++ b/po/underlays/basewiki/templates.de.po
@@ -4,7 +4,7 @@
 # modification, are permitted under any circumstances. No warranty.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2011-05-05 20:04+0300\n"
+"POT-Creation-Date: 2010-07-18 22:29+0000\n"
 "PO-Revision-Date: 2010-03-14 15:15+0530\n"
 "Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n"
 "Language-Team: None\n"
@@ -17,7 +17,15 @@ msgstr ""
 #. type: Plain text
 msgid ""
 "[[Ikiwiki]] uses many templates for many purposes. By editing its templates, "
-"you can fully customise its appearance, and avoid duplicate content."
+"you can fully customise this site."
+msgstr ""
+
+#. type: Plain text
+msgid ""
+"Templates are located in `/usr/share/ikiwiki/templates` by default; the "
+"`templatedir` setting can be used to make another directory be searched "
+"first. Customised templates can also be placed inside the \"templates/\" "
+"directory in your wiki's source."
 msgstr ""
 
 #. type: Plain text
@@ -65,7 +73,7 @@ msgstr ""
 #. type: Plain text
 #, fuzzy, no-wrap
 #| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template) or enabled(edittemplate)\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Title ##
@@ -75,27 +83,10 @@ msgstr ""
 
 #. type: Plain text
 msgid ""
-"Template pages are regular wiki pages that are used as templates for other "
-"pages."
-msgstr ""
-
-#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-msgid "[[!if test=\"enabled(template)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
-
-#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Templates are files that can be filled out and inserted into pages in the "
-#| "wiki."
-msgid ""
 "The [[!iki ikiwiki/directive/template desc=\"template directive\"]] allows "
-"template pages to be filled out and inserted into other pages in the wiki."
+"wiki pages to be used as templates, filled out and inserted into other pages "
+"in the wiki."
 msgstr ""
-"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
-"können."
 
 #. type: Plain text
 #, fuzzy, no-wrap
@@ -103,6 +94,11 @@ msgstr ""
 msgid "[[!if test=\"enabled(edittemplate)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
+#. type: Title ##
+#, no-wrap
+msgid "default content for new pages"
+msgstr ""
+
 #. type: Plain text
 msgid ""
 "The [[!iki ikiwiki/directive/edittemplate desc=\"edittemplate directive\"]] "
@@ -119,10 +115,6 @@ msgid ""
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 #. type: Plain text
-msgid "These template pages are currently available:"
-msgstr ""
-
-#. type: Plain text
 #, fuzzy, no-wrap
 #| msgid ""
 #| "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -130,7 +122,7 @@ msgstr ""
 msgid ""
 "[[!inline pages=\"templates/* and !*.tmpl and !templates/*/* and !*/discussion\"\n"
 "feeds=no archive=yes sort=title template=titlepage\n"
-"rootpage=templates postformtext=\"Add a new template page named:\"]]\n"
+"rootpage=templates postformtext=\"Add a new template named:\"]]\n"
 msgstr ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
 "sort=title template=titlepage]]\n"
@@ -138,34 +130,19 @@ msgstr ""
 #. type: Title ##
 #, fuzzy, no-wrap
 #| msgid "Using a template"
-msgid "template files"
+msgid "wiki templates"
 msgstr "Verwenden einer Vorlage"
 
 #. type: Plain text
 msgid ""
-"Template files are unlike template pages in that they have the extension `."
-"tmpl`. Template files are used extensively by Ikiwiki to generate html.  "
-"They can contain html that would not normally be allowed on a wiki page."
-msgstr ""
-
-#. type: Plain text
-msgid ""
-"Template files are located in `/usr/share/ikiwiki/templates` by default; the "
-"`templatedir` setting can be used to make another directory be searched "
-"first. Customised template files can also be placed inside the \"templates/"
-"\" directory in your wiki's source -- files placed there override ones in "
-"the `templatedir`."
-msgstr ""
-
-#. type: Plain text
-msgid "Here is a full list of the template files used:"
+"These templates are used to build the wiki. The aim is to keep almost all "
+"html out of ikiwiki and in the templates."
 msgstr ""
 
 #. type: Bullet: '* '
 msgid ""
 "`page.tmpl` - Used for displaying all regular wiki pages. This is the key "
-"template to customise to change the look and feel of Ikiwiki.  [[!if test="
-"\"enabled(pagetemplate)\" then=\"\"\""
+"template to customise. [[!if test=\"enabled(pagetemplate)\" then=\"\"\""
 msgstr ""
 
 #. type: Plain text
@@ -199,7 +176,7 @@ msgid ""
 "* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,\n"
 "  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,\n"
 "  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,\n"
-"  `passwordmail.tmpl`, `openid-selector.tmpl`, `revert.tmpl` - Parts of ikiwiki's user\n"
+"  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user\n"
 "  interface; do not normally need to be customised.\n"
 msgstr ""
 
@@ -221,6 +198,13 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ "]]\n"
 
 #~ msgid ""
+#~ "Templates are files that can be filled out and inserted into pages in the "
+#~ "wiki."
+#~ msgstr ""
+#~ "Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden "
+#~ "können."
+
+#~ msgid ""
 #~ "These templates are available for inclusion onto other pages in this wiki:"
 #~ msgstr ""
 #~ "Diese Vorlagen sind verfügbar und können in andere Seiten dieses Wikis "
@@ -229,12 +213,8 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ msgid "Using a template works like this:"
 #~ msgstr "Eine Vorlage kann folgendermaßen verwendet werden:"
 
-#~ msgid ""
-#~ "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
-#~ "note.\"\"\"]]\n"
-#~ msgstr ""
-#~ "\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz "
-#~ "eingefügt werden soll.\"\"\"]]\n"
+#~ msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
+#~ msgstr "\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz eingefügt werden soll.\"\"\"]]\n"
 
 #~ msgid ""
 #~ "This fills out the [[note]] template, filling in the `text` field with "
@@ -256,12 +236,8 @@ msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 #~ "Anführungszeichen können so große Mengen an zu formatierendem Text in die "
 #~ "Vorlage eingefügt werden:"
 
-#~ msgid ""
-#~ "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes="
-#~ "\"\"\"\n"
-#~ msgstr ""
-#~ "        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 notes="
-#~ "\"\"\"\n"
+#~ msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+#~ msgstr "        \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 notes=\"\"\"\n"
 
 #~ msgid "\\[[Charley]]'s sister."
 #~ msgstr "\\[[Thomas]] Schwester."