From 6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 14 Jul 2010 20:22:53 +0200
Subject: Sync with ikiwiki 3.20100704.

---
 directive.mdwn                     |  45 -----
 ikiwiki.mdwn                       |   1 +
 ikiwiki/blog.mdwn                  |   8 -
 ikiwiki/directive.mdwn             |  16 +-
 ikiwiki/formatting.mdwn            |   2 +-
 ikiwiki/markdown.mdwn              |   4 +-
 ikiwiki/openid.mdwn                |  12 +-
 ikiwiki/pagespec.mdwn              |  49 ++---
 ikiwiki/pagespec/attachment.mdwn   |  19 +-
 ikiwiki/pagespec/po.mdwn           |  20 +++
 ikiwiki/pagespec/sorting.mdwn      |  26 +++
 ikiwiki/preprocessordirective.mdwn |   7 -
 ikiwiki/searching.mdwn             |   2 +-
 ikiwiki/subpage.mdwn               |   4 +-
 ikiwiki/wikilink.mdwn              |  25 +--
 index.mdwn                         |   2 +-
 shortcuts.mdwn                     |  12 +-
 style.css                          | 359 ++++++++++++++++++++++++-------------
 templates.mdwn                     | 147 ++++++++-------
 templates/note.mdwn                |   2 +-
 templates/popup.mdwn               |   2 +-
 wikiicons/openidlogin-bg.gif       | Bin 142 -> 336 bytes
 22 files changed, 414 insertions(+), 350 deletions(-)
 delete mode 100644 directive.mdwn
 delete mode 100644 ikiwiki/blog.mdwn
 create mode 100644 ikiwiki/pagespec/po.mdwn
 create mode 100644 ikiwiki/pagespec/sorting.mdwn
 delete mode 100644 ikiwiki/preprocessordirective.mdwn

diff --git a/directive.mdwn b/directive.mdwn
deleted file mode 100644
index c4342de..0000000
--- a/directive.mdwn
+++ /dev/null
@@ -1,45 +0,0 @@
-[[!meta robots="noindex, follow"]]
-Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
-begin with `!` and may contain parameters. The general form is:
-
-	\[[!directive param="value" param="value"]]
-
-This gets expanded before the rest of the page is processed, and can be used
-to transform the page in various ways.
-
-The quotes around values can be omitted if the value is a simple word.
-Also, some directives may use parameters without values, for example:
-
-	\[[!tag foo]]
-
-A directive does not need to all be on one line, it can be
-wrapped to multiple lines if you like:
-	
-	\[[!directive foo="baldersnatch"
-	bar="supercalifragilisticexpialidocious" baz=11]]
-
-Also, multiple lines of *quoted* text can be used for a value.
-To allow quote marks inside the quoted text, delimit the block
-of text with triple-quotes:
-
-	\[[!directive text="""
-	1. "foo"
-	2. "bar"
-	3. "baz"
-	"""]]
-
-ikiwiki also has an older syntax for directives, which requires a
-space in directives to distinguish them from [[wikilinks|ikiwiki/wikilink]].
-This syntax has several disadvantages: it requires a space after directives
-with no parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
-[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed syntax
-shown above as the preferred alternative.  However, ikiwiki still supports
-wikis using the older syntax, if the `prefix_directives` option is not enabled.
-For backward compatibility with existing wikis, this option currently
-defaults to off, so ikiwiki supports the old syntax.
-
-[[!if test="enabled(listdirectives)" then="""
-Here is a list of currently available directives in this wiki:
-
-[[!listdirectives ]]
-"""]]
diff --git a/ikiwiki.mdwn b/ikiwiki.mdwn
index e0a971d..4d84069 100644
--- a/ikiwiki.mdwn
+++ b/ikiwiki.mdwn
@@ -14,3 +14,4 @@ Some documentation on using ikiwiki:
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]
+* [[templates]]
diff --git a/ikiwiki/blog.mdwn b/ikiwiki/blog.mdwn
deleted file mode 100644
index 0a5a524..0000000
--- a/ikiwiki/blog.mdwn
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!meta robots="noindex, follow"]]
-
-This page has been removed from ikiwiki's basewiki. For documentation about
-creating a blog with ikiwiki, see the documentation of the
-[[!iki ikiwiki/directive/inline desc=inline]] directive.
-
-Please update your links, as this redirection page will be removed in a
-future ikiwiki release.
diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn
index c4342de..fb88aa7 100644
--- a/ikiwiki/directive.mdwn
+++ b/ikiwiki/directive.mdwn
@@ -28,15 +28,13 @@ of text with triple-quotes:
 	3. "baz"
 	"""]]
 
-ikiwiki also has an older syntax for directives, which requires a
-space in directives to distinguish them from [[wikilinks|ikiwiki/wikilink]].
-This syntax has several disadvantages: it requires a space after directives
-with no parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
-[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed syntax
-shown above as the preferred alternative.  However, ikiwiki still supports
-wikis using the older syntax, if the `prefix_directives` option is not enabled.
-For backward compatibility with existing wikis, this option currently
-defaults to off, so ikiwiki supports the old syntax.
+ikiwiki also has an older syntax for directives, which requires a space in
+directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This
+syntax has several disadvantages: it requires a space after directives with
+no parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
+[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed
+syntax shown above as default.  However, ikiwiki still supports wikis using
+the older syntax, if the `prefix_directives` option is disabled.
 
 [[!if test="enabled(listdirectives)" then="""
 Here is a list of currently available directives in this wiki:
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index 2ed5cc2..befbce9 100644
--- a/ikiwiki/formatting.mdwn
+++ b/ikiwiki/formatting.mdwn
@@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this:
 
 Leave blank lines between paragraphs.
 
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
+You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
 in single or double asterisks.
 
 To create a list, start each line with an asterisk:
diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn
index a419094..6841919 100644
--- a/ikiwiki/markdown.mdwn
+++ b/ikiwiki/markdown.mdwn
@@ -4,9 +4,7 @@ is a minimal markup language that resembles plain text as used in
 email messages. It is the markup language used by this wiki by default.
 
 For documentation about the markdown syntax, see [[formatting]] and
-[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A
-[markdown mode](http://jblevins.org/projects/markdown-mode/) for 
-emacs can help in editing.
+[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
 
 Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
 of the markdown syntax, and are the only bit of markup that this wiki
diff --git a/ikiwiki/openid.mdwn b/ikiwiki/openid.mdwn
index dd851e5..2fa972e 100644
--- a/ikiwiki/openid.mdwn
+++ b/ikiwiki/openid.mdwn
@@ -9,16 +9,10 @@
 that allows you to have one login that you can use on a growing number of
 websites.
 
-To sign up for an OpenID, visit one of the following identity providers:
+If you have an account with some of the larger web service providers,
+you might already have an OpenID. 
+[Directory of OpenID providers](http://openiddirectory.com/openid-providers-c-1.html)
 
-* [MyOpenID](https://www.myopenid.com/)
-* [GetOpenID](https://getopenid.com/)
-* [Videntity](http://videntity.org/)
-* [LiveJournal](http://www.livejournal.com/openid/)
-* [TrustBearer](https://openid.trustbearer.com/)
-* or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html).
-
-Your OpenID is the URL that you are given when you sign up.
 [[!if test="enabled(openid)" then="""
 To sign in to this wiki using OpenID, just enter it in the OpenID field in the
 signin form. You do not need to give this wiki a password or go through any
diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn
index c78666c..c66395f 100644
--- a/ikiwiki/pagespec.mdwn
+++ b/ikiwiki/pagespec.mdwn
@@ -24,29 +24,37 @@ match all pages except for Discussion pages and the SandBox:
 
 Some more elaborate limits can be added to what matches using these functions:
 
-* "`link(page)`" - match only pages that link to a given page (or glob)
-* "`backlink(page)`" - match only pages that a given page links to
-* "`creation_month(month)`" - match only pages created on the given month
+* "`glob(someglob)`" - matches pages and other files that match the given glob.
+  Just writing the glob by itself is actually a shorthand for this function.
+* "`page(glob)`" - like `glob()`, but only matches pages, not other files
+* "`link(page)`" - matches only pages that link to a given page (or glob)
+* "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or
+  tags matched by a glob)
+* "`backlink(page)`" - matches only pages that a given page links to
+* "`creation_month(month)`" - matches only files created on the given month
 * "`creation_day(mday)`" - or day of the month
 * "`creation_year(year)`" - or year
-* "`created_after(page)`" - match only pages created after the given page
+* "`created_after(page)`" - matches only files created after the given page
   was created
-* "`created_before(page)`" - match only pages created before the given page
+* "`created_before(page)`" - matches only files created before the given page
   was created
-* "`glob(someglob)`" - match pages that match the given glob. Just writing
-  the glob by itself is actually a shorthand for this function.
 * "`internal(glob)`" - like `glob()`, but matches even internal-use 
   pages that globs do not usually match.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
-  "`license(glob)`", "`copyright(glob)`" - match pages that have the given
-  metadata, matching the specified glob.
+  "`license(glob)`", "`copyright(glob)`", "`guid(glob)`" 
+  - match pages that have the given metadata, matching the specified glob.
 * "`user(username)`" - tests whether a modification is being made by a
   user with the specified username. If openid is enabled, an openid can also
-  be put here.
+  be put here. Glob patterns can be used in the username. For example, 
+  to match all openid users, use `user(*://*)`
 * "`admin()`" - tests whether a modification is being made by one of the
   wiki admins.
 * "`ip(address)`" - tests whether a modification is being made from the
   specified IP address.
+* "`comment(glob)`" - matches comments to a page matching the glob.
+* "`comment_pending(glob)`" - matches unmoderated, pending comments.
+* "`postcomment(glob)`" - matches only when comments are being 
+  posted to a page matching the specified glob
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
@@ -63,29 +71,10 @@ More complex expressions can also be created, by using parentheses for
 grouping. For example, to match pages in a blog that are tagged with either
 of two tags, use:
 
-	blog/* and (link(tag/foo) or link(tag/bar))
+	blog/* and (tagged(foo) or tagged(bar))
 
 Note that page names in PageSpecs are matched against the absolute
 filenames of the pages in the wiki, so a pagespec "foo" used on page
 "a/b" will not match a page named "a/foo" or "a/b/foo". To match
 relative to the directory of the page containing the pagespec, you can
 use "./". For example, "./foo" on page "a/b" matches page "a/foo".
-
-## Old syntax
-
-The old PageSpec syntax was called a "GlobList", and worked differently in
-two ways:
-
-1. "and" and "or" were not used; any page matching any item from the list
-   matched.
-2. If an item was prefixed with "`!`", then no page matching that item
-   matched, even if it matched an earlier list item.
-
-For example, here is the old way to match all pages except for the SandBox
-and Discussion pages:
-
-	* !SandBox !*/Discussion
-
-Using this old syntax is still supported. However, the old syntax is
-deprecated and will be removed at some point, and using the new syntax is
-recommended.
diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn
index 2d33db7..fa2bc58 100644
--- a/ikiwiki/pagespec/attachment.mdwn
+++ b/ikiwiki/pagespec/attachment.mdwn
@@ -7,23 +7,24 @@ If attachments are enabled, the wiki admin can control what types of
 attachments will be accepted, via the `allowed_attachments`
 configuration setting.
 
-For example, to limit arbitrary files to 50 kilobytes, but allow
-larger mp3 files to be uploaded by joey into a specific directory, and
-check all attachments for virii, something like this could be used:
+For example, to limit most users to uploading small images, and nothing else,
+while allowing larger mp3 files to be uploaded by joey into a specific
+directory, and check all attachments for viruses, something like this could be
+used:
   
-	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))
+	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))
 
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
 
-* "`maxsize(size)`" - Tests whether the attachment is no larger than the
+* "`maxsize(size)`" - tests whether the attachment is no larger than the
   specified size. The size defaults to being in bytes, but "kb", "mb", "gb"
   etc can be used to specify the units.
   
-* "`minsize(size)`" - Tests whether the attachment is no smaller than the
+* "`minsize(size)`" - tests whether the attachment is no smaller than the
   specified size.
 
-* "`ispage()`" - Tests whether the attachment will be treated by ikiwiki as a
+* "`ispage()`" - tests whether the attachment will be treated by ikiwiki as a
   wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled
   page format).
 
@@ -31,7 +32,7 @@ additional tests:
   use `!ispage()` ; if you only want to allow wiki pages to be uploaded
   as attachments, use `ispage()`.
 
-* "`mimetype(foo/bar)`" - This checks the MIME type of the attachment. You can
+* "`mimetype(foo/bar)`" - checks the MIME type of the attachment. You can
   include a glob in the type, for example `mimetype(image/*)`.
 
-* "`virusfree()`" - Checks the attachment with an antiviral program.
+* "`virusfree()`" - checks the attachment with an antiviral program.
diff --git a/ikiwiki/pagespec/po.mdwn b/ikiwiki/pagespec/po.mdwn
new file mode 100644
index 0000000..f8b3985
--- /dev/null
+++ b/ikiwiki/pagespec/po.mdwn
@@ -0,0 +1,20 @@
+[[!if test="enabled(po)"
+     then="This wiki has po support **enabled**."
+     else="This wiki has po support **disabled**."]]
+
+If the [[!iki plugins/po desc=po]] plugin is enabled, the regular
+[[ikiwiki/PageSpec]] syntax is expanded with the following additional
+tests that can be used to improve user navigation in a multi-lingual
+wiki:
+
+* "`lang(LL)`" - tests whether a page is written in the language
+  specified as a ISO639-1 (two-letter) language code.
+* "`currentlang()`" - tests whether a page is written in the same
+  language as the current page.
+* "`needstranslation()`" - tests whether a page needs translation
+  work. Only slave pages match this PageSpec.
+
+Note that every non-po page is considered to be written in
+`po_master_language`, as specified in `ikiwiki.setup`.
+
+[[!meta robots="noindex, follow"]]
diff --git a/ikiwiki/pagespec/sorting.mdwn b/ikiwiki/pagespec/sorting.mdwn
new file mode 100644
index 0000000..ccd7f7e
--- /dev/null
+++ b/ikiwiki/pagespec/sorting.mdwn
@@ -0,0 +1,26 @@
+Some [[directives|ikiwiki/directive]] that use
+[[PageSpecs|ikiwiki/pagespec]] allow
+specifying the order that matching pages are shown in. The following sort
+orders can be specified.
+
+* `age` - List pages from the most recently created to the oldest.
+
+* `mtime` - List pages with the most recently modified first.
+
+* `title` - Order by title (page name).
+[[!if test="enabled(sortnaturally)" then="""
+* `title_natural` - Orders by title, but numbers in the title are treated
+  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+"""]]
+[[!if test="enabled(meta)" then="""
+* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
+  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
+  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
+  also work.
+"""]]
+
+In addition, you can combine several sort orders and/or reverse the order of
+sorting, with a string like `age -title` (which would sort by age, then by
+title in reverse order if two pages have the same age).
+
+[[!meta robots="noindex, follow"]]
diff --git a/ikiwiki/preprocessordirective.mdwn b/ikiwiki/preprocessordirective.mdwn
deleted file mode 100644
index bd12895..0000000
--- a/ikiwiki/preprocessordirective.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!meta redir=ikiwiki/directive delay=10]]
-[[!meta robots="noindex, follow"]]
-
-This page has moved to
-[[ikiwiki/directive|ikiwiki/directive]]. Please
-update your links, as this redirection page will be removed in a future
-ikiwiki release.
diff --git a/ikiwiki/searching.mdwn b/ikiwiki/searching.mdwn
index 539e719..4c12879 100644
--- a/ikiwiki/searching.mdwn
+++ b/ikiwiki/searching.mdwn
@@ -5,7 +5,7 @@ then="This wiki has searching **enabled**."
 else="This wiki has searching **disabled**."]]
 
 If searching is enabled, you can enter search terms in the search field,
-as you'd expect. There are a few special things you can do to constuct
+as you'd expect. There are a few special things you can do to construct
 more powerful searches.
 
 * To match a phrase, enclose it in double quotes.
diff --git a/ikiwiki/subpage.mdwn b/ikiwiki/subpage.mdwn
index e047b86..862f45e 100644
--- a/ikiwiki/subpage.mdwn
+++ b/ikiwiki/subpage.mdwn
@@ -5,8 +5,8 @@ this page, [[SubPage]] has some related pages placed under it, like
 wiki rather than just having a great big directory full of pages.
 
 To add a SubPage, just make a subdirectory and put pages in it. For
-example, this page is SubPage.mdwn in this wiki's source, and there is also
-a SubPage subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages
+example, this page is subpage.mdwn in this wiki's source, and there is also
+a subpage subdirectory, which contains subpage/linkingrules.mdwn. Subpages
 can be nested as deeply as you'd like.
 
 Linking to and from a SubPage is explained in [[LinkingRules]].
diff --git a/ikiwiki/wikilink.mdwn b/ikiwiki/wikilink.mdwn
index 371c252..cf3b89c 100644
--- a/ikiwiki/wikilink.mdwn
+++ b/ikiwiki/wikilink.mdwn
@@ -9,9 +9,6 @@ wikilink, just prefix it with a `\`, like `\\[[WikiLink]]`.
 There are some special [[SubPage/LinkingRules]] that come into play when
 linking between [[SubPages|SubPage]].
 
-Also, if the file linked to by a WikiLink looks like an image, it will
-be displayed inline on the page.
-
 WikiLinks are matched with page names in a case-insensitive manner, so you
 don't need to worry about getting the case the same, and can capitalise
 links at the start of a sentence, and so on.
@@ -21,16 +18,12 @@ name as the link text. For example `\[[foo_bar|SandBox]]` links to the SandBox
 page, but the link will appear like this: [[foo_bar|SandBox]].
 
 To link to an anchor inside a page, you can use something like
-`\[[WikiLink#foo]]`
-
-## Directives and WikiLinks
-
-ikiwiki has two syntaxes for
-[[directives|directive]].  The older syntax
-used spaces to distinguish between directives and
-wikilinks; as a result, with that syntax in use, you cannot use spaces
-in WikiLinks, and must replace spaces with underscores.  The newer
-syntax, enabled with the `prefix_directives` option in an ikiwiki
-setup file, prefixes directives with `!`, and thus does not prevent
-links with spaces.  Future versions of ikiwiki will turn this option
-on by default.
+`\[[WikiLink#foo]]` .
+
+If the file linked to by a WikiLink looks like an image, it will
+be displayed inline on the page.
+
+---
+
+You can also put an url in a WikiLink, to link to an external page.
+Email addresses can also be used to generate a mailto link.
diff --git a/index.mdwn b/index.mdwn
index 05834e0..4187c11 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -4,4 +4,4 @@ All wikis are supposed to have a [[SandBox]], so this one does too.
 
 ----
 
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+This wiki is powered by [[ikiwiki]].
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 14cd5ff..54dd0fd 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -18,7 +18,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
-* [[!shortcut name=debbug url="http://bugs.debian.org/%s" desc="bug #%s"]]
+* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
 * [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
@@ -59,12 +59,14 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]]
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
+* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
+* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
 
 To add a new shortcut, use the `shortcut`
 [[ikiwiki/directive]]. In the url, "%s" is replaced with the
-text passed to the named shortcut, after url-encoding it, and '%S' is
-replaced with the raw, non-encoded text. The optional `desc` parameter
-controls the description of the link.
+text passed to the named shortcut, after [[!wikipedia url_encoding]]
+it, and '%S' is replaced with the raw, non-encoded text. The optional
+`desc` parameter controls the description of the link.
 
 Remember that the `name` you give the shortcut will become a new
 [[ikiwiki/directive]].  Avoid using a `name` that conflicts
@@ -73,5 +75,5 @@ parameter that will override the one provided at definition time.
 
 If you come up with a shortcut that you think others might find useful,
 consider contributing it to the [shortcuts page on the ikiwiki
-ikiwiki](http://ikiwiki.info/shortcuts/), so that future versions of
+wiki](http://ikiwiki.info/shortcuts/), so that future versions of
 ikiwiki will include your shortcut in the standard underlay.
diff --git a/style.css b/style.css
index 5787ef6..bf000da 100644
--- a/style.css
+++ b/style.css
@@ -4,6 +4,14 @@
  * local.css and use it to override or change settings in this one.
  */
 
+/* html5 compat */
+article,
+header,
+footer,
+nav {
+	display: block;
+}
+
 .header {
 	margin: 0;
 	font-size: 22px;
@@ -12,7 +20,7 @@
 	display: block;
 }
 
-.author {
+.inlineheader .author {
 	margin: 0;
 	font-size: 18px;
 	font-weight: bold;
@@ -21,8 +29,15 @@
 
 .actions ul {
 	margin: 0;
-	padding: 6px;
+	padding: 6px .4em;
+	height: 1em;
 	list-style-type: none;
+}
+.actions li {
+	display: inline;
+	padding: .2em;
+}
+.pageheader .actions ul {
 	border-bottom: 1px solid #000;
 }
 
@@ -30,20 +45,27 @@
 	border-bottom: 0;
 }
 
-div.inlinecontent {
-	margin-top: .4em;
+#otherlanguages ul {
+	margin: 0;
+	padding: 6px;
+	list-style-type: none;
 }
-
-.actions li {
+#otherlanguages li {
 	display: inline;
 	padding: .2em .4em;
 }
+.pageheader #otherlanguages {
+	border-bottom: 1px solid #000;
+}
 
-.pagefooter {
-	clear: both;
+.inlinecontent {
+	margin-top: .4em;
 }
 
-.tags {
+.pagefooter,
+.inlinefooter,
+.comments {
+	clear: both;
 }
 
 #pageinfo {
@@ -51,10 +73,14 @@ div.inlinecontent {
 	border-top: 1px solid #000;
 }
 
-div.tags {
+.tags {
 	margin-top: 1em;
 }
 
+.inlinepage .tags {
+        display: inline;
+}
+
 .mapparent {
 	text-decoration: none;
 }
@@ -65,6 +91,14 @@ div.tags {
 	text-align: center;
 }
 
+.align-left {
+	float:left;
+}
+
+.align-right {
+	float:right;
+}
+
 #backlinks {
 	margin-top: 1em;
 }
@@ -75,19 +109,28 @@ div.tags {
 }
 
 #editcontent {
-	width: 100%;
+	width: 98%;
+}
+
+.editcontentdiv {
+	width: auto;
+	overflow: auto;
 }
 
 img {
 	border-style: none;
 }
 
+pre {
+	overflow: auto;
+}
+
 div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
 	overflow: auto;
-	clear: both;
-	width: 100%;
+	width: auto;
+	clear: none;
 	background: #eee;
 	color: black !important;
 }
@@ -131,17 +174,19 @@ div.recentchanges {
 	width: 60%;
 }
 
-/* Used for adding a blog page. */
 #blogform {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
 	background: #eee;
 	color: black !important;
+	width: auto;
+	overflow: auto;
 }
 
 .inlinepage {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
+	overflow: auto;
 }
 
 .pagedate,
@@ -156,90 +201,18 @@ div.recentchanges {
 	color: #C00;
 }
 
-/* Used for invalid form fields. */
-.fb_invalid {
-	color: red;
-	background: white !important;
-}
-
-/* Used for required form fields. */
-.fb_required {
-	font-weight: bold;
-}
-
-/* Orange feed button. */
-.feedbutton {
-	background: #ff6600;
-	color: white !important;
-	border-left: 1px solid #cc9966;
-	border-top: 1px solid #ccaa99;
-	border-right: 1px solid #993300;
-	border-bottom: 1px solid #331100;
-	padding: 0px 0.5em 0px 0.5em;
-	font-family: sans-serif;
-	font-weight: bold;
-	font-size: small;
-	text-decoration: none;
-	margin-top: 1em;
-}
-.feedbutton:hover {
-	color: white !important;
-	background: #ff9900;
-}
-
-/* Tag cloud. */
-.pagecloud {
-	float: right;
-	width: 30%;
-	text-align: center;
-	padding: 10px 10px;
-	border: 1px solid #aaa;
-	background: #eee;
-	color: black !important;
-}
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
-
-#sidebar {
-	line-height: 3ex;
+.sidebar {
 	width: 20ex;
 	float: right;
-	margin-left: 40px;
-	margin-bottom: 40px;
-	padding: 2ex 2ex;
+	margin-left: 4px;
+	margin-bottom: 4px;
+	margin-top: -1px;
+	padding: 0ex 2ex;
 	background: white;
+	border: 1px solid black;
 	color: black !important;
 }
 
-/* outlines */
-li.L1 {
-	list-style: upper-roman;
-}
-li.L2 {
-	list-style: decimal;
-}
-li.L3 {
-	list-style: lower-alpha;
-}
-li.L4 {
-	list-style: disc;
-}
-li.L5 {
-	list-style: square;
-}
-li.L6 {
-	list-style: circle;
-}
-li.L7 {
-	list-style: lower-roman;
-}
-li.L8 {
-	list-style: upper-alpha;
-}
-
 hr.poll {
 	height: 10pt;
 	color: white !important;
@@ -253,6 +226,27 @@ div.poll {
 	border: 1px solid #aaa;
 }
 
+span.color {
+	padding: 2px;
+}
+
+.comment-header,
+.microblog-header {
+	font-style: italic;
+	margin-top: .3em;
+}
+.comment .author,
+.microblog .author {
+	font-weight: bold;
+}
+.comment-subject {
+	font-weight: bold;
+}
+.comment {
+	border: 1px solid #aaa;
+	padding: 3px;
+}
+
 div.progress {
 	margin-top: 1ex;
 	margin-bottom: 1ex;
@@ -269,23 +263,7 @@ div.progress-done {
 	padding: 1px;
 }
 
-input#openid_url {
-	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 0 50%;
-	color: #000;
-	padding-left: 18px;
-}
-
-input#searchbox {
-	background: url(wikiicons/search-bg.gif) no-repeat;
-	background-color: #fff;
-	background-position: 100% 50%;
-	color: #000;
-	padding-right: 16px;
-}
-
-/* Things to hide in printouts. */
+/* things to hide in printouts */
 @media print {
 	.actions { display: none; }
 	.tags { display: none; }
@@ -295,7 +273,7 @@ input#searchbox {
 	#backlinks { display: none; }
 }
 
-/* Provided for use by template plugin for floating info boxes. */
+/* infobox template */
 .infobox {
 	float: right;
 	margin-left: 2ex;
@@ -307,7 +285,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Provided for use by template plugin for floating note boxes. */
+/* notebox template */
 .notebox {
 	float: right;
 	margin-left: 2ex;
@@ -320,7 +298,7 @@ input#searchbox {
 	color: black !important;
 }
 
-/* Used by the popup template and for backlinks hiding. */
+/* popup template and backlinks hiding */
 .popup {
 	border-bottom: 1px dotted #366;
 	color: #366;
@@ -339,14 +317,9 @@ input#searchbox {
 	border: 2px solid;
 	background-color: #dee;
 	color: black;
-	
-	/* Nonstandard, but very nice. */
-	opacity: 0.95;
-	-moz-opacity: 0.95;
-	filter: alpha(opacity=95);
 }
 
-/* Formbuilder styling */
+/* form styling */
 fieldset {
 	margin: 1ex 0;
 	border: 1px solid black;
@@ -358,17 +331,153 @@ legend {
 	float: left;
 	margin: 2px 0;
 }
-#signin_openid_url_label {
-	float: left;
-	margin-right: 1ex;
+label.block {    
+	display: block;   
+}
+label.inline {    
+	display: inline;
+}
+input#openid_identifier {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
+input#searchbox {
+	background: url(wikiicons/search-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 100% 50%;
+	color: #000;
+	padding-right: 16px;
+}
+/* invalid form fields */
+.fb_invalid {
+	color: red;
+	background: white !important;
+}
+/* required form fields */
+.fb_required {
+	font-weight: bold;
+}
+
+/* highlight plugin */
+pre.hl { color:#000000; background-color:#ffffff; }
+.hl.num { color:#2928ff; }
+.hl.esc { color:#ff00ff; }
+.hl.str { color:#ff0000; }
+.hl.dstr { color:#818100; }
+.hl.slc { color:#838183; font-style:italic; }
+.hl.com { color:#838183; font-style:italic; }
+.hl.dir { color:#008200; }
+.hl.sym { color:#000000; }
+.hl.line { color:#555555; }
+.hl.mark { background-color:#ffffbb; }
+.hl.kwa { color:#000000; font-weight:bold; }
+.hl.kwb { color:#830000; }
+.hl.kwc { color:#000000; font-weight:bold; }
+.hl.kwd { color:#010181; }
+
+/* calendar plugin */
+.month-calendar-day-this-day,
+.year-calendar-this-month {
+	background-color: #eee;
+}
+.month-calendar-day-head,
+.month-calendar-day-nolink,
+.month-calendar-day-link,
+.month-calendar-day-this-day,
+.month-calendar-day-future {
+	text-align: right;
+}
+.month-calendar-arrow A:link,
+.year-calendar-arrow A:link,
+.month-calendar-arrow A:visited,
+.year-calendar-arrow A:visited {
+	text-decoration: none;
+	font-weight: normal;
+	font-size: 150%;
 }
-#signin_openid {
+
+/* outlines */
+li.L1 { list-style: upper-roman; }
+li.L2 { list-style: decimal; }
+li.L3 { list-style: lower-alpha; }
+li.L4 { list-style: disc; }
+li.L5 { list-style: square; }
+li.L6 { list-style: circle; }
+li.L7 { list-style: lower-roman; }
+li.L8 { list-style: upper-alpha; }
+
+/* tag cloud */
+.pagecloud {
+	float: right;
+	width: 30%;
+	text-align: center;
 	padding: 10px 10px;
 	border: 1px solid #aaa;
-	background: #eee; 
+	background: #eee;
 	color: black !important;
 }
+.smallestPC { font-size: 70%; }
+.smallPC { font-size: 85%; }
+.normalPC { font-size: 100%; }
+.bigPC { font-size: 115%; }
+.biggestPC { font-size: 130%; }
 
-span.color {
-	padding: 2px;
+/* orange feed button */
+.feedbutton {
+	background: #ff6600;
+	color: white !important;
+	border-left: 1px solid #cc9966;
+	border-top: 1px solid #ccaa99;
+	border-right: 1px solid #993300;
+	border-bottom: 1px solid #331100;
+	padding: 0px 0.5em 0px 0.5em;
+	font-family: sans-serif;
+	font-weight: bold;
+	font-size: small;
+	text-decoration: none;
+	margin-top: 1em;
+}
+.feedbutton:hover {
+	color: white !important;
+	background: #ff9900;
+}
+
+/* openid selector */
+#openid_choice {
+	display: none;
+}
+#openid_input_area {
+	clear: both;
+	padding: 10px;
+}
+#openid_btns, #openid_btns br {
+	clear: both;
+}
+#openid_highlight {
+	background-color: black;
+	float: left;
+}
+.openid_large_btn {
+	padding: 1em 1.5em;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+.openid_small_btn {
+	padding: 4px 4px;
+	border: 1px solid #DDD;
+	margin: 3px;
+	float: left;
+}
+a.openid_large_btn:focus {
+	outline: none;
+}
+a.openid_large_btn:focus {
+	-moz-outline-style: none;
+}
+.openid_selected {
+	border: 4px solid #DDD;
 }
diff --git a/templates.mdwn b/templates.mdwn
index eff0e15..9eb12e8 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -1,87 +1,80 @@
-[[!meta robots="noindex, follow"]]
-[[!if test="enabled(template)"
-then="This wiki has templates **enabled**."
-else="This wiki has templates **disabled**."
-]]
-
-Templates are files that can be filled out and inserted into pages in the
-wiki.
-
-[[!if test="enabled(template) and enabled(inline)" then="""
-
-These templates are available for inclusion onto other pages in this
-wiki:
-
-[[!inline pages="templates/* and !*/discussion" feeds=no archive=yes
-sort=title template=titlepage]]
-"""]]
-
-## Using a template
-
-Using a template works like this:
-
-	\[[!template id=note text="""Here is the text to insert into my note."""]]
+[[Ikiwiki]] uses many templates for many purposes. By editing its templates,
+you can fully customise this site.
 
-This fills out the [[note]] template, filling in the `text` field with
-the specified value, and inserts the result into the page.
+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.
 
-Generally, a value can include any markup that would be allowed in the wiki
-page outside the template. Triple-quoting the value even allows quotes to
-be included in it. Combined with multi-line quoted values, this allows for
-large chunks of marked up text to be embedded into a template:
+Ikiwiki uses the HTML::Template module as its template engine. This
+supports things like conditionals and loops in templates and is pretty
+easy to learn. All you really need to know to modify templates is this:
 
-        \[[!template id=foo name="Sally" color="green" age=8 notes="""
-        * \[[Charley]]'s sister.
-        * "I want to be an astronaut when I grow up."
-        * Really 8 and a half.
-        """]]
+* To insert the value of a template variable, use `<TMPL_VAR variable>`.
+* To make a block of text conditional on a variable being set use
+  `<TMPL_IF variable>text</TMPL_IF>`.
+* To use one block of text if a variable is set and a second if it's not,
+  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 
-## Creating a template
+[[!if test="enabled(template)" then="""
+## template pages
 
-To create a template, simply add a template directive to a page, and the 
-page will provide a link that can be used to create the template. The template
-is a regular wiki page, located in the `templates/` subdirectory inside
-the source directory of the wiki.
+The [[!iki ikiwiki/directive/template desc="template directive"]] allows
+wiki pages to be used as templates, filled out and inserted into other
+pages in the wiki.
+"""]]
 
-The template uses the syntax used by the [[!cpan HTML::Template]] perl
-module, which allows for some fairly complex things to be done. Consult its
-documentation for the full syntax, but all you really need to know are a
-few things:
+[[!if test="enabled(edittemplate)" then="""
+## default content for new pages
 
-* Each parameter you pass to the template directive will generate a 
-  template variable. There are also some pre-defined variables like PAGE
-  and BASENAME.
-* To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup
-  in the value will first be converted to html.
-* To insert the raw value of a variable, with wiki markup not yet converted
-  to html, use `<TMPL_VAR raw_variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF NAME="variable">text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF NAME="variable">text<TMPL_ELSE>other text</TMPL_IF>`
-
-Here's a sample template:
+The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
+be used to make new pages default to containing text from a template
+page, which can be filled as out the page is edited.
+"""]]
 
-        <span class="infobox">
-        Name: \[[<TMPL_VAR raw_name>]]<br />
-        Age: <TMPL_VAR age><br />
-        <TMPL_IF NAME="color">
-        Favorite color: <TMPL_VAR color><br />
-        <TMPL_ELSE>
-        No favorite color.<br />
-        </TMPL_IF>
-        <TMPL_IF NAME="notes">
-        <hr />
-        <TMPL_VAR notes>
-        </TMPL_IF>
-        </span>
+[[!if test="(enabled(template) or enabled(edittemplate))
+and enabled(inline)" then="""
+[[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
+feeds=no archive=yes sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
+"""]]
 
-The filled out template will be formatted the same as the rest of the page
-that contains it, so you can include WikiLinks and all other forms of wiki
-markup in the template. Note though that such WikiLinks will not show up as
-backlinks to the page that uses the template.
+## wiki templates
+
+These templates are used to build the wiki. The aim is to keep almost all
+html out of ikiwiki and in the templates.
+
+* `page.tmpl` - Used for displaying all regular wiki pages. This is the
+  key template to customise. [[!if test="enabled(pagetemplate)" then="""
+  (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
+  can be used to make a page use a different template than `page.tmpl`.)"""]]
+* `rsspage.tmpl` - Used for generating rss feeds for blogs.
+* `rssitem.tmpl` - Used for generating individual items on rss feeds.
+* `atompage.tmpl` - Used for generating atom feeds for blogs.
+* `atomitem.tmpl` - Used for generating individual items on atom feeds.
+* `inlinepage.tmpl` - Used for displaying a post in a blog.
+* `archivepage.tmpl` - Used for listing a page in a blog archive page.
+* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
+* `microblog.tmpl` - Used for showing a microblogging post inline.
+* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
+* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
+* `aggregatepost.tmpl` - Used by the aggregate plugin to create
+  a page for a post.
+* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin 
+  and google plugin to add search forms to wiki pages.
+* `searchquery.tmpl` - This is a Omega template, used by the
+  search plugin.
+* `comment.tmpl` - Used by the comments plugin to display a comment.
+* `change.tmpl` - Used to create a page describing a change made to the wiki.
+* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.
+* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.
+* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.
+* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to
+  make calendar archive pages.
+* `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
+  `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
+  `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
+  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user
+  interface; do not normally need to be customised.
 
-Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator. This
-ensures that if the name contains something that might be mistaken for wiki
-markup, it's not converted to html before being processed as a
-[[ikiwiki/WikiLink]].
+[[!meta robots="noindex, follow"]]
diff --git a/templates/note.mdwn b/templates/note.mdwn
index 4cc323c..9ef5ad9 100644
--- a/templates/note.mdwn
+++ b/templates/note.mdwn
@@ -1,7 +1,7 @@
 <div class="notebox">
 <TMPL_VAR text>
 </div>
-<TMPL_UNLESS NAME="text">
+<TMPL_UNLESS text>
 Use this template to insert a note into a page. The note will be styled to
 float to the right of other text on the page. This template has one
 parameter:
diff --git a/templates/popup.mdwn b/templates/popup.mdwn
index b355daa..92455eb 100644
--- a/templates/popup.mdwn
+++ b/templates/popup.mdwn
@@ -1,4 +1,4 @@
-<TMPL_UNLESS NAME="mouseover">
+<TMPL_UNLESS mouseover>
 Use this template to create a popup window that is displayed when the mouse
 is over part of the page. This template has two parameters:
 <ul>
diff --git a/wikiicons/openidlogin-bg.gif b/wikiicons/openidlogin-bg.gif
index c8f43d0..a3bfe10 100644
Binary files a/wikiicons/openidlogin-bg.gif and b/wikiicons/openidlogin-bg.gif differ
-- 
cgit v1.2.3


From 747d1ba5821b87aae3792c8304db0fa8597f2dc6 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 17 Jul 2010 14:58:41 +0200
Subject: Apply translation from po-file.

---
 ikiwiki.mdwn                      |  14 ++---
 ikiwiki/directive.mdwn            |  43 +++++++-------
 ikiwiki/formatting.mdwn           |  88 ++++++++++++++--------------
 ikiwiki/markdown.mdwn             |  17 +++---
 ikiwiki/openid.mdwn               |  27 ++++-----
 ikiwiki/pagespec.mdwn             | 120 +++++++++++++++++++-------------------
 ikiwiki/pagespec/attachment.mdwn  |  50 ++++++++--------
 ikiwiki/pagespec/po.mdwn          |  27 +++++----
 ikiwiki/pagespec/sorting.mdwn     |  31 +++++-----
 ikiwiki/searching.mdwn            |  31 +++++-----
 ikiwiki/subpage.mdwn              |  20 ++++---
 ikiwiki/subpage/linkingrules.mdwn |  55 ++++++++---------
 ikiwiki/wikilink.mdwn             |  37 ++++++------
 index.mdwn                        |   7 ++-
 recentchanges.mdwn                |   4 +-
 sandbox.mdwn                      |  33 ++++++-----
 shortcuts.mdwn                    |  55 ++++++++---------
 templates.mdwn                    | 109 +++++++++++++++++-----------------
 templates/note.mdwn               |   8 +--
 templates/popup.mdwn              |  17 +++---
 20 files changed, 401 insertions(+), 392 deletions(-)

diff --git a/ikiwiki.mdwn b/ikiwiki.mdwn
index 4d84069..84f91ca 100644
--- a/ikiwiki.mdwn
+++ b/ikiwiki.mdwn
@@ -1,17 +1,17 @@
 [[!meta robots="noindex, follow"]]
-This wiki is powered by [ikiwiki](http://ikiwiki.info/).
+Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/).
 [[!if test="enabled(version)"
-     then="(Currently running version [[!version ]].)"
+     then="(kører i øjeblikket version [[!version ]].)"
 ]]
 
-Some documentation on using ikiwiki:
+Noget dokumentation om brug af ikiwiki:
 
-* [[ikiwiki/formatting]]
+* [[formatering|ikiwiki/formatting]]
 * [[ikiwiki/wikilink]]
-* [[ikiwiki/subpage]]
+* [[underside|ikiwiki/subpage]]
 * [[ikiwiki/pagespec]]
-* [[ikiwiki/directive]]
+* [[direktiv|ikiwiki/directive]]
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
-* [[ikiwiki/searching]]
+* [[søgning|ikiwiki/searching]]
 * [[templates]]
diff --git a/ikiwiki/directive.mdwn b/ikiwiki/directive.mdwn
index fb88aa7..506c28a 100644
--- a/ikiwiki/directive.mdwn
+++ b/ikiwiki/directive.mdwn
@@ -1,43 +1,42 @@
 [[!meta robots="noindex, follow"]]
-Directives are similar to a [[ikiwiki/WikiLink]] in form, except they
-begin with `!` and may contain parameters. The general form is:
+Direktiver ligner et [[ikiwiki/WikiLink]] i form, undtagen at de begynder
+med `!` og kan indeholde parametre. Generelt er formen:
 
-	\[[!directive param="value" param="value"]]
+	\[[!direktiv param="værdi" param="værdi"]]
 
-This gets expanded before the rest of the page is processed, and can be used
-to transform the page in various ways.
+Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme
+siden på forskellige måder.
 
-The quotes around values can be omitted if the value is a simple word.
-Also, some directives may use parameters without values, for example:
+Citationen omkring værdier kan udelades hvis værdien er et enkelt
+ord. Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:
 
 	\[[!tag foo]]
 
-A directive does not need to all be on one line, it can be
-wrapped to multiple lines if you like:
+Et direktiv behøver ikke at blive holdt på een linje, det kan bredes ud over
+flere linjer hvis du har lyst:
 	
-	\[[!directive foo="baldersnatch"
+	\[[!direktiv foo="baldersnatch"
 	bar="supercalifragilisticexpialidocious" baz=11]]
 
-Also, multiple lines of *quoted* text can be used for a value.
-To allow quote marks inside the quoted text, delimit the block
-of text with triple-quotes:
+Flere linjer *citeret* tekst kan også bruges som værdi. For at tillade
+citation i den citerede tekst skal du adskille blokken med trippel-citat:
 
-	\[[!directive text="""
+	\[[!direktiv tekst="""
 	1. "foo"
 	2. "bar"
 	3. "baz"
 	"""]]
 
-ikiwiki also has an older syntax for directives, which requires a space in
-directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This
-syntax has several disadvantages: it requires a space after directives with
-no parameters (such as `\[[pagecount ]]`), and it prohibits spaces in
-[[wikilinks|ikiwiki/wikilink]].  ikiwiki now provides the `!`-prefixed
-syntax shown above as default.  However, ikiwiki still supports wikis using
-the older syntax, if the `prefix_directives` option is disabled.
+Ikiwiki har også en ældre syntaks til direktiver, som kræver et mellemrum i
+direktiver for at skelne dem fra [[wikilinks|ikiwiki/wikilink]].  Denne
+syntaks har flere ulemper: den kræver et mellemrum efter direktiver uden
+parametre (såsom `\[[pagecount ]]`), og den forbyder mellemrum i
+[[wikilinks|ikiwiki/wikilink]]. Ikiwiki har nu den `!`-foranstillede syntaks
+vist ovenfor som standard. Ikiwiki understøtter dog fortsat den ældre
+syntaks, hvis `prefix_directives`-valget er deaktiveret.
 
 [[!if test="enabled(listdirectives)" then="""
-Here is a list of currently available directives in this wiki:
+Her er en oversigt over konkret tilgængelige direktiver i for denne wiki:
 
 [[!listdirectives ]]
 """]]
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index befbce9..780fc19 100644
--- a/ikiwiki/formatting.mdwn
+++ b/ikiwiki/formatting.mdwn
@@ -1,30 +1,30 @@
-[[!meta title="Formatting wiki pages"]]
+[[!meta title="Formatering af wikisider"]]
 [[!meta robots="noindex, follow"]]
 
-Text on this wiki is, by default, written in a form very close to how you
-might write text for an email message. This style of text formatting is
-called [[MarkDown]], and it works like this:
+Teksten på denne wiki er, som udgangspunkt, skrevet på en måde som ligger
+tæt op ad hvordan du muligvis formulerer dig i email-beskeder. Denne form
+for tekstformatering kaldes [[MarkDown]], og det fungerer sådan her:
 
-Leave blank lines between paragraphs.
+hold afstand med blanke linjer mellem afsnit.
 
-You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
-in single or double asterisks.
+du kan *\*fremhæve\** eller **\*\*kraftigt fremhæve\*\*** tekst ved at
+placere det med enkelte eller dobbelte asterisker (stjerner) omkring.
 
-To create a list, start each line with an asterisk:
+En liste oprettes ved at begynde hver linje med en asterisk:
 
-* "* this is my list"
-* "* another item"
+* "* dette er min liste"
+* "* et andet emne"
 
-To make a numbered list, start each line with a number (any number will
-do) followed by a period:
+En nummereret liste laves ved at starte hver linje med et nummer (ethvert
+nummer kan bruges) efterfulgt af punktum:
 
-1. "1. first line"
-2. "2. second line"
-2. "2. third line"
+1. "1. første linje"
+2. "2. anden linje"
+2. "2. tredje linje"
 
-To create a header, start a line with one or more `#` characters followed
-by a space and the header text. The number of `#` characters controls the
-size of the header:
+En overskrift eller en sektion er en linje med et eller flere `#`-tegn
+efterfulgt af et mellemrum og overskriftsteksten. Antallet af `#`-tegn
+styrer overskriftens størrelse:
 
 # # h1
 ## ## h2
@@ -33,74 +33,76 @@ size of the header:
 ##### ##### h5
 ###### ###### h6
 
-To create a horizontal rule, just write three or more dashes or stars on
-their own line:
+En vandret skillelinje oprettes ved at skrive tre eller flere bindestreger
+eller stjerner på en linje for sig selv.
 
 ----
 
-To quote someone, prefix the quote with ">":
+Citater angives ved at sætte ">" foran hver linje:
 
-> To be or not to be,
-> that is the question.
+> At være eller ikke være,
+> det er spørgsmålet.
 
-To write a code block, indent each line with a tab or 4 spaces:
+En kodeblok skrives ved at indrykke hver linje med eet tabulator-tegn eller
+4 mellemrum:
 
 	10 PRINT "Hello, world!"
 	20 GOTO 10
 
-To link to an url or email address, you can just put the
-url in angle brackets: <<http://ikiwiki.info>>, or you can use the
-form \[link text\]\(url\)
+Du kan henvise til en URL eller en email-adresse ved at putte addressen i
+vinkelklammer: <<http://ikiwiki.info>>, eller du kan bruge formen
+\[henvisningstekst\]\(adresse\)
 
 ----
 
-In addition to basic html formatting using [[MarkDown]], this wiki lets
-you use the following additional features:
+Udover normal html-formatering med [[MarkDown]], kan du med denne wiki bruge
+følgende ekstra finesser:
 
-* To link to another page on the wiki, place the page's name inside double
-  square brackets. So you would use `\[[WikiLink]]` to link to [[WikiLink]].
+* Henvise til en anden side på wikien ved at skrive sidenavnet med dobbelte
+  lodrette klammer omkring. Udtrykket `\[[WikiLink]]` henviser til
+  [[WikiLink]].
 
 [[!if test="enabled(smiley) and smileys" then="""
-* Insert [[smileys]] and some other useful symbols. :-)
+* Indsætte [[smileys]] og andre anvendelige symboler. :-)
 """]]
 
 [[!if test="enabled(shortcut) and shortcuts" then="""
-* Use [[shortcuts]] to link to common resources.
+* Bruge [[genveje|shortcuts]] til at henvise til gængse ressourcer.
 
 	\[[!wikipedia War\_of\_1812]]
 """]]
 
 [[!if test="enabled(template) and templates" then="""
-* Create and fill out [[templates]] for repeated chunks of
-  parameterized wiki text.
+* Oprette og udfylde [[skabeloner|templates]] for gentagne klumper af
+  parameteriseret wikitekst.
 """]]
 
-* Insert various [[directives|directive]] onto a page to perform useful
-  actions.
+* Indsæt diverse [[directiver|directive]] på en side for at udføre nyttige
+  handlinger.
 [[!if test="enabled(toc) or enabled(meta) or enabled(inline)" then="""
-  For example, you can:
+  Eksempelvis kan du:
 """]]
 
 [[!if test="enabled(toc)" then="""
-  * Add a table of contents to a page:
+  * Tilføje en indholdsfortegnelse til en side:
 
 	\[[!toc]]
 """]]
 
 
 [[!if test="enabled(meta)" then="""
-  * Change the title of a page:
+  * Ændre titlen på en side:
 
-	\[[!meta title="full page title"]]
+	\[[!meta title="fuldstændige sidetitel"]]
 """]]
 
 [[!if test="enabled(inline)" then="""
-  * Create a blog by inlining a set of pages:
+  * Oprette en [[blog]] ved at indlejre et udvalg af sider:
 
 	\[[!inline pages="blog/*"]]
 """]]
 
 [[!if test="enabled(listdirectives)" then="""
-  Full list of [[directives|directive]] enabled for this wiki:
+  Komplet oversigt over [[directiver|directive]] aktiveret for denne wiki:
   [[!listdirectives ]]
 """]]
diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn
index 6841919..72269f8 100644
--- a/ikiwiki/markdown.mdwn
+++ b/ikiwiki/markdown.mdwn
@@ -1,11 +1,12 @@
 [[!meta robots="noindex, follow"]]
-[Markdown](http://daringfireball.net/projects/markdown/)
-is a minimal markup language that resembles plain text as used in
-email messages. It is the markup language used by this wiki by default.
+[Markdown](http://daringfireball.net/projects/markdown/) er et minimalt
+opmærkningssprog som afspejler simpel tekst som det bruges i
+email-beskeder. Det er standard opmærkningssprog for denne wiki.
 
-For documentation about the markdown syntax, see [[formatting]] and
-[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
+Du kan læse dokumentation til markdown-syntaksen under
+[[formatering|formatting]] og [Markdown:
+syntax](http://daringfireball.net/projects/markdown/syntax).
 
-Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
-of the markdown syntax, and are the only bit of markup that this wiki
-handles internally.
+Bemærk at [[WikiLinks|WikiLink]] og [[direktiver|directive]] ikke er en del
+af markdown-syntaksen, og er de eneste stumper opmærkning som denne wiki
+håndterer internt.
diff --git a/ikiwiki/openid.mdwn b/ikiwiki/openid.mdwn
index 2fa972e..72d76b0 100644
--- a/ikiwiki/openid.mdwn
+++ b/ikiwiki/openid.mdwn
@@ -2,27 +2,28 @@
 [[!meta robots="noindex, follow"]]
 
 [[!if test="enabled(openid)"
-     then="This wiki has OpenID **enabled**."
-     else="This wiki has OpenID **disabled**."]]
+     then="Denne wiki har OpenID **aktiveret**."
+     else="Denne wiki har OpenID **deaktiveret**."]]
 
-[OpenID](http://openid.net) is a decentralized authentication mechanism
-that allows you to have one login that you can use on a growing number of
-websites.
+[OpenID](http://openid.net) er en decentral ægthedsmekanisme som giver dig
+mulighed for at have eet login som du kan bruge på et voksende antal
+websteder.
 
-If you have an account with some of the larger web service providers,
-you might already have an OpenID. 
-[Directory of OpenID providers](http://openiddirectory.com/openid-providers-c-1.html)
+Hvis du har eh konto hos nogle af de større webservice-udbydere, har du
+muligvis allerede et OpenID.  [Directory of OpenID
+providers](http://openiddirectory.com/openid-providers-c-1.html)
 
 [[!if test="enabled(openid)" then="""
-To sign in to this wiki using OpenID, just enter it in the OpenID field in the
-signin form. You do not need to give this wiki a password or go through any
-registration process when using OpenID.
+Du kan logge på denne wiki med OpenID, ved blot at angive den i
+OpenID-feltet på login-siden. Du behøves ikke at oplyse din adgangskode til
+denne wiki eller at gennemgå en registreringsproces når du bruger OpenID.
 """]]
 
 ---
 
-It's also possible to make a page in the wiki usable as an OpenID url,
-by delegating it to an openid server. Here's an example of how to do that:
+Det er også muligt at lave en side i wikien brugbar som en OpenID URL, ved
+at delegere den til en openid server. Her er et eksempel på hvordan det kan
+gøres:
 
 	\[[!meta openid="http://yourid.myopenid.com/"
 	       server="http://www.myopenid.com/server"]]
diff --git a/ikiwiki/pagespec.mdwn b/ikiwiki/pagespec.mdwn
index c66395f..8a259b9 100644
--- a/ikiwiki/pagespec.mdwn
+++ b/ikiwiki/pagespec.mdwn
@@ -1,80 +1,80 @@
 [[!meta robots="noindex, follow"]]
-To select a set of pages, such as pages that are locked, pages
-whose commit emails you want subscribe to, or pages to combine into a
-blog, the wiki uses a PageSpec. This is an expression that matches
-a set of pages.
+Til at angive et udvalg af sider, såsom låste sider, sider hvis ændringer du
+vil email-abonnere på, eller sider som skal samles til en blog, anvender
+wikien et PageSpec. dette er et udtryk som modsvarer et bestemt udvalg af
+sider.
 
-The simplest PageSpec is a simple list of pages. For example, this matches
-any of the three listed pages:
+Det simpleste PageSpec er en helt enkel opremsning af sider med "or" imellem
+("or" betyder "eller" på engelsk). Dette modsvarer eksempelvis enhver af de
+tre nævnte sider:
 
 	foo or bar or baz
 
-More often you will want to match any pages that have a particular thing in
-their name. You can do this using a glob pattern. "`*`" stands for any part
-of a page name, and "`?`" for any single letter of a page name. So this
-matches all pages about music, and any [[SubPage]]s of the SandBox, but does
-not match the SandBox itself:
+Mere hyppigt har du dog brug for at at at modsvare sider med noget tilfælles
+i deres navne. Dette kan du udtrykke med et "glob-mønster". "`*`" står for
+enhver del af sidenavnet, og "`?`" for ethvert enkeltbogstav i
+sidenavnet. Så dette modsvarer alle sider om musik, og alle
+[[UnderSider||SubPage]] til sandkassen, men ikke selve sandkasse-siden:
 
-	*music* or SandBox/*
+	*musik* or SandBox/*
 
-You can also prefix an item with "`!`" to skip pages that match it. So to
-match all pages except for Discussion pages and the SandBox:
+Du kan også angive "`!`" foran et emne for at undgå sider som modsvarer
+det. Så for at modsvare alle sider undtagen diskussionssider og sandkassen:
 
 	* and !SandBox and !*/Discussion
 
-Some more elaborate limits can be added to what matches using these functions:
+Resultaterne kan begrænses mere nuanceret med disse funktioner:
 
-* "`glob(someglob)`" - matches pages and other files that match the given glob.
-  Just writing the glob by itself is actually a shorthand for this function.
-* "`page(glob)`" - like `glob()`, but only matches pages, not other files
-* "`link(page)`" - matches only pages that link to a given page (or glob)
-* "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or
-  tags matched by a glob)
-* "`backlink(page)`" - matches only pages that a given page links to
-* "`creation_month(month)`" - matches only files created on the given month
-* "`creation_day(mday)`" - or day of the month
-* "`creation_year(year)`" - or year
-* "`created_after(page)`" - matches only files created after the given page
-  was created
-* "`created_before(page)`" - matches only files created before the given page
-  was created
-* "`internal(glob)`" - like `glob()`, but matches even internal-use 
-  pages that globs do not usually match.
+* "`glob(nogetglob)`" - modsvarer sider og andre filer som modsvarer det givne glob.
+  Blot at skrive glob'et alene er faktisk en genvej til denne funktion.
+* "`page(glob)`" - lissom `glob()`, men modsvarer kun sider, ikke andre filer
+* "`link(side)`" - modsvarer kun sider som henviser til en given side (eller glob)
+* "`tagged(mærkat)`" - modsvarer sider som er opmærket eller henviser til den angivne mærkat (eller
+  mærkater modsvaret af et glob)
+* "`backlink(side)`" - modsvarer kun sider som en given side henviser til
+* "`creation_month(måned)`" - modsvarer kun filer oprettet den givne måned
+* "`creation_day(månedsdag)`" - eller dag på måneden
+* "`creation_year(år)`" - eller år
+* "`created_after(side)`" - modsvarer kun filer oprettet efter den givne side
+  blev oprettet
+* "`created_before(side)`" - modsvarer kun filer oprettet før den givne side
+  blev oprettet
+* "`internal(glob)`" - lissom `glob()`, men modsvarer også internt anvendte 
+  sider som glob normalt ikke modsvarer.
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
   "`license(glob)`", "`copyright(glob)`", "`guid(glob)`" 
-  - match pages that have the given metadata, matching the specified glob.
-* "`user(username)`" - tests whether a modification is being made by a
-  user with the specified username. If openid is enabled, an openid can also
-  be put here. Glob patterns can be used in the username. For example, 
-  to match all openid users, use `user(*://*)`
-* "`admin()`" - tests whether a modification is being made by one of the
-  wiki admins.
-* "`ip(address)`" - tests whether a modification is being made from the
-  specified IP address.
-* "`comment(glob)`" - matches comments to a page matching the glob.
-* "`comment_pending(glob)`" - matches unmoderated, pending comments.
-* "`postcomment(glob)`" - matches only when comments are being 
-  posted to a page matching the specified glob
+  - modsvarer sider med de givne metadata, som modsvarer det angivne glob.
+* "`user(brugernavn)`" - tester hvorvidt en ændring foretages af en
+  bruger med det angivne brugernavn. Hvis openid er aktiveret, kan en openid også
+  indsættes her. Glob mønstre kan anvendes i brugernavnet. Som eksempel 
+  kan alle openid brugere modsvares ved at anvende `user(*://*)`
+* "`admin()`" - tester hvorvidt en ændring bliver foretaget af en af
+  wiki-administratorerne.
+* "`ip(adresse)`" - tester hvorvidt en ændring sker fra den
+  angivne IP-adresse.
+* "`comment(glob)`" - modsvarer kommentarer til en side der modsvarer glob'et.
+* "`comment_pending(glob)`" - modsvarer ikke-tilbageholdte, afventende kommentarer.
+* "`postcomment(glob)`" - modsvarer kun når kommentarer
+  sendes til en side som modsvarer det angivne glob
 
-For example, to match all pages in a blog that link to the page about music
-and were written in 2005:
+For eksempelvis at modsvare alle sider i en blog som henviser til en side om
+musik og som blev skrevet i 2005:
 
-	blog/* and link(music) and creation_year(2005)
+	blog/* and link(musik) and creation_year(2005)
 
-Note the use of "and" in the above example, that means that only pages that
-match each of the three expressions match the whole. Use "and" when you
-want to combine expression like that; "or" when it's enough for a page to
-match one expression. Note that it doesn't make sense to say "index and
-SandBox", since no page can match both expressions.
+Bemærk brugen af "and" i eksemplet ovenfor ("and" betyder "og" på engelsk),
+som betyder at kun sider der modsvarer hver af de tre udtryk modsvarer det
+hele. Brug "and" når du vil kombinere udtryk på den måde; "or" når det er
+nok at én side modsvarer et udtryk. Bemærk at det ikke giver mening at sige
+"index and SandBox", da ingen sider kan modsvare begge udtryk.
 
-More complex expressions can also be created, by using parentheses for
-grouping. For example, to match pages in a blog that are tagged with either
-of two tags, use:
+Mere komplekse udtryk kan dannes ved at gruppere med paranteser. Eksempelvis
+modsvarer dette sider i en blog som er mærket af med en af to mærkater:
 
 	blog/* and (tagged(foo) or tagged(bar))
 
-Note that page names in PageSpecs are matched against the absolute
-filenames of the pages in the wiki, so a pagespec "foo" used on page
-"a/b" will not match a page named "a/foo" or "a/b/foo". To match
-relative to the directory of the page containing the pagespec, you can
-use "./". For example, "./foo" on page "a/b" matches page "a/foo".
+Bemærk at PageSpecs for sidenavne modsvares som de absolutte filnavne for
+siderne i wikien, så et pagespec "foo" brugt på siden "a/b" vil ikke
+modsvare siderne navngivet "a/foo" eller "a/b/foo". For at modsvare relativt
+til samme mappe som siden der indeholder pagespec'et kan du bruge
+"./". Eksempelvis modsvarer "./foo" på siden "a/b" siden "a/foo".
diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn
index fa2bc58..302732f 100644
--- a/ikiwiki/pagespec/attachment.mdwn
+++ b/ikiwiki/pagespec/attachment.mdwn
@@ -1,38 +1,38 @@
 [[!meta robots="noindex, follow"]]
 [[!if test="enabled(attachment)"
-     then="This wiki has attachments **enabled**."
-     else="This wiki has attachments **disabled**."]]
+     then="Denne wiki har vedhæftninger **aktiveret**."
+     else="Denne wiki har vedhæftninger **deaktiveret**."]]
 
-If attachments are enabled, the wiki admin can control what types of
-attachments will be accepted, via the `allowed_attachments`
-configuration setting.
+Hvis vedhæftninger er aktiveret, kan wiki-administratoren styre hvilke typer
+vedhæftninger der vil blive accepteret gennem opsætningsindstillingen
+`allowed_attachments`.
 
-For example, to limit most users to uploading small images, and nothing else,
-while allowing larger mp3 files to be uploaded by joey into a specific
-directory, and check all attachments for viruses, something like this could be
-used:
+Som eksempel, for at begrænse de fleste brugere til kun at kunne lægge små
+billeder op, og intet andet, mens større mp3-filer må lægges op af joey til
+en bestemt mappe, og alle vedhæftninger checkes for vira, kunne noget i stil
+med dette bruges:
   
 	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))
 
-The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
-additional tests:
+Den normale [[ikiwiki/PageSpec]]-syntaks er udvidet med følgende yderligere
+tests:
 
-* "`maxsize(size)`" - tests whether the attachment is no larger than the
-  specified size. The size defaults to being in bytes, but "kb", "mb", "gb"
-  etc can be used to specify the units.
+* "`maxsize(størrelse)`" - tester hvorvidt vedhæftningen højst fylder den
+  angivne størrelse. Størrelsen angives som standard i bytes, men "kb",
+  "mb", "gb" osv. kan bruges til at angive enheder.
   
-* "`minsize(size)`" - tests whether the attachment is no smaller than the
-  specified size.
+* "`minsize(størrelse)`" - tester hvorvidt størrelsen mindst fylder den
+  angivne størrelse.
 
-* "`ispage()`" - tests whether the attachment will be treated by ikiwiki as a
-  wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled
-  page format).
+* "`ispage()`" - tester hvorvidt vedhæftningen bliver håndteret af ikiwiki
+  som en wikiside. (altså om den har endelsen ".mdwn", eller et hvilket som
+  helst andet aktiveret sideformat).
 
-  So, if you don't want to allow wiki pages to be uploaded as attachments,
-  use `!ispage()` ; if you only want to allow wiki pages to be uploaded
-  as attachments, use `ispage()`.
+  Derfor, hvis du ikke vil tillade wikisider at blive lagt op som vedhæftninger,
+  så brug `!ispage()` ; hvis du kun vil tillade wikisider at blive lagt op som
+  vedhæftninger, så brug `ispage()`.
 
-* "`mimetype(foo/bar)`" - checks the MIME type of the attachment. You can
-  include a glob in the type, for example `mimetype(image/*)`.
+* "`mimetype(foo/bar)`" - checker MIME-typen for vedhæftningen. Du kan
+  angive et glob som type, eksempelvis `mimetype(image/*)`.
 
-* "`virusfree()`" - checks the attachment with an antiviral program.
+* "`virusfree()`" - checker vedhæftningen med et antivirusprogram.
diff --git a/ikiwiki/pagespec/po.mdwn b/ikiwiki/pagespec/po.mdwn
index f8b3985..184493c 100644
--- a/ikiwiki/pagespec/po.mdwn
+++ b/ikiwiki/pagespec/po.mdwn
@@ -1,20 +1,19 @@
 [[!if test="enabled(po)"
-     then="This wiki has po support **enabled**."
-     else="This wiki has po support **disabled**."]]
+     then="Denne wiki har po-understøttelse **aktiveret**."
+     else="Denne wiki har po-understøttelse **deaktiveret**."]]
 
-If the [[!iki plugins/po desc=po]] plugin is enabled, the regular
-[[ikiwiki/PageSpec]] syntax is expanded with the following additional
-tests that can be used to improve user navigation in a multi-lingual
-wiki:
+Hvis [[!iki plugins/po desc=po]]-udvidelsen er aktiveret, udvides den
+almindelige [[ikiwiki/PageSpec]] syntaks med følgende yderligere tests som
+kan bruges til at forbedre brugernavigation i en flersproget wiki:
 
-* "`lang(LL)`" - tests whether a page is written in the language
-  specified as a ISO639-1 (two-letter) language code.
-* "`currentlang()`" - tests whether a page is written in the same
-  language as the current page.
-* "`needstranslation()`" - tests whether a page needs translation
-  work. Only slave pages match this PageSpec.
+* "`lang(LL)`" - tester hvorvidt en side er skrevet i det sprog angivet som
+  en ISO639-1 (to-bogstavs) sprogkode.
+* "`currentlang()`" - tester hvorvidt en sider er skrevet i det samme sprog
+  som den nuværende side.
+* "`needstranslation()`" - tester hvorvidt en side har brug for
+  oversættelsesarbejde. Kun slavesider modsvarer dette PageSpec.
 
-Note that every non-po page is considered to be written in
-`po_master_language`, as specified in `ikiwiki.setup`.
+Bemærk at enhver ikke-po side forventes at være skrevet i
+`po_master_language`, som angivet i `ikiwiki.setup`.
 
 [[!meta robots="noindex, follow"]]
diff --git a/ikiwiki/pagespec/sorting.mdwn b/ikiwiki/pagespec/sorting.mdwn
index ccd7f7e..d6ba69f 100644
--- a/ikiwiki/pagespec/sorting.mdwn
+++ b/ikiwiki/pagespec/sorting.mdwn
@@ -1,26 +1,25 @@
-Some [[directives|ikiwiki/directive]] that use
-[[PageSpecs|ikiwiki/pagespec]] allow
-specifying the order that matching pages are shown in. The following sort
-orders can be specified.
+Nogle [[direktiver|ikiwiki/directive]] som anvender
+[[PageSpecs|ikiwiki/pagespec]] tillader angivelse af rækkefølge modsvarende
+sider vises i. Den følgende sorteringsrækkefølge kan angives.
 
-* `age` - List pages from the most recently created to the oldest.
+* `age` - Viser sider fra den nyest oprettede til den ældste.
 
-* `mtime` - List pages with the most recently modified first.
+* `mtime` - Viser side med den nyest redigerede først.
 
-* `title` - Order by title (page name).
+* `title` - Sorterer efter titel (sidenavn).
 [[!if test="enabled(sortnaturally)" then="""
-* `title_natural` - Orders by title, but numbers in the title are treated
-  as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
+* `title_natural` - Sorterer efter titel, men numre i titlen håndteres som
+  sådanne, ("1 2 9 10 20" fremfor "1 10 2 20 9")
 """]]
 [[!if test="enabled(meta)" then="""
-* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]`
-  or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
-  full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc.
-  also work.
+* `meta(title)` - Sorterer ifølge `\[[!meta title="foo" sortas="bar"]]`
+  eller `\[[!meta title="foo"]]` [[direktivet|ikiwiki/directive]], eller
+  sidenavnet hvis ingen fuld titel var sat. `meta(author)`, `meta(date)`,
+  `meta(updated)`, osv.  fungerer også.
 """]]
 
-In addition, you can combine several sort orders and/or reverse the order of
-sorting, with a string like `age -title` (which would sort by age, then by
-title in reverse order if two pages have the same age).
+Desuden kan du kombinere flere sorteringsrækkefølger og/eller vende den
+om,med en streng i stil med `age -title` (som ville sortere efter allder, og
+så efter titel i omvendt orden hvis to sider har samme alder).
 
 [[!meta robots="noindex, follow"]]
diff --git a/ikiwiki/searching.mdwn b/ikiwiki/searching.mdwn
index 4c12879..24ee343 100644
--- a/ikiwiki/searching.mdwn
+++ b/ikiwiki/searching.mdwn
@@ -1,20 +1,21 @@
 [[!meta robots="noindex, follow"]]
 
 [[!if test="enabled(search)"
-then="This wiki has searching **enabled**."
-else="This wiki has searching **disabled**."]]
+then="Denne wiki har søgning **aktiveret**."
+else="Denne wiki har søgning **deaktiveret**."]]
 
-If searching is enabled, you can enter search terms in the search field,
-as you'd expect. There are a few special things you can do to construct
-more powerful searches.
+Hvis søgning er aktiveret, kan du angive søgeudtryk i søgefeltet, som du
+ville forvente. Der er et par specielle ting du kan gøre for at konstruere
+mere effektive søgninger.
 
-* To match a phrase, enclose it in double quotes.
-* `AND` can be used to search for documents containing two expressions.
-* `OR` can be used to search for documents containing either one of
-  two expressions.
-* Parentheses can be used to build up complicated search expressions. For
-  example, "(foo AND bar) OR (me AND you)"
-* Prefix a search term with "-" to avoid it from appearing in the results.
-  For example, "-discussion" will omit "discussion".
-* To search for a page with a given title, use "title:foo".
-* To search for pages that contain a "bar" link, use "link:bar".
+* Put gåseøjne omkring nogle ord for at søge efter dem som én formulering.
+* `AND` kan bruges til at søge efter dokumenter som indeholder to udtryk.
+* `OR` kan bruges ti at søge efter dokumenter som indeholder ethvert af to
+  udtryk.
+* Parenteser kan bruges til at opbygge komplicerede
+  søgeformuleringer. Eksempelvis "(foo AND bar) OR (mig AND dig)"
+* Put "-" foran et søgeudtryk for at undgå det blandt
+  resultaterne. Eksempelvis vil "-discussion" udelade "discussion".
+* Brug "title:foo" til at søge efter en side med en given titel.
+* Brug "link:bar" til at søge efter sider som indeholder henvisning til
+  "bar".
diff --git a/ikiwiki/subpage.mdwn b/ikiwiki/subpage.mdwn
index 862f45e..73e51ee 100644
--- a/ikiwiki/subpage.mdwn
+++ b/ikiwiki/subpage.mdwn
@@ -1,12 +1,14 @@
 [[!meta robots="noindex, follow"]]
-ikiwiki supports placing pages in a directory hierarchy. For example,
-this page, [[SubPage]] has some related pages placed under it, like
-[[SubPage/LinkingRules]]. This is a useful way to add some order to your
-wiki rather than just having a great big directory full of pages.
+ikiwiki understøtter placering af sider i et mappehierarki. Eksempelvis har
+denne side, [[UnderSide|SubPage]], nogle relaterede sider placeret under
+sig, bl.a. [[HenvisningsRegler|SubPage/LinkingRules]]. dette er en praktisk
+måde at bringe orden i din wiki fremfor blot at have een stor mappe fuld af
+sider.
 
-To add a SubPage, just make a subdirectory and put pages in it. For
-example, this page is subpage.mdwn in this wiki's source, and there is also
-a subpage subdirectory, which contains subpage/linkingrules.mdwn. Subpages
-can be nested as deeply as you'd like.
+En [[UnderSide|SubPage]] oprettes ved blot at oprette undermappen og tilføje
+sider til den. Denne side er eksempelvis subpage.mdwn i kildekoden til denne
+wiki, og der er også en subpage-undermappe, som indeholder
+subpage/linkingrules.mdwn. Undersider kan nedarves lisså dybt du har lyst.
 
-Linking to and from a SubPage is explained in [[LinkingRules]].
+Henvisninger til og fra en [[UnderSide||SubPage]] er forklaret under
+[[HenvisningsRegler||LinkingRules]].
diff --git a/ikiwiki/subpage/linkingrules.mdwn b/ikiwiki/subpage/linkingrules.mdwn
index e547f30..80c29ac 100644
--- a/ikiwiki/subpage/linkingrules.mdwn
+++ b/ikiwiki/subpage/linkingrules.mdwn
@@ -1,33 +1,36 @@
 [[!meta robots="noindex, follow"]]
-To link to or from a [[SubPage]], you can normally use a regular
-[[WikiLink]] that does not contain the name of the parent directory of
-the [[SubPage]]. Ikiwiki descends the directory hierarchy looking for a
-page that matches your link.
+For at henvise til eller fra en [[underside|SubPage]] kan du normalt bruge
+en almindelig normal [[WikiLink]] som ikke indeholder navnet på den
+overliggende mappe til [[undersiden|SubPage]]. Ikiwiki gennemgår
+mappehierarkiet og kigger efter en side som modsvarer din henvisning.
 
-For example, if FooBar/SubPage links to "OtherPage", ikiwiki will first 
-prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next
-to FooBar/OtherPage and finally to OtherPage in the root of the wiki.
+Hvis eksempelvis FooBar/UnderSide henviser til "EnAndenSide", vil ikiwiki
+først foretrække at knytte henvisningen til FooBar/UnderSide/EnAndenSide
+hvis den eksisterer, så til FooBar/EnAndenSide og til sidst til EnAndenSide
+i roden af wikien.
 
-Note that this means that if a link on FooBar/SomePage to "OtherPage"
-currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage
-is created, the link will _change_ to point to FooBar/OtherPage. On the
-other hand, a link from BazBar to "OtherPage" would be unchanged by this
-creation of a [[SubPage]] of FooBar.
+Bemærk at dette betyder, at hvis en henvisning fra FooBar/EnSide til
+"EnAndenSide" i øjeblikket henviser til EnAndenSide i roden af wikien, og
+FooBar/EnAndenSide oprettes, så vil henvisningen blive _ændret_ til at pege
+på FooBar/EnAndenSide. Omvendt vil en henvisning fra BazBar til
+"EnAndenSide" ikke blive berørt af oprettelsen af en [[underside|SubPage]]
+til FooBar.
 
-You can also specify a link that contains a directory name, like
-"FooBar/OtherPage" to more exactly specify what page to link to. This is
-the only way to link to an unrelated [[SubPage]].
+Du kan også angive en henvisning som indeholder et mappenavn, lissom
+"FooBar/EnAndenSide", for mere nøjagtigt at angive hvilken side der henvises
+til. Kun på den måde kan du henvise til en anden sides
+[[underside|SubPage]].
 
-You can use this to, for example, to link from BazBar to "FooBar/SubPage",
-or from BazBar/SubPage to "FooBar/SubPage".
+Du kan bruge dette til eksempelvis at henvise fra BazBar til
+"FooBar/UnderSide", eller fra BazBar/UnderSide til "FooBar/UnderSide".
 
-You can also use "/" at the start of a link, to specify exactly which page
-to link to, when there are multiple pages with similar names and the link
-goes to the wrong page by default. For example, linking from
-"FooBar/SubPage" to  "/OtherPage" will link to the "OtherPage" in the root
-of the wiki, even if there is a "FooBar/OtherPage".
+Du kan også bruge "/" i begyndelsen af en henvisning, til at angive
+nøjagtigt hvilken side der henvises til, når der er flere mulige sider med
+lignende navne og henvisningen ender forkert som standard. Eksempelvis vil
+en henvisning fra "FooBar/UnderSide" til "/EnAndenSide" henvise til
+"EnAndenSide" i roden af wikien, selvom der er en "FooBar/EnAndenSide".
 
-Also, if the wiki is configured with a userdir, you can link to pages
-within the userdir without specifying a path to them. This is to allow for
-easy linking to a user's page in the userdir, to sign a comment. These
-links are checked for last of all.
+Desuden kan du, hvis wikien er opsat med "userdir", henvise til sider under
+hjemmemapper uden at angive en sti til dem. Dette er for at tillade enkel
+henvisning til en brugers side i hjemmemappen, som signatur ved en
+kommentar. Sådanne henvisninger prøves allersidst.
diff --git a/ikiwiki/wikilink.mdwn b/ikiwiki/wikilink.mdwn
index cf3b89c..c3dadec 100644
--- a/ikiwiki/wikilink.mdwn
+++ b/ikiwiki/wikilink.mdwn
@@ -1,29 +1,30 @@
 [[!meta robots="noindex, follow"]]
-WikiLinks provide easy linking between pages of the wiki. To create a
-[[WikiLink]], just put the name of the page to link to in double brackets.
-For example `\[[WikiLink]]`.
+WikiLinks gør det muligt enkelt at lave henvisninger (linke) mellem sider i
+wikien. Opret en [[WikiLink]] ved at skrive siden du vil henvise til med
+dobbelte klammer omkring. Ekempelvis `\[[WikiLink]]`.
 
-If you ever need to write something like `\[[WikiLink]]` without creating a
-wikilink, just prefix it with a `\`, like `\\[[WikiLink]]`.
 
-There are some special [[SubPage/LinkingRules]] that come into play when
-linking between [[SubPages|SubPage]].
+Hvis du vil skrive noget i stil med `\[[WikiLink]]` uden at det skal blive
+til en wikilink, så put en `\` (backslash) foran, som i `\\[[WikiLink]]`.
 
-WikiLinks are matched with page names in a case-insensitive manner, so you
-don't need to worry about getting the case the same, and can capitalise
-links at the start of a sentence, and so on.
+Specielle [[henvisningsregler|SubPage/LinkingRules]] træder i kraft når der
+henvises på tværs af [[undersider|SubPage]].
 
-It's also possible to write a WikiLink that uses something other than the page
-name as the link text. For example `\[[foo_bar|SandBox]]` links to the SandBox
-page, but the link will appear like this: [[foo_bar|SandBox]].
+WikiLinks knyttes til sidenavne uden skelen til store og små bogstaver, så
+du behøver ikke at bekymre dig om dette, og kan anvende stort
+begyndelsesbogstav i begyndelsen af en sætning o.l.
 
-To link to an anchor inside a page, you can use something like
+Det er også muligt at skrive en WikiLink som bruger noget andet end
+sidenavnet som henvisningstekst. Eksempelvis henviser `\[[foo_bar|SandBox]]`
+til sandkassen, men henvisningen fremstår som her: [[foo_bar|SandBox]].
+
+For at henvise til et anker inde på en side, kan du bruge noget i stil med
 `\[[WikiLink#foo]]` .
 
-If the file linked to by a WikiLink looks like an image, it will
-be displayed inline on the page.
+Hvis filen der henvises til med en WikiLink ligner et billede, vil det blive
+vist indlejret på siden.
 
 ---
 
-You can also put an url in a WikiLink, to link to an external page.
-Email addresses can also be used to generate a mailto link.
+Du kan også indsætte en url i en WikiLink, for at henvise til en ekstern
+side.  Email-adresser kan også bruges til at danne en "mailto"-henvisning.
diff --git a/index.mdwn b/index.mdwn
index 4187c11..6cacb00 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,8 @@
-Welcome to your new wiki.
+Velkommen til din nye wiki.
 
-All wikis are supposed to have a [[SandBox]], so this one does too.
+Alle wikier forventes at have en [[SandKasse|SandBox]], så det har denne
+også.
 
 ----
 
-This wiki is powered by [[ikiwiki]].
+Denne wiki er drevet af [[ikiwiki]].
diff --git a/recentchanges.mdwn b/recentchanges.mdwn
index 3383fc7..a8a4bf2 100644
--- a/recentchanges.mdwn
+++ b/recentchanges.mdwn
@@ -1,7 +1,7 @@
 [[!if test="enabled(meta)" then="""
-[[!meta title="RecentChanges"]]
+[[!meta title="SenesteÆndringer"]]
 """]]
-Recent changes to this wiki:
+Seneste ændringer til denne wiki:
 
 [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" 
 template=recentchanges show=0]]
diff --git a/sandbox.mdwn b/sandbox.mdwn
index c66534f..f511b43 100644
--- a/sandbox.mdwn
+++ b/sandbox.mdwn
@@ -1,32 +1,33 @@
-This is the SandBox, a page anyone can edit to learn how to use the wiki.
+Dette er [[SandKassen|SandBox]], en side som hvem som helst kan redigere for
+at lære hvordan en wiki bruges.
 
 ----
 
-Here's a paragraph.
+Her er et afsnit.
 
-Here's another one with *emphasised* text.
+her er et andet afsnit med *fremhævet* tekst.
 
-# Header
+# Overskrift
 
-## Subheader
+## Underoverskrift
 
-> This is a blockquote.
+> Dette er et citat-område
 >
-> This is the first level of quoting.
+> Dette er første niveau citering.
 >
-> > This is nested blockquote.
+> > Dette er et indlejret citat-område.
 >
-> Back to the first level.
+> Tilbage til det første niveau.
 
-Numbered list 
+Nummereret liste
 
-1. First item.
-1. Another.
-1. And another..
+1. Første emne.
+1. Et andet.
+1. Og et andet..
 
-Bulleted list
+Unummereret liste
 
-* *item*
-* item
+* *emne*
+* emne
 
 [[ikiwiki/WikiLink]]
diff --git a/shortcuts.mdwn b/shortcuts.mdwn
index 54dd0fd..e4a55ab 100644
--- a/shortcuts.mdwn
+++ b/shortcuts.mdwn
@@ -1,15 +1,14 @@
 [[!if test="enabled(shortcut)"
-     then="This wiki has shortcuts **enabled**."
-     else="This wiki has shortcuts **disabled**."]]
+     then="Denne wiki har genveje **aktiveret**."
+     else="Denne wiki har genveje **deaktiveret**."]]
 
-Some examples of using shortcuts include:
+Nogle eksempler på brug af genveje:
 
 	\[[!google foo]]
 	\[[!wikipedia War_of_1812]]
 	\[[!debbug 12345]]
-	Check the \[[!cia ikiwiki desc="CIA page for %s"]].
 
-This page controls what shortcut links the wiki supports.
+Denne side styrer hvilke genveje wikien understøtter.
 
 * [[!shortcut name=google url="http://www.google.com/search?q=%s"]]
 * [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
@@ -18,21 +17,24 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=wikipedia url="http://en.wikipedia.org/wiki/%s"]]
 * [[!shortcut name=wikitravel url="http://wikitravel.org/en/%s"]]
 * [[!shortcut name=wiktionary url="http://en.wiktionary.org/wiki/%s"]]
-* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
-* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
+* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian fejl
+  #%s"]]
+* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s"
+  desc="debian-%s@lists.debian.org"]]
 * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
 * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
 * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
 * [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
-* [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
+* [[!shortcut name=debrt
+  url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
 * [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
-  * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.
+  * Brug: `\[[!debss package]]`, `\[[!debss package#version]]`, eller `\[[!debss package/version]]`.  Se http://snapshot.debian.net for detaljer.
 * [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
-* [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
+* [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org fejl #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
-* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
-* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
-* [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]]
+* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME fejl #%s"]]
+* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux fejl #%s"]]
+* [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla fejl #%s"]]
 * [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
 * [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]]
 * [[!shortcut name=marclist url="http://marc.info/?l=%s"]]
@@ -60,20 +62,19 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=man url="http://linux.die.net/man/%s"]]
 * [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]]
 * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
-* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
+* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="fejl %s"]]
 
-To add a new shortcut, use the `shortcut`
-[[ikiwiki/directive]]. In the url, "%s" is replaced with the
-text passed to the named shortcut, after [[!wikipedia url_encoding]]
-it, and '%S' is replaced with the raw, non-encoded text. The optional
-`desc` parameter controls the description of the link.
+Tilføj en ny genvej med [[direktivet|ikiwiki/directive]] `shortcut`. I URLen
+erstattes "%s" med teksten overdraget til den navngivne genvej, efter
+[[!wikipedia url_encoding]] af den, og '%S' erstattes med den rå, ukodede
+tekst. Den valgfri `desc`-parameter styrer beskrivelsen af henvisningen.
 
-Remember that the `name` you give the shortcut will become a new
-[[ikiwiki/directive]].  Avoid using a `name` that conflicts
-with an existing directive.  These directives also accept a `desc`
-parameter that will override the one provided at definition time.
+Husk at `name`-parameteren som du tildeler genvejen bliver et nyt
+[[direktiv|ikiwiki/directive]]. Undgå et navn som er i strid med et
+eksisterende direktiv. Disse direktiver accepterer også en `desc`-parameter
+som vil overskygge den der blev angivet ved definitionen.
 
-If you come up with a shortcut that you think others might find useful,
-consider contributing it to the [shortcuts page on the ikiwiki
-wiki](http://ikiwiki.info/shortcuts/), so that future versions of
-ikiwiki will include your shortcut in the standard underlay.
+Hvis du finder på en genvej som du mener andre kunne få glæde af også, kan
+du overveje at bidrage med den til [shortcuts-siden på ikiwiki
+wikien](http://ikiwiki.info/shortcuts/), så fremtidige versioner af ikiwiki
+inkluderer din genvej i standardunderlaget.
diff --git a/templates.mdwn b/templates.mdwn
index 9eb12e8..6ae9424 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -1,80 +1,79 @@
-[[Ikiwiki]] uses many templates for many purposes. By editing its templates,
-you can fully customise this site.
+[[Ikiwiki]] anvender mange skabeloner til forskellige formål. Ved at
+redigere disse skabeloner kan du fuldstændigt tilrette dette sted.
 
-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.
+Skabeloner erplaceret i `/usr/share/ikiwiki/templates` som standard;
+`templatedir`-indstillingen kan bruges til at kigge i en anden mappe
+først. Tilrettede skabeloner kan også placeres inde i "templates/"-mappen i
+din wiki's kildemateriale.
 
-Ikiwiki uses the HTML::Template module as its template engine. This
-supports things like conditionals and loops in templates and is pretty
-easy to learn. All you really need to know to modify templates is this:
+Ikiwiki anvender HTML::Template modulet som dets skabelon-motor. Det
+understøtter ting som betingelser og løkker i skabeloner og er ret nemt at
+lære. Alt hvad du reelt behøver at vide for at tilrette skabeloner er dette:
 
-* To insert the value of a template variable, use `<TMPL_VAR variable>`.
-* To make a block of text conditional on a variable being set use
-  `<TMPL_IF variable>text</TMPL_IF>`.
-* To use one block of text if a variable is set and a second if it's not,
-  use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
+* Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel.
+* Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF
+  variabel>tekst</TMPL_IF>`.
+* Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med
+  `<TMPL_IF variabel>tekst<TMPL_ELSE>anden tekst</TMPL_IF>`
 
 [[!if test="enabled(template)" then="""
-## template pages
+## skabelonsider
 
-The [[!iki ikiwiki/directive/template desc="template directive"]] allows
-wiki pages to be used as templates, filled out and inserted into other
-pages in the wiki.
+Med [[!iki ikiwiki/directive/template desc="skabelondirektivet"]] kan
+wikisider bruges som skabeloner, udfyldt og indsat i andre sider i wikien.
 """]]
 
 [[!if test="enabled(edittemplate)" then="""
-## default content for new pages
+## sntandard indhold for nye sider
 
-The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
-be used to make new pages default to containing text from a template
-page, which can be filled as out the page is edited.
+[[!iki ikiwiki/directive/edittemplate desc="Edittemplate-direktivet"]] kan
+anvendes til at lade nyoprettede sider som standard indeholde tekst fra en
+skabelonside, som så kan tilrettes når siden redigeres.
 """]]
 
 [[!if test="(enabled(template) or enabled(edittemplate))
 and enabled(inline)" then="""
 [[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
 feeds=no archive=yes sort=title template=titlepage
-rootpage=templates postformtext="Add a new template named:"]]
+rootpage=templates postformtext="Tilføj en ny skabelon med dette navn:"]]
 """]]
 
-## wiki templates
+## wiki-skabeloner
 
-These templates are used to build the wiki. The aim is to keep almost all
-html out of ikiwiki and in the templates.
+Disse skabeloner bliver brugt til at bygge wikien. Målet er at holde næsten
+al html ude af ikiwiki og inde i skabelonerne.
 
-* `page.tmpl` - Used for displaying all regular wiki pages. This is the
-  key template to customise. [[!if test="enabled(pagetemplate)" then="""
-  (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
-  can be used to make a page use a different template than `page.tmpl`.)"""]]
-* `rsspage.tmpl` - Used for generating rss feeds for blogs.
-* `rssitem.tmpl` - Used for generating individual items on rss feeds.
-* `atompage.tmpl` - Used for generating atom feeds for blogs.
-* `atomitem.tmpl` - Used for generating individual items on atom feeds.
-* `inlinepage.tmpl` - Used for displaying a post in a blog.
-* `archivepage.tmpl` - Used for listing a page in a blog archive page.
-* `titlepage.tmpl` - Used for listing a page by title in a blog archive page.
-* `microblog.tmpl` - Used for showing a microblogging post inline.
-* `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
-* `feedlink.tmpl` - Used to add rss/atom links if `blogpost.tmpl` is not used.
-* `aggregatepost.tmpl` - Used by the aggregate plugin to create
-  a page for a post.
-* `searchform.tmpl`, `googleform.tmpl` - Used by the search plugin 
-  and google plugin to add search forms to wiki pages.
-* `searchquery.tmpl` - This is a Omega template, used by the
-  search plugin.
-* `comment.tmpl` - Used by the comments plugin to display a comment.
-* `change.tmpl` - Used to create a page describing a change made to the wiki.
-* `recentchanges.tmpl` - Used for listing a change on the RecentChanges page.
-* `autoindex.tmpl` - Filled in by the autoindex plugin to make index pages.
-* `autotag.tmpl` - Filled in by the tag plugin to make tag pages.
-* `calendarmonth.tmpl`, `calendaryear.tmpl` - Used by ikiwiki-calendar to
-  make calendar archive pages.
+* `page.tmpl` - Anvendt til at vise alle normale wikisider. Dette er den
+  centrale skabelon at tilrette. [[!if test="enabled(pagetemplate)" then="""
+  ([[!iki ikiwiki/directive/pagetemplate desc="Pagetemplate direktivet"]]
+  kan bruges til at lade en side anvende en anden skabelon end `page.tmpl`.)"""]]
+* `rsspage.tmpl` - Anvendt til at danne rss fødninger til blogs.
+* `rssitem.tmpl` - Anvendt til at danne individuelle emner i rss fødninger.
+* `atompage.tmpl` - Anvendt til at danne atom fødninger til blogs.
+* `atomitem.tmpl` - Anvendt til at danne individuelle emner i atom fødninger.
+* `inlinepage.tmpl` - Anvendt til at vise et indlæg i en blog.
+* `archivepage.tmpl` - Anvendt til opremsning af en side i en blogs arkivside.
+* `titlepage.tmpl` - Anvendt til opremsning af en sides titel i en blogs arkivside.
+* `microblog.tmpl` - Anvendt til at vise et mikroblog-indlæg inlejret.
+* `blogpost.tmpl` - Anvendt til en formular til at tilføje et indlæg til en blog (og rss/atom henvisninger)
+* `feedlink.tmpl` - Anvendt til at tilføje rss/atom henvisninger hvis `blogpost.tmpl` ikke anvendes.
+* `aggregatepost.tmpl` - Anvendt af aggregate-udvidelsen til at oprette
+  en side til et indlæg.
+* `searchform.tmpl`, `googleform.tmpl` - Anvendt af search- 
+  og google-udvidelserne til at tilføje søgeformularer til wikisider.
+* `searchquery.tmpl` - Dette er en Omega-skabelon, anvendt af
+  search-udvidelsen.
+* `comment.tmpl` - Anvendt af comments-udvidelsen til at vise en kommentar.
+* `change.tmpl` - Anvendt til at oprette en side der beskriver en ændring lavet på wikien.
+* `recentchanges.tmpl` - Anvendt til at opremse en ændring på RecentChanges siden.
+* `autoindex.tmpl` - Udfyldt af autoindex-udvidelsen til at oprette index sider.
+* `autotag.tmpl` - Udfyldt af tag-udvidelsen til at oprette mærkat-sider.
+* `calendarmonth.tmpl`, `calendaryear.tmpl` - Anvendt af ikiwiki-calendar til
+  at oprette kalender-arkiv sider.
 * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
   `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
   `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user
-  interface; do not normally need to be customised.
+  `passwordmail.tmpl`, `openid-selector.tmpl` - Dele af ikiwiki's brugerflade;
+  kræver normalt ingen tilretning.
 
 [[!meta robots="noindex, follow"]]
diff --git a/templates/note.mdwn b/templates/note.mdwn
index 9ef5ad9..2c6c9e0 100644
--- a/templates/note.mdwn
+++ b/templates/note.mdwn
@@ -2,10 +2,10 @@
 <TMPL_VAR text>
 </div>
 <TMPL_UNLESS text>
-Use this template to insert a note into a page. The note will be styled to
-float to the right of other text on the page. This template has one
-parameter:
+Brug denne skabelon til at indsætte en note på en side. Noten vil blive
+udsmykket til at flyde til højre for den øvrige tekst på siden. Denne
+skabelon har et parameter:
 <ul>
-<li>`text` - the text to display in the note
+<li>`text` - teksten som vises i noten
 </ul>
 </TMPL_UNLESS>
diff --git a/templates/popup.mdwn b/templates/popup.mdwn
index 92455eb..6d56070 100644
--- a/templates/popup.mdwn
+++ b/templates/popup.mdwn
@@ -1,15 +1,14 @@
 <TMPL_UNLESS mouseover>
-Use this template to create a popup window that is displayed when the mouse
-is over part of the page. This template has two parameters:
+Brug denne skabelon til at lave et popup-vindue som vises når musemarkøren er
+henover en del af siden. Denne skabelon har to parametre:
 <ul>
-<li>`mouseover` - This is the text or other content that triggers the
-popup.
-<li>`popup` - This should be the content of the popup window. It can be
-anything, even images or a whole little wiki page, but should not be too
-large for good usability.
+<li>`mouseover` - Dette er teksten eller andet indhold som udløser popup'en.
+<li>`popup` - Her angives indeholdet af popup-vinduet. Det kan være hvad som
+helst, endda billeder eller hele små wikisider, men bør ikke være for stort af
+hensyn til brugervenligheden.
 </ul>
-Note that browsers that do not support the CSS will display the popup
-inline in the page, inside square brackets.
+Bemærk at browsere som ikke understøtter CSS-koden vil vise popup'en indlejret
+på siden, indenfor lodrette klammer.
 </TMPL_UNLESS>
 <span class="popup"><TMPL_VAR mouseover>
 <span class="paren">[</span><span class="balloon"><TMPL_VAR popup></span><span class="paren">]</span>
-- 
cgit v1.2.3