Merge branch 'master' into nonedit

Conflicts (manually resolved):

	ikiwiki.setup

10 files changed, 4034 insertions, 2823 deletions

diff --git a/.gitignore b/.gitignore
index df30d2f..8749894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@
 /basewiki_nonedit_l10n
 /content
 /content_dummy
+/directives
+/directives_l10n
 /smiley
 /smiley_l10n
 /templates
diff --git a/Makefile b/Makefile
index 5d2cac2..721bd21 100644
--- a/Makefile
+++ b/Makefile
@@ -6,14 +6,14 @@ ikiwiki_ORIGIN = git://source.jones.dk/ikiwiki_MODULE
 # Git branch (with capital FLAVOR and LOCALE replaced or stripped as needed)
 ikiwiki_BRANCH = master-FLAVOR-LOCALE
 # modules (subproject extension names) used.  Expands Git ORIGINs
-ikiwiki_MODULES = templates basewiki smiley
+ikiwiki_MODULES = templates basewiki smiley directives
 # flavors used.  Expands Git BRANCHes
 ikiwiki_basewiki_FLAVORS = nonedit
 ikiwiki_templates_FLAVORS = nonedit
 # locales used.  Expands Git BRANCHes
 #ikiwiki_LOCALES = da nb
 # gettext-based modules and locales used
-#ikiwiki_POMODULES = basewiki smiley
+#ikiwiki_POMODULES = basewiki smiley directives
 #ikiwiki_POLOCALES = da
 
 dummy_MODULES = content_dummy
diff --git a/ikiwiki.setup b/ikiwiki.setup
index afe0e87..4332251 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -1,209 +1,262 @@
 #!/usr/bin/perl
-# Configuration file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
-# build the wiki.
+# Setup file for ikiwiki.
+#
+# Passing this to ikiwiki --setup will make ikiwiki generate
+# wrappers and build the wiki.
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
-
 use IkiWiki::Setup::Standard {
-	wikiname => "MyWiki",
-	#adminuser => ["yourname", ],
-	adminemail => 'me@example.org',
-
-	# Be sure to customise these..
-	srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content_dummy",
-	destdir => $ENV{'HOME'} . "/public_websites/wiki.example.org",
-
-	url => "http://wiki.example.org",
-	cgiurl => "http://wiki.example.org/ikiwiki.cgi",
-	templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_nonedit",
+	# name of the wiki
+	wikiname => 'MyWiki',
+	# contact email for wiki
+	#adminemail => 'me@example.org',
+	# users who are wiki admins
+	adminuser => [],
+	# users who are banned from the wiki
+	banned_users => [],
+	# where the source of the wiki is located
+	srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content_dummy',
+	# where to build the wiki
+	destdir => $ENV{'HOME'} . '/public_websites/wiki.example.org',
+	# base url to the wiki
+	url => 'http://wiki.example.org',
+	# url to the ikiwiki.cgi
+	cgiurl => 'http://wiki.example.org/ikiwiki.cgi',
+	# cgi wrapper to generate
+	cgi_wrapper => $ENV{'HOME'} . '/public_cgi/wiki.example.org/ikiwiki.cgi',
+	# mode for cgi_wrapper (can safely be made suid)
+	cgi_wrappermode => '06755',
+	# rcs backend to use
+	rcs => '',
+	# plugins to add to the default configuration
+	add_plugins => [],
+	# plugins to disable
+	disable_plugins => [],
+	# location of template files
+	templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit',
+	# base wiki source location
 	underlaydirs => [
 		$ENV{'HOME'} . "/private_webdata/samplewiki/content",
 		],
-	underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit",
-
-	# Subversion stuff.
-	#rcs => "svn",
-	#historyurl => "http://svn.example.org/trunk/[[file]]",
-	#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-	#svnrepo => "/svn/wiki",
-	#svnpath => "trunk",
-
-	# Git stuff.
-	#rcs => "git",
-	#historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master
-	#diffurl => "http://git.example.org/?p=samplewiki_content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-	#gitorigin_branch => "samplewiki",
-	#gitmaster_branch => "master",
-
-	# Tla stuff.
-	#rcs => "tla"
-	#historyurl => ??,
-	#diffurl => ??,
-
-	# Mercurial stuff.
-	#rcs => "mercurial",
-	#historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
-	#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
-
-	# Bazaar stuff.
-	#rcs => "bzr",
-	#historyurl => "", 
-	#diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
-
-	# Monotone stuff
-	#rcs => "monotone",
-	#mtnkey => "web\@machine.company.com",
-	#historyurl => "http://viewmtn.example.com/branch/head/filechanges/com.example.branch/[[file]]",
-	#diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
-	# Set if you want the wiki to sync on update and commit.
-	#mtnsync => 0,
-	# The path to your workspace (defaults to the srcdir itself)
-	# e.g. use if your srcdir is a subdirectory of the workspace.
-	#mtnrootdir => "path/to/root/of/workspace",
-
-	wrappers => [
-		#{
-		#	# The cgi wrapper.
-		#	cgi => 1,
-		#	wrapper => $ENV{'HOME'} . "/public_cgi/wiki.example.org/ikiwiki.cgi",
-		#	wrappermode => "06755",
-		#},
-		#{
-		#	# The svn post-commit wrapper.
-		#	# Note that this will overwrite any existing
-		#	# post-commit hook script, which may not be
-		#	# what you want.
-		#	wrapper => "/svn/wikirepo/hooks/post-commit",
-		#	wrappermode => "04755",
-		#	# Log to syslog since svn post-commit hooks
-		#	# hide output and errors.
-		#	syslog => 1,
-		#},
-		#{
-		#	# The git post-update wrapper.
-		#	# Note that this will overwrite any existing
-		#	# post-update hook script, which may not be
-		#	# what you want.
-		#	wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki",
-		#	wrappermode => "06755",
-		#},
-		#{
-		#	# The monotone netsync hook.
-		#	wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
-		#	wrappermode => "06755",
-		#},
-	],
-
-	# Default to generating rss feeds for pages with feeds?
-	#rss => 1,
-	# Default to generating atom feeds for pages with feeds?
-	#atom => 1,
-	# Allow generating feeds even if not generated by default?
-	#allowrss => 1,
-	#allowatom => 1,
-	# Urls to ping with XML-RPC when feeds are updated
-	#pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
-	# Include discussion links on all pages?
+	underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit',
+	# display verbose messages when building?
+	#verbose => 1,
+	# log to syslog?
+	#syslog => 1,
+	# create output files named page/index.html?
+	usedirs => 1,
+	# use '!'-prefixed preprocessor directives?
+	prefix_directives => 0,
+	# use page/index.mdwn source files
+	indexpages => 0,
+	# enable Discussion pages?
 	discussion => 1,
-	# To exclude files matching a regexp from processing. This adds to
-	# the default exclude list.
-	#exclude => qr/\.wav$/,
-	# To change the extension used for generated html files.
-	#htmlext => 'htm',
-	# Time format (for strftime)
-	#timeformat => '%c',
-	# Locale to use. Must be a UTF-8 locale.
+	# only send cookies over SSL connections?
+	sslcookie => 0,
+	# extension to use for new pages
+	default_pageext => 'mdwn',
+	# extension to use for html files
+	htmlext => 'html',
+	# strftime format string to display date
+	timeformat => '%c',
+	# UTF-8 locale to use
 	#locale => 'en_US.UTF-8',
-	# Only send cookies over SSL connections.
-	#sslcookie => 1,
-	# Logging settings:
-	#verbose => 1,
-	syslog => 0,
-	# To link to user pages in a subdirectory of the wiki.
-	#userdir => "users",
-	# To create output files named page.html rather than page/index.html.
-	#usedirs => 0,
-	# Simple spam prevention: require an account-creation password.
-	#account_creation_password => "example",
-	# Cost of generating a password using Authen::Passphrase::BlowfishCrypt
-	#password_cost => 8,
-	# Uncomment to force ikiwiki to run with a particular umask.
+	# put user pages below specified page
+	userdir => '',
+	# how many backlinks to show before hiding excess (0 to show all)
+	numbacklinks => 10,
+	# attempt to hardlink source files? (optimisation for large files)
+	hardlink => 0,
+	# force ikiwiki to use a particular umask
 	#umask => 022,
-	# Default settings for the recentchanges page.
-	#recentchangespage => "recentchanges",
-	#recentchangesnum => 100,
-	# Use new '!'-prefixed preprocessor directive syntax
-	#prefix_directives => 1,
-	# Attempt to make hardlinks to source files instead of copying them.
-	# Useful if the wiki contains large media files.
-	#hardlink => 1,
-	# Enable use of multimarkdown features in .mdwn files.
-	#multimarkdown => 1,
-
-	# To add plugins, list them here.
-	#add_plugins => [qw{goodstuff search wikitext camelcase
-	#                   htmltidy fortune sidebar map rst anonok}],
-	# If you want to disable any of the default plugins, list them here.
-	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-	# To add a directory to the perl search path, use this.
-	#libdir => "/home/me/private_webdata/samplewiki/perl",
-	
-	# To override environment variable settings, you can list values here.
-	#ENV => {
-	#	TZ => "America/New_York",
-	#	PATH => "/home/me/bin:/usr/local/bin:/usr/bin:/bin",
-	#},
-
-	# For use with the tag plugin, make all tags be located under a
-	# base page.
-	#tagbase => "tag",
-
-	# For use with the search plugin if the omega cgi is located
-	# somewhere else.
-	#omega_cgi => "/usr/lib/cgi-bin/omega/omega",
-
-	# For use with the openid plugin, to give an url to a page users
-	# can use to signup for an OpenID.
-	#openidsignup => "http://myopenid.com/",
-
-	# For use with the mirrorlist plugin, a list of mirrors.
-	#mirrorlist => {
-	#	mirror1 => "http://hostname1",
-	#	mirror2 => "http://hostname2/mirror",
-	#},
-	
-	# For use with the anonok plugin, a PageSpec specifying what
-	# pages anonymous users can edit
-	#anonok_pagespec => "*",
-	
-	# For use with the aggregate plugin.
-	# Enable aggregation to internal pages. New wikis should set this to 1,
-	# but if you use aggregate already, read the aggregate plugin docs
-	# before enabling it.
-	#aggregateinternal => 1,
-	# Allow aggregation to be triggered via the web.
-	#aggregate_webtrigger => 1,
-	
-	# For use with the pinger plugin, how many seconds to wait before
-	# timing out.
-	#pinger_timeout => 15.
-	
-	# For use with the amazon S3 plugin, your public access key id.
+	# extra library and plugin directory
+	libdir => 'perl',
+	# environment variables
+	ENV => {},
+	# regexp of source files to ignore
+	#exclude => '\\.wav$',
+	# specifies the characters that are allowed in source filenames
+	wiki_file_chars => '-[:alnum:]+/.:_',
+	# allow symlinks in the path leading to the srcdir (potentially insecure)
+	allow_symlinks_before_srcdir => 0,
+
+	# aggregate plugin
+	# enable aggregation to internal pages?
+	#aggregateinternal => 0,
+	# allow aggregation to be triggered via the web?
+	#aggregate_webtrigger => 0,
+
+	# amazon_s3 plugin
+	# public access key id
 	#amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
-	# And a file holding your secret key. This file *must* not be
-	# readable by others!
-	#amazon_s3_key_file => "/home/me/secret_webdata/s3_key
-	# The globally unique name of the bucket to use to store the wiki.
-	#amazon_s3_bucket => "mywiki",
-	# A prefix to prepend to each page name.
-	#amazon_s3_prefix => "wiki/",
-	# Uncomment to use the S3 European datacenter.
-	#amazon_s3_location => "EU",
-	# Uncomment if you need to store each index file twice.
-	#amazon_s3_dupindex => 1,
-	
-	# For use with the attachment plugin, a program that returns
-	# nonzero if its standard input contains an virus.
-	#virus_checker => "clamdscan -",
+	# file holding secret key (must not be readable by others!)
+	#amazon_s3_key_id => $ENV{'HOME'} . '/secret_webdata/s3_key',
+	# globally unique name of bucket to store wiki in
+	#amazon_s3_bucket => 'mywiki',
+	# a prefix to prepend to each page name
+	#amazon_s3_prefix => 'wiki/',
+	# which S3 datacenter to use (leave blank for default)
+	#amazon_s3_location => 'EU',
+	# store each index file twice? (allows urls ending in "/index.html" and "/")
+	#amazon_s3_dupindex => 0,
+
+	# anonok plugin
+	# PageSpec to limit which pages anonymous users can edit
+	#anonok_pagespec => '*/discussion',
+
+	# attachment plugin
+	# enhanced PageSpec specifying what attachments are allowed
+	#allowed_attachments => 'virusfree() and mimetype(image/*) and maxsize(50kb)',
+	# virus checker program (reads STDIN, returns nonzero if virus found)
+	#virus_checker => 'clamdscan -',
+
+	# bzr plugin
+	# bzr post-commit hook to generate
+	#bzr_wrapper => '',
+	# mode for bzr_wrapper (can safely be made suid)
+	#bzr_wrappermode => '06755',
+	# url to show file history, using loggerhead ([[file]] substituted)
+	#historyurl => '',
+	# url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)
+	#diffurl => 'http://example.org/revision?start_revid=[[r2]]#[[file]]-s',
+
+	# calendar plugin
+	# base of the archives hierarchy
+	#archivebase => 'archives',
+
+	# git plugin
+	# git hook to generate
+	#git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki',
+	# mode for git_wrapper (can safely be made suid)
+	#git_wrappermode => '06755',
+	# gitweb url to show file history ([[file]] substituted)
+	#historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+	# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
+	#diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+	# where to pull and push changes (set to empty string to disable)
+	#gitorigin_branch => 'samplewiki',
+	# branch that the wiki is stored in
+	#gitmaster_branch => 'master',
+
+	# htmlscrubber plugin
+	# PageSpec specifying pages not to scrub
+	#htmlscrubber_skip => '!*/Discussion',
+
+	# inline plugin
+	# enable rss feeds by default?
+	#rss => 0,
+	# enable atom feeds by default?
+	#atom => 0,
+	# allow rss feeds to be used?
+	#allowrss => 0,
+	# allow atom feeds to be used?
+	#allowatom => 0,
+	# urls to ping (using XML-RPC) on feed update
+	#pingurl => 'http://rpc.technorati.com/rpc/ping',
+
+	# listdirectives plugin
+	# directory in srcdir that contains directive descriptions
+	#directive_description_dir => 'ikiwiki/directive',
+
+	# lockedit plugin
+	# PageSpec controlling which pages are locked
+	#locked_pages => '!*/Discussion',
+
+	# mdwn plugin
+	# enable multimarkdown features?
+	#multimarkdown => 0,
+
+	# mercurial plugin
+	# mercurial post-commit hook to generate
+	#mercurial_wrapper => '',
+	# mode for mercurial_wrapper (can safely be made suid)
+	#mercurial_wrappermode => '06755',
+	# url to hg serve'd repository, to show file history ([[file]] substituted)
+	#historyurl => 'http://example.org:8000/log/tip/[[file]]',
+	# url to hg serve'd repository, to show diff ([[file]] and [[r2]] substituted)
+	#diffurl => 'http://localhost:8000/?fd=[[r2]];file=[[file]]',
+
+	# mirrorlist plugin
+	# list of mirrors
+	#mirrorlist => {},
+
+	# openid plugin
+	# an url where users can signup for an OpenID
+	#openidsignup => 'http://myopenid.com/',
+
+	# passwordauth plugin
+	# a password that must be entered when signing up for an account
+	#account_creation_password => 's3cr1t',
+	# cost of generating a password using Authen::Passphrase::BlowfishCrypt
+	#password_cost => 8,
+
+	# pinger plugin
+	# how many seconds to try pinging before timing out
+	#pinger_timeout => 15,
+
+	# prettydate plugin
+	# format to use to display date
+	#prettydateformat => '%X, %B %o, %Y',
+
+	# recentchanges plugin
+	# name of the recentchanges page
+	#recentchangespage => 'recentchanges',
+	# number of changes to track
+	#recentchangesnum => 100,
+
+	# search plugin
+	# path to the omega cgi program
+	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
+
+	# svn plugin
+	# subversion repository location
+	#svnrepo => '/svn/wiki',
+	# path inside repository where the wiki is located
+	#svnpath => 'trunk',
+	# svn post-commit hook to generate
+	#svn_wrapper => '/svn/wikirepo/hooks/post-commit',
+	# mode for svn_wrapper (can safely be made suid)
+	#svn_wrappermode => '04755',
+	# viewvc url to show file history ([[file]] substituted)
+	#historyurl => 'http://svn.example.org/trunk/[[file]]',
+	# viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)
+	#diffurl => 'http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]',
+
+	# tag plugin
+	# parent page tags are located under
+	#tagbase => 'tag',
+
+	# teximg plugin
+	# Should teximg use dvipng to render, or dvips and convert?
+	#teximg_dvipng => '',
+	# LaTeX prefix for teximg plugin
+	#teximg_prefix => '\\documentclass{article}
+	#\\usepackage{amsmath}
+	#\\usepackage{amsfonts}
+	#\\usepackage{amssymb}
+	#\\pagestyle{empty}
+	#\\begin{document}
+	#',
+	# LaTeX postfix for teximg plugin
+	#teximg_postfix => '\\end{document}',
+
+	# tla plugin
+	# tla post-commit hook to generate
+	#tla_wrapper => '',
+	# mode for tla_wrapper (can safely be made suid)
+	#tla_wrappermode => '06755',
+	# url to show file history ([[file]] substituted)
+	#historyurl => '',
+	# url to show a diff ([[file]] and [[rev]] substituted)
+	#diffurl => '',
+
+	# typography plugin
+	# Text::Typography attributes value
+	#typographyattributes => '3',
+
+	# websetup plugin
+	# list of plugins that cannot be enabled/disabled via the web interface
+	#websetup_force_plugins => [],
+	# show unsafe settings, read-only, in web interface?
+	#websetup_show_unsafe => 1,
 }
diff --git a/ikiwiki_admin.setup b/ikiwiki_admin.setup
index 29770ad..1a86128 100644
--- a/ikiwiki_admin.setup
+++ b/ikiwiki_admin.setup
@@ -1,206 +1,259 @@
 #!/usr/bin/perl
-# Configuration file for ikiwiki.
-# Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
-# build the wiki.
+# Setup file for ikiwiki.
+#
+# Passing this to ikiwiki --setup will make ikiwiki generate
+# wrappers and build the wiki.
 #
 # Remember to re-run ikiwiki --setup any time you edit this file.
-
 use IkiWiki::Setup::Standard {
-	wikiname => "MyWiki",
-	#adminuser => ["yourname", ],
-	adminemail => 'me@example.org',
-
-	# Be sure to customise these..
-	srcdir => $ENV{'HOME'} . "/private_webdata/samplewiki/content",
-	destdir => $ENV{'HOME'} . "/public_websites/admin.example.org",
-
-	url => "http://admin.example.org",
-	cgiurl => "http://admin.example.org/ikiwiki.cgi",
-	templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates",
-	underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki",
-
-	# Subversion stuff.
-	#rcs => "svn",
-	#historyurl => "http://svn.example.org/trunk/[[file]]",
-	#diffurl => "http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]",
-	#svnrepo => "/svn/wiki",
-	#svnpath => "trunk",
-
-	# Git stuff.
-	#rcs => "git",
-	#historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master
-	#diffurl => "http://git.example.org/?p=samplewiki_content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]",
-	#gitorigin_branch => "samplewiki",
-	#gitmaster_branch => "master",
-
-	# Tla stuff.
-	#rcs => "tla"
-	#historyurl => ??,
-	#diffurl => ??,
-
-	# Mercurial stuff.
-	#rcs => "mercurial",
-	#historyurl => "http://localhost:8000/log/tip/[[file]]", # hg serve'd local repository
-	#diffurl => "http://localhost:8000/?fd=[[r2]];file=[[file]]",
-
-	# Bazaar stuff.
-	#rcs => "bzr",
-	#historyurl => "", 
-	#diffurl => "http://example.com/revision?start_revid=[[r2]]#[[file]]-s", # using loggerhead
-
-	# Monotone stuff
-	#rcs => "monotone",
-	#mtnkey => "web\@machine.company.com",
-	#historyurl => "http://viewmtn.example.com/branch/head/filechanges/com.example.branch/[[file]]",
-	#diffurl => "http://viewmtn.example.com/revision/diff/[[r1]]/with/[[r2]]/[[file]]",
-	# Set if you want the wiki to sync on update and commit.
-	#mtnsync => 0,
-	# The path to your workspace (defaults to the srcdir itself)
-	# e.g. use if your srcdir is a subdirectory of the workspace.
-	#mtnrootdir => "path/to/root/of/workspace",
-
-	wrappers => [
-		#{
-		#	# The cgi wrapper.
-		#	cgi => 1,
-		#	wrapper => $ENV{'HOME'} . "/public_cgi/admin.example.org/ikiwiki.cgi",
-		#	wrappermode => "06755",
-		#},
-		#{
-		#	# The svn post-commit wrapper.
-		#	# Note that this will overwrite any existing
-		#	# post-commit hook script, which may not be
-		#	# what you want.
-		#	wrapper => "/svn/wikirepo/hooks/post-commit",
-		#	wrappermode => "04755",
-		#	# Log to syslog since svn post-commit hooks
-		#	# hide output and errors.
-		#	syslog => 1,
-		#},
-		#{
-		#	# The git post-update wrapper.
-		#	# Note that this will overwrite any existing
-		#	# post-update hook script, which may not be
-		#	# what you want.
-		#	wrapper => $ENV{'HOME'} . "/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-admin",
-		#	wrappermode => "06755",
-		#},
-		#{
-		#	# The monotone netsync hook.
-		#	wrapper => "path/to/root/of/workspace/_MTN/ikiwiki-netsync-hook",
-		#	wrappermode => "06755",
-		#},
-	],
-
-	# Default to generating rss feeds for pages with feeds?
-	#rss => 1,
-	# Default to generating atom feeds for pages with feeds?
-	#atom => 1,
-	# Allow generating feeds even if not generated by default?
-	#allowrss => 1,
-	#allowatom => 1,
-	# Urls to ping with XML-RPC when feeds are updated
-	#pingurl => [qw{http://rpc.technorati.com/rpc/ping}],
-	# Include discussion links on all pages?
+	# name of the wiki
+	wikiname => 'MyWiki',
+	# contact email for wiki
+	#adminemail => 'me@example.org',
+	# users who are wiki admins
+	adminuser => [],
+	# users who are banned from the wiki
+	banned_users => [],
+	# where the source of the wiki is located
+	srcdir => $ENV{'HOME'} . '/private_webdata/samplewiki/content',
+	# where to build the wiki
+	destdir => $ENV{'HOME'} . '/public_websites/admin.wiki.example.org',
+	# base url to the wiki
+	url => 'http://admin.wiki.example.org',
+	# url to the ikiwiki.cgi
+	cgiurl => 'http://admin.wiki.example.org/ikiwiki.cgi',
+	# cgi wrapper to generate
+	cgi_wrapper => $ENV{'HOME'} . '/public_cgi/admin.wiki.example.org/ikiwiki.cgi',
+	# mode for cgi_wrapper (can safely be made suid)
+	cgi_wrappermode => '06755',
+	# rcs backend to use
+	rcs => '',
+	# plugins to add to the default configuration
+	add_plugins => [],
+	# plugins to disable
+	disable_plugins => [],
+	# location of template files
+	templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates',
+	# base wiki source location
+	underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki',
+	# display verbose messages when building?
+	#verbose => 1,
+	# log to syslog?
+	#syslog => 1,
+	# create output files named page/index.html?
+	usedirs => 1,
+	# use '!'-prefixed preprocessor directives?
+	prefix_directives => 0,
+	# use page/index.mdwn source files
+	indexpages => 0,
+	# enable Discussion pages?
 	discussion => 1,
-	# To exclude files matching a regexp from processing. This adds to
-	# the default exclude list.
-	#exclude => qr/\.wav$/,
-	# To change the extension used for generated html files.
-	#htmlext => 'htm',
-	# Time format (for strftime)
-	#timeformat => '%c',
-	# Locale to use. Must be a UTF-8 locale.
+	# only send cookies over SSL connections?
+	sslcookie => 0,
+	# extension to use for new pages
+	default_pageext => 'mdwn',
+	# extension to use for html files
+	htmlext => 'html',
+	# strftime format string to display date
+	timeformat => '%c',
+	# UTF-8 locale to use
 	#locale => 'en_US.UTF-8',
-	# Only send cookies over SSL connections.
-	#sslcookie => 1,
-	# Logging settings:
-	#verbose => 1,
-	syslog => 0,
-	# To link to user pages in a subdirectory of the wiki.
-	#userdir => "users",
-	# To create output files named page.html rather than page/index.html.
-	#usedirs => 0,
-	# Simple spam prevention: require an account-creation password.
-	#account_creation_password => "example",
-	# Cost of generating a password using Authen::Passphrase::BlowfishCrypt
-	#password_cost => 8,
-	# Uncomment to force ikiwiki to run with a particular umask.
+	# put user pages below specified page
+	userdir => '',
+	# how many backlinks to show before hiding excess (0 to show all)
+	numbacklinks => 10,
+	# attempt to hardlink source files? (optimisation for large files)
+	hardlink => 0,
+	# force ikiwiki to use a particular umask
 	#umask => 022,
-	# Default settings for the recentchanges page.
-	#recentchangespage => "recentchanges",
-	#recentchangesnum => 100,
-	# Use new '!'-prefixed preprocessor directive syntax
-	#prefix_directives => 1,
-	# Attempt to make hardlinks to source files instead of copying them.
-	# Useful if the wiki contains large media files.
-	#hardlink => 1,
-	# Enable use of multimarkdown features in .mdwn files.
-	#multimarkdown => 1,
-
-	# To add plugins, list them here.
-	#add_plugins => [qw{goodstuff search wikitext camelcase
-	#                   htmltidy fortune sidebar map rst anonok}],
-	# If you want to disable any of the default plugins, list them here.
-	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-	# To add a directory to the perl search path, use this.
-	#libdir => "/home/me/private_webdata/samplewiki/perl",
-	
-	# To override environment variable settings, you can list values here.
-	#ENV => {
-	#	TZ => "America/New_York",
-	#	PATH => "/home/me/bin:/usr/local/bin:/usr/bin:/bin",
-	#},
-
-	# For use with the tag plugin, make all tags be located under a
-	# base page.
-	#tagbase => "tag",
-
-	# For use with the search plugin if the omega cgi is located
-	# somewhere else.
-	#omega_cgi => "/usr/lib/cgi-bin/omega/omega",
-
-	# For use with the openid plugin, to give an url to a page users
-	# can use to signup for an OpenID.
-	#openidsignup => "http://myopenid.com/",
-
-	# For use with the mirrorlist plugin, a list of mirrors.
-	#mirrorlist => {
-	#	mirror1 => "http://hostname1",
-	#	mirror2 => "http://hostname2/mirror",
-	#},
-	
-	# For use with the anonok plugin, a PageSpec specifying what
-	# pages anonymous users can edit
-	#anonok_pagespec => "*",
-	
-	# For use with the aggregate plugin.
-	# Enable aggregation to internal pages. New wikis should set this to 1,
-	# but if you use aggregate already, read the aggregate plugin docs
-	# before enabling it.
-	#aggregateinternal => 1,
-	# Allow aggregation to be triggered via the web.
-	#aggregate_webtrigger => 1,
-	
-	# For use with the pinger plugin, how many seconds to wait before
-	# timing out.
-	#pinger_timeout => 15.
-	
-	# For use with the amazon S3 plugin, your public access key id.
+	# extra library and plugin directory
+	libdir => 'perl',
+	# environment variables
+	ENV => {},
+	# regexp of source files to ignore
+	#exclude => '\\.wav$',
+	# specifies the characters that are allowed in source filenames
+	wiki_file_chars => '-[:alnum:]+/.:_',
+	# allow symlinks in the path leading to the srcdir (potentially insecure)
+	allow_symlinks_before_srcdir => 0,
+
+	# aggregate plugin
+	# enable aggregation to internal pages?
+	#aggregateinternal => 0,
+	# allow aggregation to be triggered via the web?
+	#aggregate_webtrigger => 0,
+
+	# amazon_s3 plugin
+	# public access key id
 	#amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
-	# And a file holding your secret key. This file *must* not be
-	# readable by others!
-	#amazon_s3_key_file => "/home/me/secret_webdata/s3_key
-	# The globally unique name of the bucket to use to store the wiki.
-	#amazon_s3_bucket => "mywiki",
-	# A prefix to prepend to each page name.
-	#amazon_s3_prefix => "wiki/",
-	# Uncomment to use the S3 European datacenter.
-	#amazon_s3_location => "EU",
-	# Uncomment if you need to store each index file twice.
-	#amazon_s3_dupindex => 1,
-	
-	# For use with the attachment plugin, a program that returns
-	# nonzero if its standard input contains an virus.
-	#virus_checker => "clamdscan -",
+	# file holding secret key (must not be readable by others!)
+	#amazon_s3_key_id => $ENV{'HOME'} . '/secret_webdata/s3_key',
+	# globally unique name of bucket to store wiki in
+	#amazon_s3_bucket => 'mywiki',
+	# a prefix to prepend to each page name
+	#amazon_s3_prefix => 'wiki/',
+	# which S3 datacenter to use (leave blank for default)
+	#amazon_s3_location => 'EU',
+	# store each index file twice? (allows urls ending in "/index.html" and "/")
+	#amazon_s3_dupindex => 0,
+
+	# anonok plugin
+	# PageSpec to limit which pages anonymous users can edit
+	#anonok_pagespec => '*/discussion',
+
+	# attachment plugin
+	# enhanced PageSpec specifying what attachments are allowed
+	#allowed_attachments => 'virusfree() and mimetype(image/*) and maxsize(50kb)',
+	# virus checker program (reads STDIN, returns nonzero if virus found)
+	#virus_checker => 'clamdscan -',
+
+	# bzr plugin
+	# bzr post-commit hook to generate
+	#bzr_wrapper => '',
+	# mode for bzr_wrapper (can safely be made suid)
+	#bzr_wrappermode => '06755',
+	# url to show file history, using loggerhead ([[file]] substituted)
+	#historyurl => '',
+	# url to view a diff, using loggerhead ([[file]] and [[r2]] substituted)
+	#diffurl => 'http://example.org/revision?start_revid=[[r2]]#[[file]]-s',
+
+	# calendar plugin
+	# base of the archives hierarchy
+	#archivebase => 'archives',
+
+	# git plugin
+	# git hook to generate
+	#git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-admin',
+	# mode for git_wrapper (can safely be made suid)
+	#git_wrappermode => '06755',
+	# gitweb url to show file history ([[file]] substituted)
+	#historyurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=history;f=[[file]]', # ;hb=master
+	# gitweb url to show a diff ([[sha1_to]], [[sha1_from]], [[sha1_parent]], and [[file]] substituted)
+	#diffurl => 'http://git.example.org/gitweb.cgi?p=wiki.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]',
+	# where to pull and push changes (set to empty string to disable)
+	#gitorigin_branch => 'samplewiki',
+	# branch that the wiki is stored in
+	#gitmaster_branch => 'master',
+
+	# htmlscrubber plugin
+	# PageSpec specifying pages not to scrub
+	#htmlscrubber_skip => '!*/Discussion',
+
+	# inline plugin
+	# enable rss feeds by default?
+	#rss => 0,
+	# enable atom feeds by default?
+	#atom => 0,
+	# allow rss feeds to be used?
+	#allowrss => 0,
+	# allow atom feeds to be used?
+	#allowatom => 0,
+	# urls to ping (using XML-RPC) on feed update
+	#pingurl => 'http://rpc.technorati.com/rpc/ping',
+
+	# listdirectives plugin
+	# directory in srcdir that contains directive descriptions
+	#directive_description_dir => 'ikiwiki/directive',
+
+	# lockedit plugin
+	# PageSpec controlling which pages are locked
+	#locked_pages => '!*/Discussion',
+
+	# mdwn plugin
+	# enable multimarkdown features?
+	#multimarkdown => 0,
+
+	# mercurial plugin
+	# mercurial post-commit hook to generate
+	#mercurial_wrapper => '',
+	# mode for mercurial_wrapper (can safely be made suid)
+	#mercurial_wrappermode => '06755',
+	# url to hg serve'd repository, to show file history ([[file]] substituted)
+	#historyurl => 'http://example.org:8000/log/tip/[[file]]',
+	# url to hg serve'd repository, to show diff ([[file]] and [[r2]] substituted)
+	#diffurl => 'http://localhost:8000/?fd=[[r2]];file=[[file]]',
+
+	# mirrorlist plugin
+	# list of mirrors
+	#mirrorlist => {},
+
+	# openid plugin
+	# an url where users can signup for an OpenID
+	#openidsignup => 'http://myopenid.com/',
+
+	# passwordauth plugin
+	# a password that must be entered when signing up for an account
+	#account_creation_password => 's3cr1t',
+	# cost of generating a password using Authen::Passphrase::BlowfishCrypt
+	#password_cost => 8,
+
+	# pinger plugin
+	# how many seconds to try pinging before timing out
+	#pinger_timeout => 15,
+
+	# prettydate plugin
+	# format to use to display date
+	#prettydateformat => '%X, %B %o, %Y',
+
+	# recentchanges plugin
+	# name of the recentchanges page
+	#recentchangespage => 'recentchanges',
+	# number of changes to track
+	#recentchangesnum => 100,
+
+	# search plugin
+	# path to the omega cgi program
+	#omega_cgi => '/usr/lib/cgi-bin/omega/omega',
+
+	# svn plugin
+	# subversion repository location
+	#svnrepo => '/svn/wiki',
+	# path inside repository where the wiki is located
+	#svnpath => 'trunk',
+	# svn post-commit hook to generate
+	#svn_wrapper => '/svn/wikirepo/hooks/post-commit',
+	# mode for svn_wrapper (can safely be made suid)
+	#svn_wrappermode => '04755',
+	# viewvc url to show file history ([[file]] substituted)
+	#historyurl => 'http://svn.example.org/trunk/[[file]]',
+	# viewvc url to show a diff ([[file]], [[r1]], and [[r2]] substituted)
+	#diffurl => 'http://svn.example.org/trunk/[[file]]?root=wiki&r1=[[r1]]&r2=[[r2]]',
+
+	# tag plugin
+	# parent page tags are located under
+	#tagbase => 'tag',
+
+	# teximg plugin
+	# Should teximg use dvipng to render, or dvips and convert?
+	#teximg_dvipng => '',
+	# LaTeX prefix for teximg plugin
+	#teximg_prefix => '\\documentclass{article}
+	#\\usepackage{amsmath}
+	#\\usepackage{amsfonts}
+	#\\usepackage{amssymb}
+	#\\pagestyle{empty}
+	#\\begin{document}
+	#',
+	# LaTeX postfix for teximg plugin
+	#teximg_postfix => '\\end{document}',
+
+	# tla plugin
+	# tla post-commit hook to generate
+	#tla_wrapper => '',
+	# mode for tla_wrapper (can safely be made suid)
+	#tla_wrappermode => '06755',
+	# url to show file history ([[file]] substituted)
+	#historyurl => '',
+	# url to show a diff ([[file]] and [[rev]] substituted)
+	#diffurl => '',
+
+	# typography plugin
+	# Text::Typography attributes value
+	#typographyattributes => '3',
+
+	# websetup plugin
+	# list of plugins that cannot be enabled/disabled via the web interface
+	#websetup_force_plugins => [],
+	# show unsafe settings, read-only, in web interface?
+	#websetup_show_unsafe => 1,
 }
diff --git a/perl/Locale/Po4a/Text.pm b/perl/Locale/Po4a/Text.pm
index ee56046..32f9dec 100644
--- a/perl/Locale/Po4a/Text.pm
+++ b/perl/Locale/Po4a/Text.pm
@@ -247,7 +247,7 @@ sub parse {
                 or $paragraph =~ /^\$(\S+[{}]\S*\s*)+/ms # Xapian macro
                 or $paragraph =~ /<(?![a-z]+[:@])/ms     # maybe html (tags but not wiki <URI>)
                 or $paragraph =~ /^[^<]+>/ms             # maybe html (tag with vertical space)
-                or $paragraph =~ /^\s*\[\[\!\S[^\]]+$/ms # macro begin
+                or $paragraph =~ /\[\[\!\S[^\]]+$/ms     # macro begin
             );
         }
         if ($end_of_paragraph) {
diff --git a/po/basewiki.da.po b/po/basewiki.da.po
index c5a0dd4..98895cf 100644
--- a/po/basewiki.da.po
+++ b/po/basewiki.da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki basewiki 2.62.1\n"
-"POT-Creation-Date: 2008-08-30 05:01+0300\n"
-"PO-Revision-Date: 2008-08-04 00:21+0300\n"
+"POT-Creation-Date: 2008-10-22 22:49+0300\n"
+"PO-Revision-Date: 2008-10-22 23:49+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
@@ -15,574 +15,200 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # type: Plain text
-#: blog.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/blog delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/blog delay=10]]\n"
-
-# type: Plain text
-#: blog.mdwn:2 helponformatting.mdwn:2 ikiwiki.mdwn:1 ikiwiki/blog.mdwn:1
-#: ikiwiki/directive.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1
-#: ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1
-#: ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/preprocessordirective.mdwn:2
-#: ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1
-#: ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 markdown.mdwn:2
-#: openid.mdwn:2 pagespec.mdwn:2 preprocessordirective.mdwn:2 subpage.mdwn:2
-#: templates.mdwn:1 wikilink.mdwn:2
+#: directive.mdwn:1
+#: ikiwiki.mdwn:1
+#: ikiwiki/blog.mdwn:1
+#: ikiwiki/directive.mdwn:1
+#: ikiwiki/formatting.mdwn:2
+#: ikiwiki/markdown.mdwn:1
+#: ikiwiki/openid.mdwn:2
+#: ikiwiki/pagespec.mdwn:1
+#: ikiwiki/pagespec/attachment.mdwn:1
+#: ikiwiki/preprocessordirective.mdwn:2
+#: ikiwiki/searching.mdwn:1
+#: ikiwiki/subpage.mdwn:1
+#: ikiwiki/subpage/linkingrules.mdwn:1
+#: ikiwiki/wikilink.mdwn:1
+#: templates.mdwn:1
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr "[[!meta robots=\"noindex, follow\"]]\n"
 
 # type: Plain text
-#: blog.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your "
-"links, as this redirection page will be removed in a future ikiwiki release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/blog|ikiwiki/blog]]. Opdatér dine "
-"henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
+#: directive.mdwn:4
+#: ikiwiki/directive.mdwn:4
+msgid "Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin with `!` and may contain parameters. The general form is:"
+msgstr "Direktiver ligner et [[ikiwiki/WikiLink]] i form, undtagen at de begynder med `!` og kan indeholde parametre. Generelt er formen:"
 
 # type: Plain text
-#: helponformatting.mdwn:1
+#: directive.mdwn:6
+#: ikiwiki/directive.mdwn:6
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/formatting delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/formatting delay=10]]\n"
-
-# type: Plain text
-#: helponformatting.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/formatting|ikiwiki/formatting]]. Opdatér "
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
+msgstr "\t\\[[!direktiv param=\"værdi\" param=\"værdi\"]]\n"
 
 # type: Plain text
-#: ikiwiki.mdwn:6
-#, no-wrap
-msgid ""
-"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
-"[[!if test=\"enabled(version)\"\n"
-"     then=\"(Currently running version [[!version ]].)\"\n"
-"]]\n"
-msgstr ""
-"Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/).\n"
-"[[!if test=\"enabled(version)\"\n"
-"     then=\"(kører i øjeblikket version [[!version ]].)\"\n"
-"]]\n"
+#: directive.mdwn:9
+#: ikiwiki/directive.mdwn:9
+msgid "This gets expanded before the rest of the page is processed, and can be used to transform the page in various ways."
+msgstr "Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme siden på forskellige måder."
 
 # type: Plain text
-#: ikiwiki.mdwn:8
-msgid "Some documentation on using ikiwiki:"
-msgstr "Noget dokumentation om brug af ikiwiki:"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/formatting]]"
-msgstr "[[formatering|ikiwiki/formatting]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/blog]]"
-msgstr "[[ikiwiki/blog]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/pagespec]]"
-msgstr "[[ikiwiki/pagespec]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/directive]]"
-msgstr "[[direktiv|ikiwiki/directive]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/wikilink]]"
-msgstr "[[ikiwiki/wikilink]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/markdown]]"
-msgstr "[[ikiwiki/markdown]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/subpage]]"
-msgstr "[[underside|ikiwiki/subpage]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/openid]]"
-msgstr "[[ikiwiki/openid]]"
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/searching]]"
-msgstr "[[søgning|ikiwiki/searching]]"
+#: directive.mdwn:12
+#: ikiwiki/directive.mdwn:12
+msgid "The quotes around values can be omitted if the value is a simple word.  Also, some directives may use parameters without values, for example:"
+msgstr "Citationen omkring værdier kan udelades hvis værdien er et simpelt ord. Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:5
+#: directive.mdwn:14
+#: ikiwiki/directive.mdwn:14
 #, no-wrap
-msgid ""
-"[[!if test=\"enabled(inline)\"\n"
-"     then=\"This wiki has the inline plugin **enabled**.\"\n"
-"     else=\"This wiki has the inline plugin **disabled**.\"]]\n"
-msgstr ""
-"[[!if test=\"enabled(inline)\"\n"
-"     then=\"Denne wiki har inline plugin **aktiveret**.\"\n"
-"     else=\"Denne wiki har inline plugin **deaktiveret**.\"]]\n"
+msgid "\t\\[[!tag foo]]\n"
+msgstr "\t\\[[!tag foo]]\n"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:11
-#, no-wrap
-msgid ""
-"[[!if test=\"enabled(inline)\"\n"
-"     then=\"You can\"\n"
-"     else=\"If this wiki had the inline plugin enabled, you could\"]]\n"
-"turn any page on this wiki into a weblog by using the `inline`\n"
-"[[directive]]. For example:\n"
-msgstr ""
-"[[!if test=\"enabled(inline)\"\n"
-"     then=\"Du kan\"\n"
-"     else=\"Hvis denne wiki havde inline plugin aktiveret, kunne du\"]]\n"
-"omlægge enhver side på denne wiki til en weblog ved at bruge\n"
-"[[direktivet|directive]] `inline`. Som eksempel:\n"
+#: directive.mdwn:17
+#: ikiwiki/directive.mdwn:17
+msgid "A directive does not need to all be on one line, it can be wrapped to multiple lines if you like:"
+msgstr "Et direktiv behøver ikke at blive holdt på een linje, det kan bredes ud over flere linjer hvis du har lyst:"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:13
+#: directive.mdwn:20
+#: ikiwiki/directive.mdwn:20
 #, no-wrap
-msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" rootpage=\"blog\"]]\n"
-msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" rootpage=\"blog\"]]\n"
-
-# type: Plain text
-#: ikiwiki/blog.mdwn:19
-msgid ""
-"Any pages that match the specified [[PageSpec]] (in the example, any "
-"[[SubPage]] of \"blog\") will be part of the blog, and the newest 10 of them "
-"will appear in the page. Note that if files that are not pages match the "
-"[[PageSpec]], they will be included in the feed using RSS enclosures, which "
-"is useful for podcasting."
-msgstr ""
-"Enhver side der modsvarer det angivne [[PageSpec]] (i eksemplet enhver "
-"[[UnderSide|SubPage]] til \"blog\") vil blive del af bloggen, og de nyeste "
-"10 af dem vil dukke op på siden. Bemærk at hvis filer som ikke er sider "
-"modsvarer [[PageSpec]]'et, bliver de medtaget i fødningen (feed) gennem RSS-"
-"indkapslinger, som er anvendeligt til podcasting."
-
-# type: Plain text
-#: ikiwiki/blog.mdwn:23
 msgid ""
-"The optional `rootpage` parameter tells the wiki that new posts to this blog "
-"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form "
-"at the top of the blog that can be used to add new items."
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
 msgstr ""
-"Den valgfri `rootpage`-parameter fortæller wikien at nye indlæg til denne "
-"blog som standard skal være [[UnderSider|SubPage]] til \"blog\", og "
-"aktiverer en formular øverst i bloggen som kan bruges til at tilføje nye "
-"emner."
+"\t\\[[!direktiv foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:26
-msgid ""
-"If you want your blog to have an archive page listing every post ever made "
-"to it, you can accomplish that like this:"
-msgstr ""
-"Hvis du har lyst til at din blog skal have en arkivside med oversigt over "
-"alle indlæg skrevet nogensinde til den, kan det gøres sådan her:"
+#: directive.mdwn:24
+#: ikiwiki/directive.mdwn:24
+msgid "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:"
+msgstr "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:"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:28
+#: directive.mdwn:25
+#: ikiwiki/directive.mdwn:25
 #, no-wrap
-msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
-msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+msgid "\t\\[[!directive text=\"\"\"\n"
+msgstr "\t\\[[!direktiv tekst=\"\"\"\n"
 
-# type: Plain text
-#: ikiwiki/blog.mdwn:31
-msgid ""
-"You can even create an automatically generated list of all the pages on the "
-"wiki, with the most recently added at the top, like this:"
-msgstr ""
-"Du kan endda lave en automatisk dannet liste over alle de sider på wikien, "
-"med de nyeste tilføjet øverst, sådan her:"
+# type: Bullet: '	1. '
+#: directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
+msgid "\"foo\""
+msgstr "\"foo\""
 
-# type: Plain text
-#: ikiwiki/blog.mdwn:33
-#, no-wrap
-msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
-msgstr "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
+# type: Bullet: '	2. '
+#: directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
+msgid "\"bar\""
+msgstr "\"bar\""
+
+# type: Bullet: '	3. '
+#: directive.mdwn:29
+#: ikiwiki/directive.mdwn:29
+msgid "\"baz\""
+msgstr "\"baz\""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:38
-msgid ""
-"If you want to be able to add pages to a given blog feed by tagging them, "
-"you can do that too. To tag a page, just make it link to a page or pages "
-"that represent its tags. Then use the special `link()` [[PageSpec]] to match "
-"all pages that have a given tag:"
-msgstr ""
-"Hvis du vil have mulighed for at tilføje sider til en given blogfødning ved "
-"at mærke dem af, kan du også gøre det. Du afmærker en side ved blot at lave "
-"en henvisning til en en eller flere sider som repræsenterer dets mærkater. "
-"Brug derefter det særlige `link()` [[PageSpec]] til at modsvare alle sider "
-"med en given mærkat:"
+#: directive.mdwn:40
+#: ikiwiki/directive.mdwn:40
+msgid "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."
+msgstr "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 det foretrukne alternativ. Ikiwiki understøtter dog fortsat den ældre syntaks, hvis ikke `prefix_directives`-valget er aktiveret. For bagudkompatibilitet med eksisterende wikier er dette valg som standard deaktiveret i øjeblikket, så ikiwiki understøtter den ældre syntaks."
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:40
+#: directive.mdwn:41
+#: ikiwiki/directive.mdwn:41
+#: ikiwiki/formatting.mdwn:103
 #, no-wrap
-msgid "\t\\[[!inline pages=\"link(life)\"]]\n"
-msgstr "\t\\[[!inline pages=\"link(life)\"]]\n"
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:42
-msgid "Or include some tags and exclude others:"
-msgstr "Eller medtag nogle mærkater og udelad andre:"
+#: directive.mdwn:43
+#: ikiwiki/directive.mdwn:43
+msgid "Here is a list of currently available directives in this wiki:"
+msgstr "Her er en oversigt over konkret tilgængelige direktiver i for denne wiki:"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:44
+#: directive.mdwn:44
+#: ikiwiki/directive.mdwn:44
 #, no-wrap
-msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
-msgstr "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+msgid "[[!listdirectives ]]\n"
+msgstr "[[!listdirectives ]]\n"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:45
+#: ikiwiki.mdwn:6
 #, no-wrap
-msgid "## usage\n"
-msgstr "## brug\n"
-
-# type: Plain text
-#: ikiwiki/blog.mdwn:49
-msgid ""
-"There are many parameters you can use with the `inline` directive. These are "
-"the commonly used ones:"
-msgstr ""
-"Der er mange parametre du kan bruge med `inline`-direktivet. Disse er de "
-"oftest brugte:"
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid "`pages` - A [[PageSpec]] of the pages to inline."
-msgstr "`pages` - Et [[PageSpec]] af siderne at indlejre."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`show` - Specify the maximum number of matching pages to inline.  Default is "
-"10, unless archiving, when the default is to show all.  Set to 0 to show all "
-"matching pages."
-msgstr ""
-"`show` - Angiver det maksimale antal modsvarende sider at indlejre. Standard "
-"er 10, på nær arkivering, hvor standarden er at vise alle. Sæt til 0 for at "
-"vise alle modsvarende sider."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`archive` - If set to \"yes\", only list page titles and some metadata, not "
-"full contents."
-msgstr ""
-"`archive` - Hvis \"yes\" er angivet, så vis kun sidetitler og nogle "
-"metadata, ikke det samlede indhold."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`description` - Sets the description of the rss feed if one is generated.  "
-"Defaults to the name of the wiki."
-msgstr ""
-"`description` - Angiver beskrivelsen til rss-fødningen hvis en dannes. Som "
-"standard bruges wikiens navn."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`skip` - Specify a number of pages to skip displaying. Can be useful to "
-"produce a feed that only shows archived pages."
-msgstr ""
-"`skip` - Angiv et antal sider at springe over ved visning. Kan være nyttigt "
-"til at danne en fødning som kun viser arkiverede sider."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`postform` - Set to \"yes\" to enable a form to post new pages to a [[blog]]."
-msgstr ""
-"`postform` - Angiv \"yes\" for at aktivere en formular til at indsende nye "
-"sider til en [[blog]]."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid "`postformtext` - Set to specify text that is displayed in a postform."
-msgstr ""
-"`postformtext` - Angiv den tekst som skal vises i en indsendelsesformular "
-"(postform)."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
 msgid ""
-"`rootpage` - Enable the postform, and allows controling where newly posted "
-"pages should go, by specifiying the page that they should be a [[SubPage]] "
-"of."
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
 msgstr ""
-"`rootpage` - Aktiverer indsendelsesformularen (postform) og gør det muligt "
-"at styre hvor nye indlæg ender, ved at angive siden som de skal være en "
-"[[UnderSide|subpage]] af."
+"Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(kører i øjeblikket version [[!version ]].)\"\n"
+"]]\n"
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:68
-msgid "Here are some less often needed parameters:"
-msgstr "Her er nogle parametre der ikke så tit er nødvendige at bruge:"
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
-"for editing and discussion (if they would be shown at the top of the page "
-"itself)."
-msgstr ""
-"`actions` - Hvis angivet som \"yes\" tilføjes henvisninger nedenfor de "
-"indlejrede sider til redigering og diskussion (hvis de ville blive vist "
-"foroven på selve siden)."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`rss` - controls generation of an rss feed. If the wiki is configured to "
-"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
-"configured to `allowrss`, set to \"yes\" to enable."
-msgstr ""
-"`rss` - Styrer dannelse af en rss-fødning. Hvis wikien er opsat til at danne "
-"rss-fødninger som standard, deaktiveres ved at angive \"no\". Hvis wikien er "
-"opsat til `allowrss`, aktiveres ved at angive \"yes\"."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`atom` - controls generation of an atom feed. If the wiki is configured to "
-"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
-"configured to `allowatom`, set to \"yes\" to enable."
-msgstr ""
-"`atom` - Styrer dannelse af en atom-fødning. Hvis wikien er opsat til at "
-"danne atom-fødninger som standard, deaktiveres ved at angive \"no\". Hvis "
-"wikien er opsat til `allowatom`, aktiveres ved at angive \"yes\"."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
-"disable generating any feeds."
-msgstr ""
-"`feeds` - Styrer dannelse af alle typer af fødninger. Angiv \"no\" for at "
-"deaktivere dannelse af nogen fødninger."
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`template` - Specifies the template to fill out to display each inlined "
-"page. By default the `inlinepage` template is used, while the `archivepage` "
-"template is used for archives. Set this parameter to use some other, custom "
-"template, such as the `titlepage` template that only shows post titles. Note "
-"that you should still set `archive=yes` if your custom template does not "
-"include the page content."
-msgstr ""
-"`template` - Angiver skabelonen der udfyldes ved visning af hver indlejret "
-"side. Som standard bruges `inlinepage`-skabelonen, mens `archivepage`-"
-"skabelonen bruges til arkiver. Brug denne parameter til at bruge en anden "
-"skabelon end normalt, for eksempel `titlepage`-skabelonen som kun viser "
-"indlægs titler. Bemærk at du stadigt bør angive `archive=yes` hvis din "
-"skabelon ikke medtager sideindholdet."
+#: ikiwiki.mdwn:8
+msgid "Some documentation on using ikiwiki:"
+msgstr "Noget dokumentation om brug af ikiwiki:"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`raw` - Rather than the default behavior of creating a [[blog]], if raw is "
-"set to \"yes\", the page will be included raw, without additional markup "
-"around it, as if it were a literal part of the source of the inlining page."
-msgstr ""
-"`raw` - I stedet for som standard at lave en [[blog]], vil siden, når raw "
-"angives som \"yes\", inkluderes råt, uden yderligere opmærkning omkring den, "
-"som om den var en integreret den af kildekoden til den indlejrende side."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/formatting]]"
+msgstr "[[formatering|ikiwiki/formatting]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
-"sort newest created pages first. Setting it to \"title\" will sort pages by "
-"title, and \"mtime\" sorts most recently modified pages first."
-msgstr ""
-"`sort` - Styrer hvordan indlejrede sider sorteres. Standarden, \"age\", "
-"sorterer nyest oprettede sider først. Angives \"title\" sorteres siderne "
-"efter titel, og \"mtime\" sorterer nyest redigerede sider først."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/wikilink]]"
+msgstr "[[ikiwiki/wikilink]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
-msgstr "`reverse` - Hvis du angiver \"yes\", sorteres i omvendt rækkefølge."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/subpage]]"
+msgstr "[[underside|ikiwiki/subpage]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feedshow` - Specify the maximum number of matching pages to include in the "
-"rss/atom feeds. The default is the same as the `show` value above."
-msgstr ""
-"`feedshow` - Angiver det maksimale antal modsvarende sider at medtage i rss/"
-"atom-fødninger. Standarden er den samme som `show`-værdien ovenfor."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/pagespec]]"
+msgstr "[[ikiwiki/pagespec]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feedonly` - Only generate the feed, do not display the pages inline on the "
-"page."
-msgstr "`feedonly` - Dan kun fødninger, vis ikke siderne indlejret på siden."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/directive]]"
+msgstr "[[direktiv|ikiwiki/directive]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`quick` - Build archives in quick mode, without reading page contents for "
-"metadata. By default, this also turns off generation of any feeds."
-msgstr ""
-"`quick` - Opbyg arkiver i hurtigmodus, uden at læse siderne igennem efter "
-"metadata. som standard deaktiverer dette også dannelse af alle fødninger."
-
-# type: Plain text
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`timeformat` - Use this to specify how to display the time or date for pages "
-"in the blog. The format string is passed to the strftime(3) function."
-msgstr ""
-"`timeformat` - Brug denne til at angive hvordan tiden eller datoen vises for "
-"sider i bloggen. Formateringsstrengen videregives til funktionen strftime(3)."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/markdown]]"
+msgstr "[[ikiwiki/markdown]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
-"feeds. The default is the same as the `pages` value above, and only pages "
-"matches by that value are included, but some of those can be excluded by "
-"specifying a tighter [[PageSpec]] here."
-msgstr ""
-"`feedpages` - Et [[PageSpec]] af indlejrede sider som medtages i rss/atom- "
-"fødninger. Standarden er den sammen som for `pages`-værdien ovenfor, og kun "
-"sider som modsvarer dén værdi medtages, men nogle af dem kan udelades ved at "
-"angive et mere snævert [[PageSpec]] her."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/openid]]"
+msgstr "[[ikiwiki/openid]]"
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
-"the Atom feed will have this as its `<id>`. The default is to use the URL of "
-"the page containing the `inline` directive."
-msgstr ""
-"`guid` - Hvis en URI er angivet her (måske en UUID med `urn:uuid:` foran), "
-"vil Atom-fødningerne have dette som dets `<id>`. Standarden er at bruge "
-"URLen for siden som indeholder `inline`-direktivet."
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:4
-msgid ""
-"Directives are similar to a [[WikiLink]] in form, except they begin with `!` "
-"and may contain parameters. The general form is:"
-msgstr ""
-"Direktiver ligner et [[WikiLink]] i form, undtagen at de begynder med `!` og "
-"kan indeholde parametre. Generelt er formen:"
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:6
-#, no-wrap
-msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
-msgstr "\t\\[[!direktiv param=\"værdi\" param=\"værdi\"]]\n"
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:9
-msgid ""
-"This gets expanded before the rest of the page is processed, and can be used "
-"to transform the page in various ways."
-msgstr ""
-"Dette udvides før resten af siden udarbejdes, og kan bruges til at omforme "
-"siden på forskellige måder."
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:12
-msgid ""
-"The quotes around values can be omitted if the value is a simple word.  "
-"Also, some directives may use parameters without values, for example:"
-msgstr ""
-"Citationen omkring værdier kan udelades hvis værdien er et simpelt ord. "
-"Desuden kan nogle direktiver bruge parametre uden værdier. Eksempel:"
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:14
-#, no-wrap
-msgid "\t\\[[!tag foo]]\n"
-msgstr "\t\\[[!tag foo]]\n"
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:17
-msgid ""
-"A directive does not need to all be on one line, it can be wrapped to "
-"multiple lines if you like:"
-msgstr ""
-"Et direktiv behøver ikke at blive holdt på een linje, det kan bredes ud "
-"over flere linjer hvis du har lyst:"
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:20
-#, no-wrap
-msgid ""
-"\t\\[[!directive foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
-msgstr ""
-"\t\\[[!direktiv foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/searching]]"
+msgstr "[[søgning|ikiwiki/searching]]"
 
 # type: Plain text
-#: ikiwiki/directive.mdwn:24
-msgid ""
-"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:"
-msgstr ""
-"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:"
+#: ikiwiki/blog.mdwn:6
+msgid "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."
+msgstr "Denne side er blevet fjernet fra ikiwiki's basewiki. For dokumentation om oprettelse af en blog med ikiwiki se dokumentationen til [[!iki ikiwiki/directive/inline desc=inline]]-direktivet."
 
 # type: Plain text
-#: ikiwiki/directive.mdwn:29
-#, no-wrap
-msgid ""
-"\t\\[[!directive text=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
-msgstr ""
-"\t\\[[!direktiv tekst=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:39
-msgid ""
-"ikiwiki also has an older syntax for directives, which requires a space in "
-"directives to distinguish them from [[wikilinks|wikilink]].  This syntax has "
-"several disadvantages: it requires a space after directives with no "
-"parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
-"[[wikilinks|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."
-msgstr ""
-"Ikiwiki har også en ældre syntaks til direktiver, som kræver et mellemrum i "
-"direktiver for at skelne dem fra [[wikilinks|wikilink]]. Denne syntaks har "
-"flere ulemper: den kræver et mellemrum efter direktiver uden parametre "
-"(såsom `\\[[pagecount ]]`), og den forbyder mellemrum i "
-"[[wikilinks|wikilink]]. Ikiwiki har nu den `!`-foranstillede syntaks vist "
-"ovenfor som det foretrukne alternativ. Ikiwiki understøtter dog fortsat den "
-"ældre syntaks, hvis ikke `prefix_directives`-valget er aktiveret. For "
-"bagudkompatibilitet med eksisterende wikier er dette valg som standard "
-"deaktiveret i øjeblikket, så ikiwiki understøtter den ældre syntaks."
+#: ikiwiki/blog.mdwn:8
+msgid "Please update your links, as this redirection page will be removed in a future ikiwiki release."
+msgstr "Opdatér dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig udgave af ikiwiki."
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:1
@@ -592,14 +218,8 @@ msgstr "[[!meta title=\"Formatering af wikisider\"]]\n"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:7
-msgid ""
-"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:"
-msgstr ""
-"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:"
+msgid "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:"
+msgstr "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:"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:9
@@ -608,12 +228,8 @@ msgstr "hold afstand med blanke linjer mellem afsnit."
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:12
-msgid ""
-"You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by "
-"placing it in single or double asterisks."
-msgstr ""
-"du kan \\**fremhæve*\\* eller \\*\\***kraftigt fremhæve**\\*\\* tekst ved at "
-"placere det med enkelte eller dobbelte asterisker (stjerner) omkring."
+msgid "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by placing it in single or double asterisks."
+msgstr "du kan \\**fremhæve*\\* eller \\*\\***kraftigt fremhæve**\\*\\* tekst ved at placere det med enkelte eller dobbelte asterisker (stjerner) omkring."
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:14
@@ -632,12 +248,8 @@ msgstr "\"* et andet emne\""
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:20
-msgid ""
-"To make a numbered list, start each line with a number (any number will do) "
-"followed by a period:"
-msgstr ""
-"En nummereret liste laves ved at starte hver linje med et nummer (ethvert "
-"nummer kan bruges) efterfulgt af punktum:"
+msgid "To make a numbered list, start each line with a number (any number will do) followed by a period:"
+msgstr "En nummereret liste laves ved at starte hver linje med et nummer (ethvert nummer kan bruges) efterfulgt af punktum:"
 
 # type: Bullet: '1. '
 #: ikiwiki/formatting.mdwn:24
@@ -656,14 +268,8 @@ msgstr "\"2. tredje linje\""
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:28
-msgid ""
-"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:"
-msgstr ""
-"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:"
+msgid "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:"
+msgstr "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:"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:29
@@ -703,15 +309,13 @@ msgstr "###### ###### h6\n"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:38
-msgid ""
-"To create a horizontal rule, just write three or more dashes or stars on "
-"their own line:"
-msgstr ""
-"En vandret skillelinje oprettes ved at skrive tre eller flere bindestreger "
-"eller stjerner på en linje for sig selv."
+msgid "To create a horizontal rule, just write three or more dashes or stars on their own line:"
+msgstr "En vandret skillelinje oprettes ved at skrive tre eller flere bindestreger eller stjerner på en linje for sig selv."
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:39 ikiwiki/formatting.mdwn:55 index.mdwn:5
+#: ikiwiki/formatting.mdwn:39
+#: ikiwiki/formatting.mdwn:55
+#: index.mdwn:5
 #: sandbox.mdwn:3
 #, no-wrap
 msgid "----\n"
@@ -736,9 +340,7 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/formatting.mdwn:47
 msgid "To write a code block, indent each line with a tab or 4 spaces:"
-msgstr ""
-"En kodeblok skrives ved at indrykke hver linje med eet tabulator-tegn eller "
-"4 mellemrum:"
+msgstr "En kodeblok skrives ved at indrykke hver linje med eet tabulator-tegn eller 4 mellemrum:"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:50
@@ -764,22 +366,13 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:59
-msgid ""
-"In addition to basic html formatting using [[MarkDown]], this wiki lets you "
-"use the following additional features:"
-msgstr ""
-"Udover normal html-formatering med [[MarkDown]], kan du med denne wiki bruge "
-"følgende ekstra finesser:"
+msgid "In addition to basic html formatting using [[MarkDown]], this wiki lets you use the following additional features:"
+msgstr "Udover normal html-formatering med [[MarkDown]], kan du med denne wiki bruge følgende ekstra finesser:"
 
 # type: Bullet: '* '
 #: ikiwiki/formatting.mdwn:62
-msgid ""
-"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]]."
-msgstr ""
-"Henvise til en anden side på wikien ved at skrive sidenavnet med dobbelte "
-"lodrette klammer omkring. Udtrykket `\\[[WikiLink]]` henviser til "
-"[[WikiLink]]."
+msgid "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]]."
+msgstr "Henvise til en anden side på wikien ved at skrive sidenavnet med dobbelte lodrette klammer omkring. Udtrykket `\\[[WikiLink]]` henviser til [[WikiLink]]."
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:63
@@ -817,12 +410,8 @@ msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:76
-msgid ""
-"Create and fill out [[templates]] for repeated chunks of parameterized wiki "
-"text."
-msgstr ""
-"Oprette og udfylde [[skabeloner|templates]] for gentagne klumper af "
-"parameteriseret wikitekst."
+msgid "Create and fill out [[templates]] for repeated chunks of parameterized wiki text."
+msgstr "Oprette og udfylde [[skabeloner|templates]] for gentagne klumper af parameteriseret wikitekst."
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:80
@@ -830,11 +419,11 @@ msgstr ""
 msgid ""
 "* Insert various [[directives|directive]] onto a page to perform useful\n"
 "  actions.\n"
-"[[!if test=\"enabled(toc) or enabled(meta) or (enabled(inline) and blog)\" then=\"\"\"\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
 msgstr ""
-"* Insæt diverse [[directiver|directive]] på en side til at udføre nyttige\n"
+"* Indsæt diverse [[directiver|directive]] på en side for at udføre nyttige\n"
 "  handlinger.\n"
-"[[!if test=\"enabled(toc) or enabled(meta) or (enabled(inline) and blog)\" then=\"\"\"\n"
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:82
@@ -860,7 +449,8 @@ msgid "\t\\[[!toc]]\n"
 msgstr "\t\\[[!toc]]\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:91 recentchanges.mdwn:1
+#: ikiwiki/formatting.mdwn:91
+#: recentchanges.mdwn:1
 #, no-wrap
 msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n"
@@ -879,12 +469,12 @@ msgstr "\t\\[[!meta title=\"fuldstændige sidetitel\"]]\n"
 # type: Plain text
 #: ikiwiki/formatting.mdwn:97
 #, no-wrap
-msgid "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
+msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
 
 # type: Plain text
 #: ikiwiki/formatting.mdwn:99
-msgid "Create a [[blog]] by inlining a set of pages:"
+msgid "Create a blog by inlining a set of pages:"
 msgstr "Oprette en [[blog]] ved at indlejre et udvalg af sider:"
 
 # type: Plain text
@@ -894,12 +484,6 @@ msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
 msgstr "\t\\[[!inline pages=\"blog/*\"]]\n"
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:103
-#, no-wrap
-msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
-msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
-
-# type: Plain text
 #: ikiwiki/formatting.mdwn:105
 #, no-wrap
 msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
@@ -913,38 +497,18 @@ msgstr "  [[!listdirectives ]]\n"
 
 # type: Plain text
 #: ikiwiki/markdown.mdwn:5
-msgid ""
-"[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."
-msgstr ""
-"[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."
+msgid "[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."
+msgstr "[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."
 
 # type: Plain text
 #: ikiwiki/markdown.mdwn:10
-msgid ""
-"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."
-msgstr ""
-"Du kan læse dokumentation til markdown-syntaksen under [[formatering|"
-"formatting]] og [Markdown: syntax](http://daringfireball.net/projects/"
-"markdown/syntax). En [markdown modus](http://jblevins.org/projects/markdown-"
-"mode/) til emacs kan være en hjælp ved redigering."
+msgid "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."
+msgstr "Du kan læse dokumentation til markdown-syntaksen under [[formatering|formatting]] og [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). En [markdown modus](http://jblevins.org/projects/markdown-mode/) til emacs kan være en hjælp ved redigering."
 
 # type: Plain text
 #: ikiwiki/markdown.mdwn:13
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:1
@@ -966,22 +530,13 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:11
-msgid ""
-"[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."
-msgstr ""
-"[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."
+msgid "[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."
+msgstr "[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."
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:13
-msgid ""
-"To sign up for an OpenID, visit one of the following identity providers:"
-msgstr ""
-"Du kan registrere en OpenID ved at besøge en af de følgende "
-"identitetsudbydere:"
+msgid "To sign up for an OpenID, visit one of the following identity providers:"
+msgstr "Du kan registrere en OpenID ved at besøge en af de følgende identitetsudbydere:"
 
 # type: Bullet: '* '
 #: ikiwiki/openid.mdwn:20
@@ -1010,12 +565,8 @@ msgstr "[TrustBearer](https://openid.trustbearer.com/)"
 
 # type: Bullet: '* '
 #: ikiwiki/openid.mdwn:20
-msgid ""
-"or any of the [many others out there](http://openiddirectory.com/openid-"
-"providers-c-1.html)."
-msgstr ""
-"eller en af de [mange andre derude](http://openiddirectory.com/openid-"
-"providers-c-1.html)."
+msgid "or any of the [many others out there](http://openiddirectory.com/openid-providers-c-1.html)."
+msgstr "eller en af de [mange andre derude](http://openiddirectory.com/openid-providers-c-1.html)."
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:22
@@ -1029,14 +580,8 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:26
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:28
@@ -1046,13 +591,8 @@ msgstr "---\n"
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:32
-msgid ""
-"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:"
-msgstr ""
-"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:"
+msgid "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:"
+msgstr "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:"
 
 # type: Plain text
 #: ikiwiki/openid.mdwn:34
@@ -1066,25 +606,13 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/pagespec.mdwn:6
-msgid ""
-"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."
-msgstr ""
-"Til at angive et udvalg af sider, eksempelvis låste sider, sider du vil "
-"abonnere på ændringer til, eller sider som skal udgøre en blog, anvender "
-"wikien et PageSpec. dette er et udtryk som modsvarer et bestemt udvalg af "
-"sider."
+msgid "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."
+msgstr "Til at angive et udvalg af sider, eksempelvis låste sider, sider du vil abonnere på ændringer til, eller sider som skal udgøre en blog, anvender wikien et PageSpec. dette er et udtryk som modsvarer et bestemt udvalg af sider."
 
 # type: Plain text
 #: ikiwiki/pagespec.mdwn:9
-msgid ""
-"The simplest PageSpec is a simple list of pages. For example, this matches "
-"any of the three listed pages:"
-msgstr ""
-"Det simpleste PageSpec er simpelthen en opremsning af sider med \"or\" "
-"imellem (\"or\" betyder \"eller\" på engelsk). Dette modsvarer eksempelvis "
-"enhver af de tre nævnte sider:"
+msgid "The simplest PageSpec is a simple list of pages. For example, this matches any of the three listed pages:"
+msgstr "Det simpleste PageSpec er simpelthen en opremsning af sider med \"or\" imellem (\"or\" betyder \"eller\" på engelsk). Dette modsvarer eksempelvis enhver af de tre nævnte sider:"
 
 # type: Plain text
 #: ikiwiki/pagespec.mdwn:11
@@ -1094,18 +622,8 @@ msgstr "\tfoo or bar or baz\n"
 
 # type: Plain text
 #: ikiwiki/pagespec.mdwn:17
-msgid ""
-"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:"
-msgstr ""
-"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:"
+msgid "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:"
+msgstr "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:"
 
 # type: Plain text
 #: ikiwiki/pagespec.mdwn:19
@@ -1115,12 +633,8 @@ msgstr "\t*musik* or SandBox/*\n"
 
 # type: Plain text
 #: ikiwiki/pagespec.mdwn:22
-msgid ""
-"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:"
-msgstr ""
-"Du kan også angive \"`!`\" foran et emne for at undgå sider som modsvarer "
-"det. Så for at modsvare alle sider undtagen diskussionssider og sandkassen:"
+msgid "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:"
+msgstr "Du kan også angive \"`!`\" foran et emne for at undgå sider som modsvarer det. Så for at modsvare alle sider undtagen diskussionssider og sandkassen:"
 
 # type: Bullet: '	* '
 #: ikiwiki/pagespec.mdwn:24
@@ -1128,208 +642,142 @@ msgid "and !SandBox and !*/Discussion"
 msgstr "and !SandBox and !*/Discussion"
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:27
-msgid ""
-"Some more elaborate limits can be added to what matches using any of these "
-"functions:"
-msgstr ""
-"En række mere nøjagtige begrænsninger kan tilføjes med disse funktioner:"
+#: ikiwiki/pagespec.mdwn:26
+msgid "Some more elaborate limits can be added to what matches using these functions:"
+msgstr "Resultaterne kan begrænses mere nuanceret med disse funktioner:"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`link(page)`\" - match only pages that link to a given page (or glob)"
-msgstr ""
-"\"`link(side)`\" - modsvarer kun sider som henviser til en given side (eller "
-"glob)"
+msgstr "\"`link(side)`\" - modsvarer kun sider som henviser til en given side (eller glob)"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`backlink(page)`\" - match only pages that a given page links to"
-msgstr ""
-"\"`backlink(side)`\" - modsvarer kun sider som en given side henviser til"
+msgstr "\"`backlink(side)`\" - modsvarer kun sider som en given side henviser til"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
-msgid ""
-"\"`creation_month(month)`\" - match only pages created on the given month"
-msgstr ""
-"\"`creation_month(måned)`\" - modsvarer kun sider oprettet den givne måned"
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`creation_month(month)`\" - match only pages created on the given month"
+msgstr "\"`creation_month(måned)`\" - modsvarer kun sider oprettet den givne måned"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`creation_day(mday)`\" - or day of the month"
 msgstr "\"`creation_day(månedsdag)`\" - eller dag på måneden"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`creation_year(year)`\" - or year"
 msgstr "\"`creation_year(år)`\" - eller år"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
-msgid ""
-"\"`created_after(page)`\" - match only pages created after the given page "
-"was created"
-msgstr ""
-"\"`created_after(side)`\" - modsvarer kun sider oprettet efter den givne "
-"side blev oprettet"
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`created_after(page)`\" - match only pages created after the given page was created"
+msgstr "\"`created_after(side)`\" - modsvarer kun sider oprettet efter den givne side blev oprettet"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
-msgid ""
-"\"`created_before(page)`\" - match only pages created before the given page "
-"was created"
-msgstr ""
-"\"`created_before(side)`\" - modsvarer kun sider oprettet før den givne side "
-"blev oprettet"
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`created_before(page)`\" - match only pages created before the given page was created"
+msgstr "\"`created_before(side)`\" - modsvarer kun sider oprettet før den givne side blev oprettet"
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
-msgid ""
-"\"`glob(someglob)`\" - match pages that match the given glob. Just writing "
-"the glob by itself is actually a shorthand for this function."
-msgstr ""
-"\"`glob(nogetglob)`\" - modsvarer sider som modsvarer det givne glob. Blot "
-"at skrive glob'et alene er faktisk en genvej til denne funktion."
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`glob(someglob)`\" - match pages that match the given glob. Just writing the glob by itself is actually a shorthand for this function."
+msgstr "\"`glob(nogetglob)`\" - modsvarer sider som modsvarer det givne glob. Blot at skrive glob'et alene er faktisk en genvej til denne funktion."
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
-msgid ""
-"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
-"that globs do not usually match."
-msgstr ""
-"\"`internal(glob)`\" - lissom `glob()`, men modsvarer også internt anvendte "
-"sider som glob normalt ikke modsvarer."
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages that globs do not usually match."
+msgstr "\"`internal(glob)`\" - lissom `glob()`, men modsvarer også internt anvendte sider som glob normalt ikke modsvarer."
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
-msgid ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, "
-"matching the specified glob."
-msgstr ""
-"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license"
-"(glob)`\", \"`copyright(glob)`\" - modsvarer sider med de givne metadata, "
-"som modsvarer det angivne glob."
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, matching the specified glob."
+msgstr "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license(glob)`\", \"`copyright(glob)`\" - modsvarer sider med de givne metadata, som modsvarer det angivne glob."
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:47
-msgid ""
-"For example, to match all pages in a blog that link to the page about music "
-"and were written in 2005:"
-msgstr ""
-"For eksempelvis at modsvare alle sider i en blog som henviser til en side om "
-"musik og som blev skrevet i 2005:"
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`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."
+msgstr "\"`user(brugernavn)`\" - tester hvorvidt en ændring foretages af en bruger med det angivne  brugernavn. Hvis openid er aktiveret, kan en openid også bruges her."
+
+# type: Bullet: '* '
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`admin()`\" - tests whether a modification is being made by one of the wiki admins."
+msgstr "\"`admin()`\" - tester hvorvidt en ændring foretages af en af wiki-administratorerne."
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:49
+#: ikiwiki/pagespec.mdwn:50
+msgid "\"`ip(address)`\" - tests whether a modification is being made from the specified IP address."
+msgstr "\"`ip(adresse)`\" - tester hvorvidt en ændring foretages fra den angivne IP-adresse."
+
+# type: Plain text
+#: ikiwiki/pagespec.mdwn:53
+msgid "For example, to match all pages in a blog that link to the page about music and were written in 2005:"
+msgstr "For eksempelvis at modsvare alle sider i en blog som henviser til en side om musik og som blev skrevet i 2005:"
+
+# type: Plain text
+#: ikiwiki/pagespec.mdwn:55
 #, no-wrap
 msgid "\tblog/* and link(music) and creation_year(2005)\n"
 msgstr "\tblog/* and link(musik) and creation_year(2005)\n"
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:55
-msgid ""
-"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."
-msgstr ""
-"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."
+#: ikiwiki/pagespec.mdwn:61
+msgid "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."
+msgstr "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."
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:59
-msgid ""
-"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:"
-msgstr ""
-"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:"
+#: ikiwiki/pagespec.mdwn:65
+msgid "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:"
+msgstr "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:"
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:61
+#: ikiwiki/pagespec.mdwn:67
 #, no-wrap
 msgid "\tblog/* and (link(tag/foo) or link(tag/bar))\n"
 msgstr "\tblog/* and (link(tag/foo) or link(tag/bar))\n"
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:67
-msgid ""
-"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\"."
-msgstr ""
-"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\"."
+#: ikiwiki/pagespec.mdwn:73
+msgid "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\"."
+msgstr "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\"."
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:68
+#: ikiwiki/pagespec.mdwn:74
 #, no-wrap
 msgid "## Old syntax\n"
 msgstr "## Gammel syntaks\n"
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:72
-msgid ""
-"The old PageSpec syntax was called a \"GlobList\", and worked differently in "
-"two ways:"
-msgstr ""
-"Den gamle PageSpec-syntaks blev kaldt en \"GlobList\", og fungerede "
-"anderledes på to måder:"
+#: ikiwiki/pagespec.mdwn:78
+msgid "The old PageSpec syntax was called a \"GlobList\", and worked differently in two ways:"
+msgstr "Den gamle PageSpec-syntaks blev kaldt en \"GlobList\", og fungerede anderledes på to måder:"
 
 # type: Bullet: '1. '
-#: ikiwiki/pagespec.mdwn:77
-msgid ""
-"\"and\" and \"or\" were not used; any page matching any item from the list "
-"matched."
-msgstr ""
-"\"and\" og \"or\" blev ikke brugt; enhver side modsvarede ethvert emne fra "
-"listen."
+#: ikiwiki/pagespec.mdwn:83
+msgid "\"and\" and \"or\" were not used; any page matching any item from the list matched."
+msgstr "\"and\" og \"or\" blev ikke brugt; enhver side modsvarede ethvert emne fra listen."
 
 # type: Bullet: '2. '
-#: ikiwiki/pagespec.mdwn:77
-msgid ""
-"If an item was prefixed with \"`!`\", then no page matching that item "
-"matched, even if it matched an earlier list item."
-msgstr ""
-"Hvis et emne havde \"`!`\" foran, modsvarede ingen side dette emne, heller "
-"ikke hvis det modsvarede et tidligere emne."
+#: ikiwiki/pagespec.mdwn:83
+msgid "If an item was prefixed with \"`!`\", then no page matching that item matched, even if it matched an earlier list item."
+msgstr "Hvis et emne havde \"`!`\" foran, modsvarede ingen side dette emne, heller ikke hvis det modsvarede et tidligere emne."
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:80
-msgid ""
-"For example, here is the old way to match all pages except for the SandBox "
-"and Discussion pages:"
-msgstr ""
-"Her er et eksempel på den gamle måde at modsvare alle sider undtagen "
-"sandkassen og diskussionssider:"
+#: ikiwiki/pagespec.mdwn:86
+msgid "For example, here is the old way to match all pages except for the SandBox and Discussion pages:"
+msgstr "Her er et eksempel på den gamle måde at modsvare alle sider undtagen sandkassen og diskussionssider:"
 
 # type: Bullet: '	* '
-#: ikiwiki/pagespec.mdwn:82
+#: ikiwiki/pagespec.mdwn:88
 msgid "!SandBox !*/Discussion"
 msgstr "!SandBox !*/Discussion"
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:85
-msgid ""
-"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."
-msgstr ""
-"Brug af denne gamle syntaks er stadigt understøttet. Den er dog på vej ud, "
-"så det anbefales at bruge den nye syntaks."
+#: ikiwiki/pagespec.mdwn:91
+msgid "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."
+msgstr "Brug af denne gamle syntaks er stadigt understøttet. Den er dog på vej ud, så det anbefales at bruge den nye syntaks."
 
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:5
@@ -1345,25 +793,13 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:9
-msgid ""
-"If attachments are enabled, the wiki admin can control what types of "
-"attachments will be accepted, via the `allowed_attachments` configuration "
-"setting."
-msgstr ""
-"Hvis vedhæftninger er aktiveret, kan wiki-administratoren styre hvilke typer "
-"vedhæftninger der vil blive accepteret gennem opsætningsindstillingen "
-"`allowed_attachments`."
+msgid "If attachments are enabled, the wiki admin can control what types of attachments will be accepted, via the `allowed_attachments` configuration setting."
+msgstr "Hvis vedhæftninger er aktiveret, kan wiki-administratoren styre hvilke typer vedhæftninger der vil blive accepteret gennem opsætningsindstillingen `allowed_attachments`."
 
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:13
-msgid ""
-"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:"
-msgstr ""
-"Som eksempel, for at begrænse vilkårlige filer til 50 kilobytes, men tillade "
-"større mp3-filer at blive lagt op af joey til en bestemt mappe, og checke "
-"alle vedhæftninger for vira, kunne noget i stil med dette bruges:"
+msgid "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:"
+msgstr "Som eksempel, for at begrænse vilkårlige filer til 50 kilobytes, men tillade større mp3-filer at blive lagt op af joey til en bestemt mappe, og checke alle vedhæftninger for vira, kunne noget i stil med dette bruges:"
 
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:15
@@ -1373,60 +809,26 @@ msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg
 
 # type: Plain text
 #: ikiwiki/pagespec/attachment.mdwn:18
-msgid ""
-"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following "
-"additional tests:"
-msgstr ""
-"Den normale [[ikiwiki/PageSpec]]-syntaks er udvidet med følgende yderligere "
-"tests:"
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:20
-msgid "maxsize(size)"
-msgstr "maxsize(størrelse)"
+msgid "The regular [[ikiwiki/PageSpec]] syntax is expanded with the following additional tests:"
+msgstr "Den normale [[ikiwiki/PageSpec]]-syntaks er udvidet med følgende yderligere tests:"
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:24
-#, no-wrap
-msgid ""
-"  Tests whether the attachment is no larger than the specified size.\n"
-"  The size defaults to being in bytes, but \"kb\", \"mb\", \"gb\" etc can be\n"
-"  used to specify the units.\n"
-msgstr ""
-"  Tester hvorvidt vedhæftningen højst fylder er den angivne størrelse.\n"
-"  Størrelsen angives som standard i bytes, men \"kb\", \"mb\", \"gb\" osv. kan bruges\n"
-"  til at angive enheder.\n"
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:26
-msgid "minsize(size)"
-msgstr "minsize(størrelse)"
+#: ikiwiki/pagespec/attachment.mdwn:22
+msgid "\"`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."
+msgstr "\"`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."
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:28
-#, no-wrap
-msgid "  Tests whether the attachment is no smaller than the specified size.\n"
-msgstr "  Tester hvorvidt størrelsen mindst fylder den angivne størrelse.\n"
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:30
-msgid "ispage()"
-msgstr "ispage()"
+#: ikiwiki/pagespec/attachment.mdwn:25
+msgid "\"`minsize(size)`\" - Tests whether the attachment is no smaller than the specified size."
+msgstr "\"`minsize(størrelse)`\" - Tester hvorvidt størrelsen mindst fylder den angivne størrelse."
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:34
-#, no-wrap
-msgid ""
-"  Tests whether the attachment will be treated by ikiwiki as a wiki page.\n"
-"  (Ie, if it has an extension of \".mdwn\", or of any other enabled page\n"
-"  format).\n"
-msgstr ""
-"  Tester hvorvidt vedhæftningen vil blive håndteret af ikiwiki som en wikiside.\n"
-"  (altså om det har endelsen \".mdwn\", eller ethvert andet aktiveret\n"
-"  sideformat).\n"
+#: ikiwiki/pagespec/attachment.mdwn:29
+msgid "\"`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)."
+msgstr "\"`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)."
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:38
+#: ikiwiki/pagespec/attachment.mdwn:33
 #, no-wrap
 msgid ""
 "  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
@@ -1437,76 +839,26 @@ msgstr ""
 "  så brug `!ispage()` ; hvis du kun vil tillade wikisider at blive lagt op som\n"
 "  vedhæftninger, så brug `ispage()`.\n"
 
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:40
-msgid "user(username)"
-msgstr "user(brugernavn)"
-
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:43
-#, no-wrap
-msgid ""
-"  Tests whether the attachment is being uploaded by a user with the\n"
-"  specified username. If openid is enabled, an openid can also be put here.\n"
-msgstr ""
-"  Tester hvorvidt vedhæftningen bliver lagt op af en bruger med det angivne\n"
-"  brugernavn. Hvis openid er aktiveret, kan en openid også bruges her.\n"
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:45
-msgid "ip(address)"
-msgstr "ip(adresse)"
+#: ikiwiki/pagespec/attachment.mdwn:36
+msgid "\"`mimetype(foo/bar)`\" - This checks the MIME type of the attachment. You can include a glob in the type, for example `mimetype(image/*)`."
+msgstr "\"`mimetype(foo/bar)`\" - Dette checker MIME-typen for vedhæftningen. Du kan angive et glob som type, eksampelvis `mimetype(image/*)`."
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:48
-#, no-wrap
-msgid ""
-"  Tests whether the attacment is being uploaded from the specified IP\n"
-"  address.\n"
-msgstr "  Tester hvorvidt vedhæftningen bliver lagt op fra den angivne IP-adresse.\n"
+#: ikiwiki/pagespec/attachment.mdwn:37
+msgid "\"`virusfree()`\" - Checks the attachment with an antiviral program."
+msgstr "\"`virusfree()`\" - Checker vedhæftningen med et antivirusprogram."
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:50
-msgid "mimetype(foo/bar)"
-msgstr "mimetype(foo/bar)"
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:53
-#, no-wrap
-msgid ""
-"  This checks the MIME type of the attachment. You can include a glob\n"
-"  in the type, for example `mimetype(image/*)`.\n"
-msgstr ""
-"  Dette checker MIME-typen for vedhæftningen. Du kan angive et glob som type,\n"
-"  eksampelvis `mimetype(image/*)`.\n"
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:55
-msgid "virusfree()"
-msgstr "virusfree()"
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:56
-#, no-wrap
-msgid "  Checks the attachment with an antiviral program.\n"
-msgstr "  Checker vedhæftningen med et antivirusprogram.\n"
-
-# type: Bullet: '* '
-#: ikiwiki/preprocessordirective.mdwn:1 preprocessordirective.mdwn:1
+#: ikiwiki/preprocessordirective.mdwn:1
 #, no-wrap
 msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
 msgstr "[[!meta redir=ikiwiki/directive delay=10]]\n"
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:7 preprocessordirective.mdwn:7
-msgid ""
-"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."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/directive|ikiwiki/directive]]. Opdatér "
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
+#: ikiwiki/preprocessordirective.mdwn:7
+msgid "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."
+msgstr "Denne side er flyttet til [[ikiwiki/directive|ikiwiki/directive]]. Opdatér dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig udgave af ikiwiki."
 
 # type: Plain text
 #: ikiwiki/searching.mdwn:6
@@ -1522,53 +874,33 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/searching.mdwn:10
-msgid ""
-"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 more "
-"powerful searches."
-msgstr ""
-"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."
+msgid "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 more powerful searches."
+msgstr "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."
 
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
 msgid "To match a phrase, enclose it in double quotes."
-msgstr ""
-"Put gåseøjne omkring nogle ord for at søge efter dem som én formulering."
+msgstr "Put gåseøjne omkring nogle ord for at søge efter dem som én formulering."
 
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
 msgid "`AND` can be used to search for documents containing two expressions."
-msgstr ""
-"`AND` kan bruges til at søge efter dokumenter som indeholder to udtryk."
+msgstr "`AND` kan bruges til at søge efter dokumenter som indeholder to udtryk."
 
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
-msgid ""
-"`OR` can be used to search for documents containing either one of two "
-"expressions."
-msgstr ""
-"`OR` kan bruges ti at søge efter dokumenter som indeholder ethvert af to "
-"udtryk."
+msgid "`OR` can be used to search for documents containing either one of two expressions."
+msgstr "`OR` kan bruges ti at søge efter dokumenter som indeholder ethvert af to udtryk."
 
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
-msgid ""
-"Parentheses can be used to build up complicated search expressions. For "
-"example, \"(foo AND bar) OR (me AND you)\""
-msgstr ""
-"Parenteser kan bruges til at opbygge komplicerede søgeformuleringer. "
-"Eksempelvis \"(foo AND bar) OR (mig AND dig)\""
+msgid "Parentheses can be used to build up complicated search expressions. For example, \"(foo AND bar) OR (me AND you)\""
+msgstr "Parenteser kan bruges til at opbygge komplicerede søgeformuleringer. Eksempelvis \"(foo AND bar) OR (mig AND dig)\""
 
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
-msgid ""
-"Prefix a search term with \"-\" to avoid it from appearing in the results.  "
-"For example, \"-discussion\" will omit \"discussion\"."
-msgstr ""
-"Put \"-\" foran et søgeudtryk for at undgå det blandt resultaterne. "
-"Eksempelvis vil \"-discussion\" udelade \"discussion\"."
+msgid "Prefix a search term with \"-\" to avoid it from appearing in the results.  For example, \"-discussion\" will omit \"discussion\"."
+msgstr "Put \"-\" foran et søgeudtryk for at undgå det blandt resultaterne. Eksempelvis vil \"-discussion\" udelade \"discussion\"."
 
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
@@ -1578,139 +910,61 @@ msgstr "Brug \"title:foo\" til at søge efter en side med en given titel."
 # type: Bullet: '* '
 #: ikiwiki/searching.mdwn:20
 msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"."
-msgstr ""
-"Brug \"link:bar\" til at søge efter sider som indeholder henvisning til \"bar"
-"\"."
+msgstr "Brug \"link:bar\" til at søge efter sider som indeholder henvisning til \"bar\"."
 
 # type: Plain text
 #: ikiwiki/subpage.mdwn:6
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/subpage.mdwn:11
-msgid ""
-"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."
-msgstr ""
-"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 så dybt du har lyst."
+msgid "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."
+msgstr "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 så dybt du har lyst."
 
 # type: Plain text
 #: ikiwiki/subpage.mdwn:12
 msgid "Linking to and from a SubPage is explained in [[LinkingRules]]."
-msgstr ""
-"Henvisninger til og fra en [[UnderSide||SubPage]] er forklaret under "
-"[[HenvisningsRegler||LinkingRules]]."
+msgstr "Henvisninger til og fra en [[UnderSide||SubPage]] er forklaret under [[HenvisningsRegler||LinkingRules]]."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:6
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:10
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:16
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:20
-msgid ""
-"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]]."
-msgstr ""
-"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]]."
+msgid "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]]."
+msgstr "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]]."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:23
-msgid ""
-"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", "
-"or from BazBar/SubPage to \"FooBar/SubPage\"."
-msgstr ""
-"Du kan bruge dette til eksempelvis at henvise fra BazBar til \"FooBar/"
-"UnderSide\", eller fra BazBar/UnderSide til \"FooBar/UnderSide\"."
+msgid "You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", or from BazBar/SubPage to \"FooBar/SubPage\"."
+msgstr "Du kan bruge dette til eksempelvis at henvise fra BazBar til \"FooBar/UnderSide\", eller fra BazBar/UnderSide til \"FooBar/UnderSide\"."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:29
-msgid ""
-"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\"."
-msgstr ""
-"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\"."
+msgid "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\"."
+msgstr "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\"."
 
 # type: Plain text
 #: ikiwiki/subpage/linkingrules.mdwn:33
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:5
-msgid ""
-"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]]`."
+msgid "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]]`."
 msgstr ""
 "WikiLinks gør det muligt enkelt at lave henvisninger (linke) mellem sider i\n"
 "wikien. Opret en [[WikiLink]] ved at skrive siden du vil henvise til med\n"
@@ -1718,61 +972,33 @@ msgstr ""
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:8
-msgid ""
-"If you ever need to write something like `\\[[WikiLink]]` without creating a "
-"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
-msgstr ""
-"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]]`."
+msgid "If you ever need to write something like `\\[[WikiLink]]` without creating a wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`."
+msgstr "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]]`."
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:11
-msgid ""
-"There are some special [[SubPage/LinkingRules]] that come into play when "
-"linking between [[SubPages|SubPage]]."
-msgstr ""
-"Specielle [[henvisningsregler|SubPage/LinkingRules]] træder i kraft når der "
-"henvises på tværs af [[undersider|SubPage]]."
+msgid "There are some special [[SubPage/LinkingRules]] that come into play when linking between [[SubPages|SubPage]]."
+msgstr "Specielle [[henvisningsregler|SubPage/LinkingRules]] træder i kraft når der henvises på tværs af [[undersider|SubPage]]."
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:14
-msgid ""
-"Also, if the file linked to by a WikiLink looks like an image, it will be "
-"displayed inline on the page."
-msgstr ""
-"Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil "
-"det blive vist indlejret i siden."
+msgid "Also, if the file linked to by a WikiLink looks like an image, it will be displayed inline on the page."
+msgstr "Desuden, hvis filen der henvises til med en WikiLink ligner et billede, vil det blive vist indlejret i siden."
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:18
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:22
-msgid ""
-"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]]."
-msgstr ""
-"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]]."
+msgid "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]]."
+msgstr "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]]."
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:25
-msgid ""
-"To link to an anchor inside a page, you can use something like `"
-"\\[[WikiLink#foo]]`"
-msgstr ""
-"For at henvise til et anker inde på en side, kan du bruge noget i stil med `"
-"\\[[WikiLink#foo]]`"
+msgid "To link to an anchor inside a page, you can use something like `\\[[WikiLink#foo]]`"
+msgstr "For at henvise til et anker inde på en side, kan du bruge noget i stil med `\\[[WikiLink#foo]]`"
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:26
@@ -1782,22 +1008,8 @@ msgstr "## Direktiver og wikilinks\n"
 
 # type: Plain text
 #: ikiwiki/wikilink.mdwn:36
-msgid ""
-"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."
-msgstr ""
-"ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks "
-"brugte mellemrum til at skelne mellem direktiver og wikilinks; det medfører, "
-"at når den syntaks anvendes kan du ikke bruge mellemrum i WikiLinks, og må "
-"erstatte mellemrum med understregning. Den nyere syntaks, aktiveret med "
-"valget `prefix_directives` i en ikiwiki-opsætningsfil, sætter `!` foran "
-"direktiver, og forhindrer derfor ikke henvisninger med mellemrum. Fremtidige "
-"versioner af ikiwiki vil aktivere dette valg som standard."
+msgid "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."
+msgstr "ikiwiki har to syntakser til [[direktiver|directive]]. Den ældre syntaks brugte mellemrum til at skelne mellem direktiver og wikilinks; det medfører, at når den syntaks anvendes kan du ikke bruge mellemrum i WikiLinks, og må erstatte mellemrum med understregning. Den nyere syntaks, aktiveret med valget `prefix_directives` i en ikiwiki-opsætningsfil, sætter `!` foran direktiver, og forhindrer derfor ikke henvisninger med mellemrum. Fremtidige versioner af ikiwiki vil aktivere dette valg som standard."
 
 # type: Plain text
 #: index.mdwn:2
@@ -1807,9 +1019,7 @@ msgstr "Velkommen til din nye wiki."
 # type: Plain text
 #: index.mdwn:4
 msgid "All wikis are supposed to have a [[SandBox]], so this one does too."
-msgstr ""
-"Alle wikier forventes at have en [[SandKasse|SandBox]], så det har denne "
-"også."
+msgstr "Alle wikier forventes at have en [[SandKasse|SandBox]], så det har denne også."
 
 # type: Plain text
 #: index.mdwn:7
@@ -1817,56 +1027,6 @@ msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
 msgstr "Denne wiki er drevet af [ikiwiki](http://ikiwiki.info/)."
 
 # type: Plain text
-#: markdown.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/markdown delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/markdown delay=10]]\n"
-
-# type: Plain text
-#: markdown.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/markdown|ikiwiki/markdown]]. Opdatér "
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
-
-# type: Plain text
-#: openid.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/openid delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/openid delay=10]]\n"
-
-# type: Plain text
-#: openid.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your "
-"links, as this redirection page will be removed in a future ikiwiki release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/openid|ikiwiki/openid]]. Opdatér dine "
-"henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
-
-# type: Plain text
-#: pagespec.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/pagespec delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/pagespec delay=10]]\n"
-
-# type: Plain text
-#: pagespec.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/pagespec|ikiwiki/pagespec]]. Opdatér "
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
-
-# type: Plain text
 #: recentchanges.mdwn:2
 #, no-wrap
 msgid "[[!meta title=\"RecentChanges\"]]\n"
@@ -1889,11 +1049,8 @@ msgstr ""
 
 # type: Plain text
 #: sandbox.mdwn:2
-msgid ""
-"This is the SandBox, a page anyone can edit to learn how to use the wiki."
-msgstr ""
-"Dette er [[SandKassen|SandBox]], en side som hvem som helst kan redigere for "
-"at lære hvordan en wiki bruges."
+msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki."
+msgstr "Dette er [[SandKassen|SandBox]], en side som hvem som helst kan redigere for at lære hvordan en wiki bruges."
 
 # type: Plain text
 #: sandbox.mdwn:6
@@ -2013,380 +1170,163 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr "Denne side styrer hvilke genveje wikien understøtter."
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
 msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
-msgstr ""
-"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
+msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
-msgid ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+#: shortcuts.mdwn:62
+msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
+msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
-msgid ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
-"\"debian-%s@lists.debian.org\"]]"
-msgstr ""
-"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc="
-"\"debian-%s@lists.debian.org\"]]"
+#: shortcuts.mdwn:62
+msgid "[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc=\"debian-%s@lists.debian.org\"]]"
+msgstr "[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc=\"debian-%s@lists.debian.org\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
 msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
 msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
-msgid ""
-"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
-msgstr ""
-"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+#: shortcuts.mdwn:62
+msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
+msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
-msgid ""
-"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s"
-"\"]]"
+#: shortcuts.mdwn:62
+msgid "[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
+msgstr "[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
 
 # type: Plain text
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 #, no-wrap
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`.  See http://snapshot.debian.net for details.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgstr ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
-"  * Brug: `\\[[!debss package]]`, `\\[[!debss package#version]]`, eller `\\[[!debss package/version]]`. Se http://snapshot.debian.net for detailjer.\n"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:30
-#, no-wrap
-msgid "  [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
-msgstr "  [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s"
-"\" desc=\"freedesktop.org bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s"
-"\" desc=\"freedesktop.org bug #%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/"
-"%s\" desc=\"%s@lists.freedesktop.org\"]]"
-msgstr ""
-"[[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/"
-"%s\" desc=\"%s@lists.freedesktop.org\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s"
-"\" desc=\"GNOME bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s"
-"\" desc=\"GNOME bug #%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s"
-"\" desc=\"Linux bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s"
-"\" desc=\"Linux bug #%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s"
-"\" desc=\"Mozilla bug #%s\"]]"
-msgstr ""
-"[[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s"
-"\" desc=\"Mozilla bug #%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" "
-"desc=\"%s@gnu.org\"]]"
-msgstr ""
-"[[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" "
-"desc=\"%s@gnu.org\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]"
-msgstr "[[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]"
-msgstr "[[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s"
-"\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]"
-msgstr "[[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s"
-"\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/"
-"ctanPackageInformation.py?id=%s\"]]"
-msgstr ""
-"[[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/"
-"ctanPackageInformation.py?id=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]"
-msgstr "[[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]"
-msgstr "[[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]"
-msgstr "[[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s"
-"\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]"
-msgstr "[[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s"
-"\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]"
-msgstr ""
-"[[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]"
-msgstr ""
-"[[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?"
-"Form=Dict1&Strategy=*&Database=*&Query=%s\"]]"
-msgstr ""
-"[[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?"
-"Form=Dict1&Strategy=*&Database=*&Query=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]"
-msgstr "[[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?"
-"op=vindex&exact=on&search=0x%s\"]]"
-msgstr ""
-"[[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?"
-"op=vindex&exact=on&search=0x%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]"
-msgstr ""
-"[[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic="
-"%s&type=domain\"]]"
-msgstr ""
-"[[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic="
-"%s&type=domain\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"
-"\"]]"
-msgstr ""
-"[[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"
-"\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]"
-msgstr "[[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]"
-msgstr "[[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]"
-msgstr "[[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]"
-msgstr "[[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]"
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]"
-msgstr "[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]"
+"  * Brug: `\\[[!debss package]]`, `\\[[!debss package#version]]`, eller `\\[[!debss package/version]]`.  Se http://snapshot.debian.net for detaljer.\n"
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n"
+"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n"
+"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 
 # type: Plain text
 #: shortcuts.mdwn:68
-msgid ""
-"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."
-msgstr ""
-"Tilføj en ny genvej med [[direktivet|ikiwiki/directive]] `shortcut`. I URLen "
-"erstattes \"%s\" med teksten overdraget til den navngivne genvej, efter URL-"
-"omkodning af den, og '%S' erstattes med den rå, ukodede tekst. Den valgfri "
-"`desc`-parameter styrer beskrivelsen af henvisningen."
+msgid "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."
+msgstr "Tilføj en ny genvej med [[direktivet|ikiwiki/directive]] `shortcut`. I URLen erstattes \"%s\" med teksten overdraget til den navngivne genvej, efter URL-omkodning af den, og '%S' erstattes med den rå, ukodede tekst. Den valgfri `desc`-parameter styrer beskrivelsen af henvisningen."
 
 # type: Plain text
 #: shortcuts.mdwn:73
-msgid ""
-"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."
-msgstr ""
-"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."
+msgid "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."
+msgstr "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."
 
 # type: Plain text
 #: shortcuts.mdwn:77
-msgid ""
-"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 ikiwiki will "
-"include your shortcut in the standard underlay."
-msgstr ""
-"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 ikiwikien]"
-"(http://ikiwiki.info/shortcuts/), så fremtidige versioner af ikiwiki "
-"inkluderer din genvej i standardunderlaget."
-
-# type: Plain text
-#: subpage.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/subpage delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/subpage delay=10]]\n"
-
-# type: Plain text
-#: subpage.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/subpage|ikiwiki/subpage]]. Opdatér dine "
-"henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
+msgid "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 ikiwiki will include your shortcut in the standard underlay."
+msgstr "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 ikiwikien](http://ikiwiki.info/shortcuts/), så fremtidige versioner af ikiwiki inkluderer din genvej i standardunderlaget."
 
 # type: Plain text
 #: templates.mdwn:6
@@ -2403,9 +1343,7 @@ msgstr ""
 
 # type: Plain text
 #: templates.mdwn:9
-msgid ""
-"Templates are files that can be filled out and inserted into pages in the "
-"wiki."
+msgid "Templates are files that can be filled out and inserted into pages in the wiki."
 msgstr "Skabeloner er filer som kan blive udfyldt og indsat på sider i wikien."
 
 # type: Plain text
@@ -2415,20 +1353,12 @@ msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 
 # type: Plain text
-#: templates.mdwn:12
-#, no-wrap
-msgid "## Available templates\n"
-msgstr "## Tilgængelige skabeloner\n"
-
-# type: Plain text
-#: templates.mdwn:16
-msgid ""
-"These templates are available for inclusion onto other pages in this wiki:"
-msgstr ""
-"Disse skabeloner er tilgængelige til indsættelse på andre sider i denne wiki:"
+#: templates.mdwn:14
+msgid "These templates are available for inclusion onto other pages in this wiki:"
+msgstr "Disse skabeloner er tilgængelige til indsættelse på andre sider i denne wiki:"
 
 # type: Plain text
-#: templates.mdwn:19
+#: templates.mdwn:17
 #, no-wrap
 msgid ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -2438,144 +1368,101 @@ msgstr ""
 "sort=title template=titlepage]]\n"
 
 # type: Plain text
-#: templates.mdwn:21
+#: templates.mdwn:19
 #, no-wrap
 msgid "## Using a template\n"
 msgstr "## Brug af skabelon\n"
 
 # type: Plain text
-#: templates.mdwn:24
+#: templates.mdwn:22
 msgid "Using a template works like this:"
 msgstr "En skabelon bruges som her:"
 
 # type: Plain text
-#: templates.mdwn:26
+#: templates.mdwn:24
 #, no-wrap
 msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n"
 msgstr "\t\\[[!template id=note text=\"\"\"Her er teksten til at sætte ind i min note.\"\"\"]]\n"
 
 # type: Plain text
-#: templates.mdwn:29
-msgid ""
-"This fills out the [[note]] template, filling in the `text` field with the "
-"specified value, and inserts the result into the page."
-msgstr ""
-"Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den "
-"angivne værdi og indsætte resultatet på siden."
+#: templates.mdwn:27
+msgid "This fills out the [[note]] template, filling in the `text` field with the specified value, and inserts the result into the page."
+msgstr "Dette udfylder [[note]]-skabelonen, ved at erstatte `text`-feltet med den angivne værdi og indsætte resultatet på siden."
 
 # type: Plain text
-#: templates.mdwn:34
-msgid ""
-"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:"
-msgstr ""
-"Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt på "
-"wikisiden udenfor skabelonen. Trippel-citering af værdien tillader endda at "
-"bruge citering som del af værdien. Kombineret med flerlinje-citerede værdier "
-"tillader dette indlejring af store klumper af opmærket tekst i skabelonen:"
+#: templates.mdwn:32
+msgid "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:"
+msgstr "Generelt kan en værdi indeholde enhver opmærkning som ville være tilladt på wikisiden udenfor skabelonen. Trippel-citering af værdien tillader endda at bruge citering som del af værdien. Kombineret med flerlinje-citerede værdier tillader dette indlejring af store klumper af opmærket tekst i skabelonen:"
 
 # type: Plain text
-#: templates.mdwn:39
+#: templates.mdwn:33
 #, no-wrap
-msgid ""
-"        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
-"        * \\[[Charley]]'s sister.\n"
-"        * \"I want to be an astronaut when I grow up.\"\n"
-"        * Really 8 and a half.\n"
-msgstr ""
-"        \\[[!template id=foo name=\"Sally\" color=\"grøn\" age=8 notes=\"\"\"\n"
-"        * \\[[Charley]]'s søster.\n"
-"        * \"Jeg vil være en astronaut når jeg bliver stor.\"\n"
-"        * Egentligt 8 og et halvt.\n"
+msgid "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n"
+msgstr "        \\[[!template id=foo name=\"Sally\" color=\"grøn\" age=8 notes=\"\"\"\n"
+
+# type: Bullet: '        * '
+#: templates.mdwn:37
+msgid "\\[[Charley]]'s sister."
+msgstr "\\[[Charley]]'s søster."
+
+# type: Bullet: '        * '
+#: templates.mdwn:37
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr "\"Jeg vil være en astronaut når jeg bliver stor.\""
+
+# type: Bullet: '        * '
+#: templates.mdwn:37
+msgid "Really 8 and a half."
+msgstr "Egentligt 8 og et halvt."
 
 # type: Plain text
-#: templates.mdwn:41
+#: templates.mdwn:39
 #, no-wrap
 msgid "## Creating a template\n"
 msgstr "## Oprettelse af skabelon\n"
 
 # type: Plain text
-#: templates.mdwn:47
-msgid ""
-"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."
-msgstr ""
-"Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en side, "
-"så vil siden vise en henvisning som kan bruges til at oprette skabelonen. "
-"Skabelonen er en normal wikiside, placeret i `templates/` undermappen indeni "
-"wikiens kildemappe."
+#: templates.mdwn:45
+msgid "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."
+msgstr "Opret en skabelon ved simpelthen at tilføje skabelon-direktivet til en side, så vil siden vise en henvisning som kan bruges til at oprette skabelonen. Skabelonen er en normal wikiside, placeret i `templates/` undermappen indeni wikiens kildemappe."
 
 # type: Plain text
-#: templates.mdwn:52
-msgid ""
-"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:"
-msgstr ""
-"Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] som "
-"giver mulighed for at lave ret komplekse ting. Læs dokumentationen for den "
-"fulde syntaks, men alt hvad du reelt behøver at vide er nogle få ting:"
+#: templates.mdwn:50
+msgid "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:"
+msgstr "Skabelonen bruger samme syntax som perl-modulet [[!cpan HTML::Template]] som giver mulighed for at lave ret komplekse ting. Læs dokumentationen for den fulde syntaks, men alt hvad du reelt behøver at vide er nogle få ting:"
 
 # type: Bullet: '* '
-#: templates.mdwn:64
-msgid ""
-"Each parameter you pass to the template directive will generate a template "
-"variable. There are also some pre-defined variables like PAGE and BASENAME."
-msgstr ""
-"Ethvert parameter du angiver til skabelondirektivet vil danne en "
-"skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og "
-"BASENAME."
+#: templates.mdwn:62
+msgid "Each parameter you pass to the template directive will generate a template variable. There are also some pre-defined variables like PAGE and BASENAME."
+msgstr "Ethvert parameter du angiver til skabelondirektivet vil danne en skabelonvariabel. Der er også nogle foruddefinerede variable som PAGE og BASENAME."
 
 # type: Bullet: '* '
-#: templates.mdwn:64
-msgid ""
-"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
-"the value will first be converted to html."
-msgstr ""
-"Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel. Wiki-"
-"opmærkning i værdien bliver først konverteret til html."
+#: templates.mdwn:62
+msgid "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in the value will first be converted to html."
+msgstr "Brug `<TMPL_VAR variabel>` til at indsætte værdien af en variabel. Wiki-opmærkning i værdien bliver først konverteret til html."
 
 # type: Bullet: '* '
-#: templates.mdwn:64
-msgid ""
-"To insert the raw value of a variable, with wiki markup not yet converted to "
-"html, use `<TMPL_VAR raw_variable>`."
-msgstr ""
-"Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en variabel, "
-"med wiki-opmærkning endnu ikke konverteret til html."
+#: templates.mdwn:62
+msgid "To insert the raw value of a variable, with wiki markup not yet converted to html, use `<TMPL_VAR raw_variable>`."
+msgstr "Brug `<TMPL_VAR raw_variabel>` til at indsætte den rå værdi af en variabel, med wiki-opmærkning endnu ikke konverteret til html."
 
 # type: Bullet: '* '
-#: templates.mdwn:64
-msgid ""
-"To make a block of text conditional on a variable being set use `<TMPL_IF "
-"NAME=\"variable\">text</TMPL_IF>`."
-msgstr ""
-"Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF NAME="
-"\"variabel\">tekst</TMPL_IF>`."
+#: templates.mdwn:62
+msgid "To make a block of text conditional on a variable being set use `<TMPL_IF NAME=\"variable\">text</TMPL_IF>`."
+msgstr "Gør en tekstblok betinget af at en variabel er i brug med `<TMPL_IF NAME=\"variabel\">tekst</TMPL_IF>`."
 
 # type: Bullet: '* '
-#: templates.mdwn:64
-msgid ""
-"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>`"
-msgstr ""
-"Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med "
-"`<TMPL_IF NAME=\"variabel\">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`"
+#: templates.mdwn:62
+msgid "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>`"
+msgstr "Brug een tekstblok hvis en variabel er i brug, og en anden hvis ikke, med `<TMPL_IF NAME=\"variabel\">tekst<TMPL_ELSE>anden tekst</TMPL_IF>`"
 
 # type: Plain text
-#: templates.mdwn:66
+#: templates.mdwn:64
 msgid "Here's a sample template:"
-msgstr ""
-"Her er et eksempel på en skabelon (det anbefales at bruge engelske "
-"variabelnavne for at undgå problemer med æøå og andre specialtegn):"
+msgstr "Her er et eksempel på en skabelon (det anbefales at bruge engelske variabelnavne for at undgå problemer med æøå og andre specialtegn):"
 
 # type: Plain text
-#: templates.mdwn:80
+#: templates.mdwn:78
 #, no-wrap
 msgid ""
 "        <span class=\"infobox\">\n"
@@ -2607,29 +1494,14 @@ msgstr ""
 "        </span>\n"
 
 # type: Plain text
-#: templates.mdwn:85
-msgid ""
-"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."
-msgstr ""
-"Den udfyldte skabelon vil blive formateret som resten af siden den er "
-"inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki- "
-"opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke op "
-"som krydshenvisninger (backlinks) til den side som anvender skabelonen."
+#: templates.mdwn:83
+msgid "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."
+msgstr "Den udfyldte skabelon vil blive formateret som resten af siden den er inkluderet i, så du kan medtage WikiLinks og alle andre former for wiki- opmærkning i skabelonen. Bemærk dog at sådanne WikiLinks ikke vil dukke op som krydshenvisninger (backlinks) til den side som anvender skabelonen."
 
 # type: Plain text
-#: templates.mdwn:88
-msgid ""
-"Note the use of \"raw_name\" inside the [[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 [[WikiLink]]."
-msgstr ""
-"Bemærk brug af \"raw_name\" indeni [[WikiLink]] generatoren. Dette sikrer at "
-"hvor navnet indeholder noget som måske kan fejltolkes som wiki-opmærkning, "
-"bliver det ikke konverteret til html før det er blevet behandlet som en "
-"[[WikiLink]]."
+#: templates.mdwn:87
+msgid "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]]."
+msgstr "Bemærk brugen af \"raw_name\" indeni [[ikiwiki/WikiLink]]-generatoren. Dette sikrer at hvor navnet indeholder noget som måske kan fejltolkes som wiki-opmærkning, bliver det ikke konverteret til html før det er blevet behandlet som en [[ikiwiki/WikiLink]]."
 
 # type: Plain text
 #: templates/note.mdwn:11
@@ -2696,19 +1568,3 @@ msgstr ""
 "<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
 
-# type: Plain text
-#: wikilink.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/wikilink delay=10]]\n"
-msgstr "[[!meta redir=ikiwiki/wikilink delay=10]]\n"
-
-# type: Plain text
-#: wikilink.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-"Denne side er flyttet til [[ikiwiki/wikilink|ikiwiki/wikilink]]. Opdatér "
-"dine henvisninger, da denne omdirigeringsside bliver fjernet i en fremtidig "
-"udgave af ikiwiki."
diff --git a/po/basewiki.pot b/po/basewiki.pot
index bc0fda6..f6c0b94 100644
--- a/po/basewiki.pot
+++ b/po/basewiki.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki basewiki 2.62.1\n"
-"POT-Creation-Date: 2008-08-30 05:01+0300\n"
+"POT-Creation-Date: 2008-10-23 03:35+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,454 +16,187 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit"
 
 # type: Plain text
-#: blog.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/blog delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: blog.mdwn:2 helponformatting.mdwn:2 ikiwiki.mdwn:1 ikiwiki/blog.mdwn:1 ikiwiki/directive.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1 ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1 ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/preprocessordirective.mdwn:2 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 markdown.mdwn:2 openid.mdwn:2 pagespec.mdwn:2 preprocessordirective.mdwn:2 subpage.mdwn:2 templates.mdwn:1 wikilink.mdwn:2
+#: directive.mdwn:1 ikiwiki.mdwn:1 ikiwiki/blog.mdwn:1 ikiwiki/directive.mdwn:1 ikiwiki/formatting.mdwn:2 ikiwiki/markdown.mdwn:1 ikiwiki/openid.mdwn:2 ikiwiki/pagespec.mdwn:1 ikiwiki/pagespec/attachment.mdwn:1 ikiwiki/preprocessordirective.mdwn:2 ikiwiki/searching.mdwn:1 ikiwiki/subpage.mdwn:1 ikiwiki/subpage/linkingrules.mdwn:1 ikiwiki/wikilink.mdwn:1 templates.mdwn:1
 #, no-wrap
 msgid "[[!meta robots=\"noindex, follow\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: blog.mdwn:6
+#: directive.mdwn:4 ikiwiki/directive.mdwn:4
 msgid ""
-"This page has moved to [[ikiwiki/blog|ikiwiki/blog]]. Please update your "
-"links, as this redirection page will be removed in a future ikiwiki release."
+"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin "
+"with `!` and may contain parameters. The general form is:"
 msgstr ""
 
 # type: Plain text
-#: helponformatting.mdwn:1
+#: directive.mdwn:6 ikiwiki/directive.mdwn:6
 #, no-wrap
-msgid "[[!meta redir=ikiwiki/formatting delay=10]]\n"
+msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: helponformatting.mdwn:6
+#: directive.mdwn:9 ikiwiki/directive.mdwn:9
 msgid ""
-"This page has moved to [[ikiwiki/formatting|ikiwiki/formatting]]. Please "
-"update your links, as this redirection page will be removed in a future "
-"ikiwiki release."
+"This gets expanded before the rest of the page is processed, and can be used "
+"to transform the page in various ways."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki.mdwn:6
-#, no-wrap
+#: directive.mdwn:12 ikiwiki/directive.mdwn:12
 msgid ""
-"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
-"[[!if test=\"enabled(version)\"\n"
-"     then=\"(Currently running version [[!version ]].)\"\n"
-"]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki.mdwn:8
-msgid "Some documentation on using ikiwiki:"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/formatting]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/blog]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/pagespec]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/directive]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/wikilink]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/markdown]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/subpage]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/openid]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki.mdwn:17
-msgid "[[ikiwiki/searching]]"
+"The quotes around values can be omitted if the value is a simple word.  "
+"Also, some directives may use parameters without values, for example:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:5
+#: directive.mdwn:14 ikiwiki/directive.mdwn:14
 #, no-wrap
-msgid ""
-"[[!if test=\"enabled(inline)\"\n"
-"     then=\"This wiki has the inline plugin **enabled**.\"\n"
-"     else=\"This wiki has the inline plugin **disabled**.\"]]\n"
+msgid "\t\\[[!tag foo]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:11
-#, no-wrap
+#: directive.mdwn:17 ikiwiki/directive.mdwn:17
 msgid ""
-"[[!if test=\"enabled(inline)\"\n"
-"     then=\"You can\"\n"
-"     else=\"If this wiki had the inline plugin enabled, you could\"]]\n"
-"turn any page on this wiki into a weblog by using the `inline`\n"
-"[[directive]]. For example:\n"
+"A directive does not need to all be on one line, it can be wrapped to "
+"multiple lines if you like:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:13
+#: directive.mdwn:20 ikiwiki/directive.mdwn:20
 #, no-wrap
 msgid ""
-"\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" "
-"rootpage=\"blog\"]]\n"
+"\t\\[[!directive foo=\"baldersnatch\"\n"
+"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:19
+#: directive.mdwn:24 ikiwiki/directive.mdwn:24
 msgid ""
-"Any pages that match the specified [[PageSpec]] (in the example, any "
-"[[SubPage]] of \"blog\") will be part of the blog, and the newest 10 of them "
-"will appear in the page. Note that if files that are not pages match the "
-"[[PageSpec]], they will be included in the feed using RSS enclosures, which "
-"is useful for podcasting."
+"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:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:23
-msgid ""
-"The optional `rootpage` parameter tells the wiki that new posts to this blog "
-"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form "
-"at the top of the blog that can be used to add new items."
+#: directive.mdwn:25 ikiwiki/directive.mdwn:25
+#, no-wrap
+msgid "\t\\[[!directive text=\"\"\"\n"
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/blog.mdwn:26
-msgid ""
-"If you want your blog to have an archive page listing every post ever made "
-"to it, you can accomplish that like this:"
+# type: Bullet: '	1. '
+#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+msgid "\"foo\""
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/blog.mdwn:28
-#, no-wrap
-msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+# type: Bullet: '	2. '
+#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+msgid "\"bar\""
 msgstr ""
 
-# type: Plain text
-#: ikiwiki/blog.mdwn:31
-msgid ""
-"You can even create an automatically generated list of all the pages on the "
-"wiki, with the most recently added at the top, like this:"
+# type: Bullet: '	3. '
+#: directive.mdwn:29 ikiwiki/directive.mdwn:29
+msgid "\"baz\""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:33
-#, no-wrap
-msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/blog.mdwn:38
+#: directive.mdwn:40 ikiwiki/directive.mdwn:40
 msgid ""
-"If you want to be able to add pages to a given blog feed by tagging them, "
-"you can do that too. To tag a page, just make it link to a page or pages "
-"that represent its tags. Then use the special `link()` [[PageSpec]] to match "
-"all pages that have a given tag:"
+"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."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:40
+#: directive.mdwn:41 ikiwiki/directive.mdwn:41 ikiwiki/formatting.mdwn:103
 #, no-wrap
-msgid "\t\\[[!inline pages=\"link(life)\"]]\n"
+msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:42
-msgid "Or include some tags and exclude others:"
+#: directive.mdwn:43 ikiwiki/directive.mdwn:43
+msgid "Here is a list of currently available directives in this wiki:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:44
+#: directive.mdwn:44 ikiwiki/directive.mdwn:44
 #, no-wrap
-msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+msgid "[[!listdirectives ]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:45
+#: ikiwiki.mdwn:6
 #, no-wrap
-msgid "## usage\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/blog.mdwn:49
 msgid ""
-"There are many parameters you can use with the `inline` directive. These are "
-"the commonly used ones:"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid "`pages` - A [[PageSpec]] of the pages to inline."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`show` - Specify the maximum number of matching pages to inline.  Default is "
-"10, unless archiving, when the default is to show all.  Set to 0 to show all "
-"matching pages."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`archive` - If set to \"yes\", only list page titles and some metadata, not "
-"full contents."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`description` - Sets the description of the rss feed if one is generated.  "
-"Defaults to the name of the wiki."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`skip` - Specify a number of pages to skip displaying. Can be useful to "
-"produce a feed that only shows archived pages."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`postform` - Set to \"yes\" to enable a form to post new pages to a "
-"[[blog]]."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid "`postformtext` - Set to specify text that is displayed in a postform."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:66
-msgid ""
-"`rootpage` - Enable the postform, and allows controling where newly posted "
-"pages should go, by specifiying the page that they should be a [[SubPage]] "
-"of."
+"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n"
+"[[!if test=\"enabled(version)\"\n"
+"     then=\"(Currently running version [[!version ]].)\"\n"
+"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/blog.mdwn:68
-msgid "Here are some less often needed parameters:"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
-"for editing and discussion (if they would be shown at the top of the page "
-"itself)."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`rss` - controls generation of an rss feed. If the wiki is configured to "
-"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
-"configured to `allowrss`, set to \"yes\" to enable."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`atom` - controls generation of an atom feed. If the wiki is configured to "
-"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
-"configured to `allowatom`, set to \"yes\" to enable."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
-"disable generating any feeds."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`template` - Specifies the template to fill out to display each inlined "
-"page. By default the `inlinepage` template is used, while the `archivepage` "
-"template is used for archives. Set this parameter to use some other, custom "
-"template, such as the `titlepage` template that only shows post titles. Note "
-"that you should still set `archive=yes` if your custom template does not "
-"include the page content."
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`raw` - Rather than the default behavior of creating a [[blog]], if raw is "
-"set to \"yes\", the page will be included raw, without additional markup "
-"around it, as if it were a literal part of the source of the inlining page."
+#: ikiwiki.mdwn:8
+msgid "Some documentation on using ikiwiki:"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
-"sort newest created pages first. Setting it to \"title\" will sort pages by "
-"title, and \"mtime\" sorts most recently modified pages first."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/formatting]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/wikilink]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feedshow` - Specify the maximum number of matching pages to include in the "
-"rss/atom feeds. The default is the same as the `show` value above."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/subpage]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feedonly` - Only generate the feed, do not display the pages inline on the "
-"page."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/pagespec]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`quick` - Build archives in quick mode, without reading page contents for "
-"metadata. By default, this also turns off generation of any feeds."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/directive]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`timeformat` - Use this to specify how to display the time or date for pages "
-"in the blog. The format string is passed to the strftime(3) function."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/markdown]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
-"feeds. The default is the same as the `pages` value above, and only pages "
-"matches by that value are included, but some of those can be excluded by "
-"specifying a tighter [[PageSpec]] here."
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/openid]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/blog.mdwn:108
-msgid ""
-"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
-"the Atom feed will have this as its `<id>`. The default is to use the URL of "
-"the page containing the `inline` directive."
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:4
-msgid ""
-"Directives are similar to a [[WikiLink]] in form, except they begin with `!` "
-"and may contain parameters. The general form is:"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:6
-#, no-wrap
-msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:9
-msgid ""
-"This gets expanded before the rest of the page is processed, and can be used "
-"to transform the page in various ways."
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:12
-msgid ""
-"The quotes around values can be omitted if the value is a simple word.  "
-"Also, some directives may use parameters without values, for example:"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:14
-#, no-wrap
-msgid "\t\\[[!tag foo]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:17
-msgid ""
-"A directive does not need to all be on one line, it can be wrapped to "
-"multiple lines if you like:"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:20
-#, no-wrap
-msgid ""
-"\t\\[[!directive foo=\"baldersnatch\"\n"
-"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/directive.mdwn:24
-msgid ""
-"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:"
+#: ikiwiki.mdwn:16
+msgid "[[ikiwiki/searching]]"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/directive.mdwn:29
-#, no-wrap
+#: ikiwiki/blog.mdwn:6
 msgid ""
-"\t\\[[!directive text=\"\"\"\n"
-"\t1. \"foo\"\n"
-"\t2. \"bar\"\n"
-"\t3. \"baz\"\n"
+"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."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/directive.mdwn:39
+#: ikiwiki/blog.mdwn:8
 msgid ""
-"ikiwiki also has an older syntax for directives, which requires a space in "
-"directives to distinguish them from [[wikilinks|wikilink]].  This syntax has "
-"several disadvantages: it requires a space after directives with no "
-"parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in "
-"[[wikilinks|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."
+"Please update your links, as this redirection page will be removed in a "
+"future ikiwiki release."
 msgstr ""
 
 # type: Plain text
@@ -683,7 +416,7 @@ msgstr ""
 msgid ""
 "* Insert various [[directives|directive]] onto a page to perform useful\n"
 "  actions.\n"
-"[[!if test=\"enabled(toc) or enabled(meta) or (enabled(inline) and blog)\" "
+"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" "
 "then=\"\"\"\n"
 msgstr ""
 
@@ -730,12 +463,12 @@ msgstr ""
 # type: Plain text
 #: ikiwiki/formatting.mdwn:97
 #, no-wrap
-msgid "[[!if test=\"enabled(inline) and blog\" then=\"\"\"\n"
+msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n"
 msgstr ""
 
 # type: Bullet: '  * '
 #: ikiwiki/formatting.mdwn:99
-msgid "Create a [[blog]] by inlining a set of pages:"
+msgid "Create a blog by inlining a set of pages:"
 msgstr ""
 
 # type: Plain text
@@ -745,12 +478,6 @@ msgid "\t\\[[!inline pages=\"blog/*\"]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/formatting.mdwn:103
-#, no-wrap
-msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n"
-msgstr ""
-
-# type: Plain text
 #: ikiwiki/formatting.mdwn:105
 #, no-wrap
 msgid "  Full list of [[directives|directive]] enabled for this wiki:\n"
@@ -934,88 +661,110 @@ msgid "and !SandBox and !*/Discussion"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:27
+#: ikiwiki/pagespec.mdwn:26
 msgid ""
-"Some more elaborate limits can be added to what matches using any of these "
+"Some more elaborate limits can be added to what matches using these "
 "functions:"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`link(page)`\" - match only pages that link to a given page (or glob)"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`backlink(page)`\" - match only pages that a given page links to"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`creation_month(month)`\" - match only pages created on the given month"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`creation_day(mday)`\" - or day of the month"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid "\"`creation_year(year)`\" - or year"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid ""
 "\"`created_after(page)`\" - match only pages created after the given page "
 "was created"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid ""
 "\"`created_before(page)`\" - match only pages created before the given page "
 "was created"
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid ""
 "\"`glob(someglob)`\" - match pages that match the given glob. Just writing "
 "the glob by itself is actually a shorthand for this function."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid ""
 "\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages "
 "that globs do not usually match."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec.mdwn:44
+#: ikiwiki/pagespec.mdwn:50
 msgid ""
 "\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", "
 "\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given "
 "metadata, matching the specified glob."
 msgstr ""
 
+# type: Bullet: '* '
+#: ikiwiki/pagespec.mdwn:50
+msgid ""
+"\"`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."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/pagespec.mdwn:50
+msgid ""
+"\"`admin()`\" - tests whether a modification is being made by one of the "
+"wiki admins."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/pagespec.mdwn:50
+msgid ""
+"\"`ip(address)`\" - tests whether a modification is being made from the "
+"specified IP address."
+msgstr ""
+
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:47
+#: ikiwiki/pagespec.mdwn:53
 msgid ""
 "For example, to match all pages in a blog that link to the page about music "
 "and were written in 2005:"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:49
+#: ikiwiki/pagespec.mdwn:55
 #, no-wrap
 msgid "\tblog/* and link(music) and creation_year(2005)\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:55
+#: ikiwiki/pagespec.mdwn:61
 msgid ""
 "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 "
@@ -1025,7 +774,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:59
+#: ikiwiki/pagespec.mdwn:65
 msgid ""
 "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 "
@@ -1033,13 +782,13 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:61
+#: ikiwiki/pagespec.mdwn:67
 #, no-wrap
 msgid "\tblog/* and (link(tag/foo) or link(tag/bar))\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:67
+#: ikiwiki/pagespec.mdwn:73
 msgid ""
 "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 "
@@ -1049,46 +798,46 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:68
+#: ikiwiki/pagespec.mdwn:74
 #, no-wrap
 msgid "## Old syntax\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:72
+#: ikiwiki/pagespec.mdwn:78
 msgid ""
 "The old PageSpec syntax was called a \"GlobList\", and worked differently in "
 "two ways:"
 msgstr ""
 
 # type: Bullet: '1. '
-#: ikiwiki/pagespec.mdwn:77
+#: ikiwiki/pagespec.mdwn:83
 msgid ""
 "\"and\" and \"or\" were not used; any page matching any item from the list "
 "matched."
 msgstr ""
 
 # type: Bullet: '2. '
-#: ikiwiki/pagespec.mdwn:77
+#: ikiwiki/pagespec.mdwn:83
 msgid ""
 "If an item was prefixed with \"`!`\", then no page matching that item "
 "matched, even if it matched an earlier list item."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:80
+#: ikiwiki/pagespec.mdwn:86
 msgid ""
 "For example, here is the old way to match all pages except for the SandBox "
 "and Discussion pages:"
 msgstr ""
 
 # type: Bullet: '	* '
-#: ikiwiki/pagespec.mdwn:82
+#: ikiwiki/pagespec.mdwn:88
 msgid "!SandBox !*/Discussion"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec.mdwn:85
+#: ikiwiki/pagespec.mdwn:91
 msgid ""
 "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 "
@@ -1136,47 +885,30 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:20
-msgid "maxsize(size)"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:24
-#, no-wrap
+#: ikiwiki/pagespec/attachment.mdwn:22
 msgid ""
-"  Tests whether the attachment is no larger than the specified size.\n"
-"  The size defaults to being in bytes, but \"kb\", \"mb\", \"gb\" etc can "
-"be\n"
-"  used to specify the units.\n"
+"\"`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."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:26
-msgid "minsize(size)"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:28
-#, no-wrap
-msgid "  Tests whether the attachment is no smaller than the specified size.\n"
+#: ikiwiki/pagespec/attachment.mdwn:25
+msgid ""
+"\"`minsize(size)`\" - Tests whether the attachment is no smaller than the "
+"specified size."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:30
-msgid "ispage()"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:34
-#, no-wrap
+#: ikiwiki/pagespec/attachment.mdwn:29
 msgid ""
-"  Tests whether the attachment will be treated by ikiwiki as a wiki page.\n"
-"  (Ie, if it has an extension of \".mdwn\", or of any other enabled page\n"
-"  format).\n"
+"\"`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)."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:38
+#: ikiwiki/pagespec/attachment.mdwn:33
 #, no-wrap
 msgid ""
 "  So, if you don't want to allow wiki pages to be uploaded as attachments,\n"
@@ -1185,64 +917,25 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:40
-msgid "user(username)"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:43
-#, no-wrap
-msgid ""
-"  Tests whether the attachment is being uploaded by a user with the\n"
-"  specified username. If openid is enabled, an openid can also be put "
-"here.\n"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:45
-msgid "ip(address)"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:48
-#, no-wrap
+#: ikiwiki/pagespec/attachment.mdwn:36
 msgid ""
-"  Tests whether the attacment is being uploaded from the specified IP\n"
-"  address.\n"
+"\"`mimetype(foo/bar)`\" - This checks the MIME type of the attachment. You "
+"can include a glob in the type, for example `mimetype(image/*)`."
 msgstr ""
 
 # type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:50
-msgid "mimetype(foo/bar)"
+#: ikiwiki/pagespec/attachment.mdwn:37
+msgid "\"`virusfree()`\" - Checks the attachment with an antiviral program."
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:53
-#, no-wrap
-msgid ""
-"  This checks the MIME type of the attachment. You can include a glob\n"
-"  in the type, for example `mimetype(image/*)`.\n"
-msgstr ""
-
-# type: Bullet: '* '
-#: ikiwiki/pagespec/attachment.mdwn:55
-msgid "virusfree()"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/pagespec/attachment.mdwn:56
-#, no-wrap
-msgid "  Checks the attachment with an antiviral program.\n"
-msgstr ""
-
-# type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:1 preprocessordirective.mdwn:1
+#: ikiwiki/preprocessordirective.mdwn:1
 #, no-wrap
 msgid "[[!meta redir=ikiwiki/directive delay=10]]\n"
 msgstr ""
 
 # type: Plain text
-#: ikiwiki/preprocessordirective.mdwn:7 preprocessordirective.mdwn:7
+#: ikiwiki/preprocessordirective.mdwn:7
 msgid ""
 "This page has moved to [[ikiwiki/directive|ikiwiki/directive]]. Please "
 "update your links, as this redirection page will be removed in a future "
@@ -1477,47 +1170,6 @@ msgid "This wiki is powered by [ikiwiki](http://ikiwiki.info/)."
 msgstr ""
 
 # type: Plain text
-#: markdown.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/markdown delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: markdown.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/markdown|ikiwiki/markdown]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-
-# type: Plain text
-#: openid.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/openid delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: openid.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/openid|ikiwiki/openid]]. Please update your "
-"links, as this redirection page will be removed in a future ikiwiki release."
-msgstr ""
-
-# type: Plain text
-#: pagespec.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/pagespec delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: pagespec.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/pagespec|ikiwiki/pagespec]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-
-# type: Plain text
 #: recentchanges.mdwn:2
 #, no-wrap
 msgid "[[!meta title=\"RecentChanges\"]]\n"
@@ -1646,285 +1298,141 @@ msgid "This page controls what shortcut links the wiki supports."
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid ""
 "[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" "
 "desc=\"debian-%s@lists.debian.org\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]"
 msgstr ""
 
 # type: Bullet: '* '
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 msgid ""
 "[[!shortcut name=debrt "
 "url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]"
 msgstr ""
 
 # type: Plain text
-#: shortcuts.mdwn:30
+#: shortcuts.mdwn:62
 #, no-wrap
 msgid ""
 "* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n"
 "  * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or "
 "`\\[[!debss package/version]]`.  See http://snapshot.debian.net for "
 "details.\n"
-msgstr ""
-
-# type: Plain text
-#: shortcuts.mdwn:30
-#, no-wrap
-msgid "  [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=fdobug "
+"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n"
+"* [[!shortcut name=fdobug "
 "url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" "
-"desc=\"freedesktop.org bug #%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=fdolist "
+"desc=\"freedesktop.org bug #%s\"]]\n"
+"* [[!shortcut name=fdolist "
 "url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" "
-"desc=\"%s@lists.freedesktop.org\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gnomebug "
+"desc=\"%s@lists.freedesktop.org\"]]\n"
+"* [[!shortcut name=gnomebug "
 "url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug "
-"#%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=linuxbug "
+"#%s\"]]\n"
+"* [[!shortcut name=linuxbug "
 "url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug "
-"#%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=mozbug "
+"#%s\"]]\n"
+"* [[!shortcut name=mozbug "
 "url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug "
-"#%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" "
-"desc=\"%s@gnu.org\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" "
-"desc=\"gmane.%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=cpan "
-"url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=ctan "
-"url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC "
-"%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=meatballwiki "
-"url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=emacswiki "
-"url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=dict "
-"url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=gpg "
-"url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=whois "
-"url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid ""
-"[[!shortcut name=cve "
-"url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]"
-msgstr ""
-
-# type: Bullet: '* '
-#: shortcuts.mdwn:62
-msgid "[[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]"
+"#%s\"]]\n"
+"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" "
+"desc=\"%s@gnu.org\"]]\n"
+"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n"
+"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n"
+"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" "
+"desc=\"gmane.%s\"]]\n"
+"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n"
+"* [[!shortcut name=cpan "
+"url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n"
+"* [[!shortcut name=ctan "
+"url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n"
+"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n"
+"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n"
+"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n"
+"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC "
+"%s\"]]\n"
+"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n"
+"* [[!shortcut name=meatballwiki "
+"url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n"
+"* [[!shortcut name=emacswiki "
+"url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n"
+"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n"
+"* [[!shortcut name=dict "
+"url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n"
+"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n"
+"* [[!shortcut name=gpg "
+"url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n"
+"* [[!shortcut name=perldoc "
+"url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n"
+"* [[!shortcut name=whois "
+"url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n"
+"* [[!shortcut name=cve "
+"url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n"
+"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n"
+"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n"
+"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n"
+"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n"
+"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n"
 msgstr ""
 
 # type: Plain text
@@ -1955,20 +1463,6 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: subpage.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/subpage delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: subpage.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/subpage|ikiwiki/subpage]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
-
-# type: Plain text
 #: templates.mdwn:6
 #, no-wrap
 msgid ""
@@ -1992,18 +1486,12 @@ msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:12
-#, no-wrap
-msgid "## Available templates\n"
-msgstr ""
-
-# type: Plain text
-#: templates.mdwn:16
+#: templates.mdwn:14
 msgid "These templates are available for inclusion onto other pages in this wiki:"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:19
+#: templates.mdwn:17
 #, no-wrap
 msgid ""
 "[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n"
@@ -2011,18 +1499,18 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:21
+#: templates.mdwn:19
 #, no-wrap
 msgid "## Using a template\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:24
+#: templates.mdwn:22
 msgid "Using a template works like this:"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:26
+#: templates.mdwn:24
 #, no-wrap
 msgid ""
 "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
@@ -2030,14 +1518,14 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:29
+#: templates.mdwn:27
 msgid ""
 "This fills out the [[note]] template, filling in the `text` field with the "
 "specified value, and inserts the result into the page."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:34
+#: templates.mdwn:32
 msgid ""
 "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 "
@@ -2046,24 +1534,36 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:39
+#: templates.mdwn:33
 #, no-wrap
 msgid ""
 "        \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 "
 "notes=\"\"\"\n"
-"        * \\[[Charley]]'s sister.\n"
-"        * \"I want to be an astronaut when I grow up.\"\n"
-"        * Really 8 and a half.\n"
+msgstr ""
+
+# type: Bullet: '        * '
+#: templates.mdwn:37
+msgid "\\[[Charley]]'s sister."
+msgstr ""
+
+# type: Bullet: '        * '
+#: templates.mdwn:37
+msgid "\"I want to be an astronaut when I grow up.\""
+msgstr ""
+
+# type: Bullet: '        * '
+#: templates.mdwn:37
+msgid "Really 8 and a half."
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:41
+#: templates.mdwn:39
 #, no-wrap
 msgid "## Creating a template\n"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:47
+#: templates.mdwn:45
 msgid ""
 "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 "
@@ -2072,7 +1572,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:52
+#: templates.mdwn:50
 msgid ""
 "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 "
@@ -2081,47 +1581,47 @@ msgid ""
 msgstr ""
 
 # type: Bullet: '* '
-#: templates.mdwn:64
+#: templates.mdwn:62
 msgid ""
 "Each parameter you pass to the template directive will generate a template "
 "variable. There are also some pre-defined variables like PAGE and BASENAME."
 msgstr ""
 
 # type: Bullet: '* '
-#: templates.mdwn:64
+#: templates.mdwn:62
 msgid ""
 "To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in "
 "the value will first be converted to html."
 msgstr ""
 
 # type: Bullet: '* '
-#: templates.mdwn:64
+#: templates.mdwn:62
 msgid ""
 "To insert the raw value of a variable, with wiki markup not yet converted to "
 "html, use `<TMPL_VAR raw_variable>`."
 msgstr ""
 
 # type: Bullet: '* '
-#: templates.mdwn:64
+#: templates.mdwn:62
 msgid ""
 "To make a block of text conditional on a variable being set use `<TMPL_IF "
 "NAME=\"variable\">text</TMPL_IF>`."
 msgstr ""
 
 # type: Bullet: '* '
-#: templates.mdwn:64
+#: templates.mdwn:62
 msgid ""
 "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>`"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:66
+#: templates.mdwn:64
 msgid "Here's a sample template:"
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:80
+#: templates.mdwn:78
 #, no-wrap
 msgid ""
 "        <span class=\"infobox\">\n"
@@ -2140,7 +1640,7 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:85
+#: templates.mdwn:83
 msgid ""
 "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 "
@@ -2149,11 +1649,12 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: templates.mdwn:88
+#: templates.mdwn:87
 msgid ""
-"Note the use of \"raw_name\" inside the [[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 [[WikiLink]]."
+"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]]."
 msgstr ""
 
 # type: Plain text
@@ -2196,17 +1697,3 @@ msgid ""
 "popup></span><span class=\"paren\">]</span>\n"
 "</span>\n"
 msgstr ""
-
-# type: Plain text
-#: wikilink.mdwn:1
-#, no-wrap
-msgid "[[!meta redir=ikiwiki/wikilink delay=10]]\n"
-msgstr ""
-
-# type: Plain text
-#: wikilink.mdwn:6
-msgid ""
-"This page has moved to [[ikiwiki/wikilink|ikiwiki/wikilink]]. Please update "
-"your links, as this redirection page will be removed in a future ikiwiki "
-"release."
-msgstr ""
diff --git a/po/directives.pot b/po/directives.pot
new file mode 100644
index 0000000..feb6d75
--- /dev/null
+++ b/po/directives.pot
@@ -0,0 +1,2716 @@
+# LOCALE translation of directives pages for ikiwiki.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ikiwiki package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ikiwiki directives 2.62.1\n"
+"POT-Creation-Date: 2008-10-23 03:35+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit"
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:4
+msgid ""
+"The `aggregate` directive is supplied by the [[!iki plugins/aggregate "
+"desc=aggregate]] plugin.  This plugin requires extra setup, specifically, a "
+"cron job. See the plugin's documentation for details."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:7
+msgid ""
+"This directive allows content from other feeds to be aggregated into the "
+"wiki.  Aggregate a feed as follows:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:11
+#, no-wrap
+msgid ""
+"\t\\[[!aggregate name=\"example blog\" dir=\"example\"\n"
+"\tfeedurl=\"http://example.com/index.rss\"\n"
+"\turl=\"http://example.com/\" updateinterval=\"15\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:16
+msgid ""
+"That example aggregates posts from the specified RSS feed, updating no more "
+"frequently than once every 15 minutes (though possibly less frequently, if "
+"the cron job runs less frequently than that), and puts a page per post under "
+"the example/ directory in the wiki."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:19
+msgid ""
+"You can then use ikiwiki's [[inline]] directive to create a blog of one or "
+"more aggregated feeds. For example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:21
+#, no-wrap
+msgid "\t\\[[!inline pages=\"internal(example/*)\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:22 ikiwiki/directive/calendar.mdwn:26 ikiwiki/directive/img.mdwn:8 ikiwiki/directive/inline.mdwn:41 ikiwiki/directive/table.mdwn:32
+#, no-wrap
+msgid "## usage\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:26
+msgid ""
+"Here are descriptions of all the supported parameters to the `aggregate` "
+"directive:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid "`name` - A name for the feed. Each feed must have a unique name.  Required."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`url` - The url to the web page for the feed that's being aggregated.  "
+"Required."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`dir` - The directory in the wiki where pages should be saved. Optional, if "
+"not specified, the directory is based on the name of the feed."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`feedurl` - The url to the feed. Optional, if it's not specified ikiwiki "
+"will look for feeds on the `url`. RSS and atom feeds are supported."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`updateinterval` - How often to check for new posts, in minutes. Default is "
+"15 minutes."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`expireage` - Expire old items from this feed if they are older than a "
+"specified number of days. Default is to never expire on age."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`expirecount` - Expire old items from this feed if there are more than the "
+"specified number total. Oldest items will be expired first. Default is to "
+"never expire on count."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`tag` - A tag to tag each post from the feed with. A good tag to use is the "
+"name of the feed. Can be repeated multiple times. The [[tag]] plugin must be "
+"enabled for this to work."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/aggregate.mdwn:47
+msgid ""
+"`template` - Template to use for creating the aggregated pages. Defaults to "
+"aggregatepost."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:51
+msgid ""
+"Note that even if you are using subversion or another revision control "
+"system, pages created by aggregation will *not* be checked into revision "
+"control."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/aggregate.mdwn:52 ikiwiki/directive/brokenlinks.mdwn:14 ikiwiki/directive/calendar.mdwn:46 ikiwiki/directive/color.mdwn:25 ikiwiki/directive/copy.mdwn:3 ikiwiki/directive/cut.mdwn:3 ikiwiki/directive/cutpaste.mdwn:50 ikiwiki/directive/edittemplate.mdwn:36 ikiwiki/directive/fortune.mdwn:8 ikiwiki/directive/graph.mdwn:23 ikiwiki/directive/haiku.mdwn:15 ikiwiki/directive/if.mdwn:48 ikiwiki/directive/img.mdwn:38 ikiwiki/directive/inline.mdwn:106 ikiwiki/directive/linkmap.mdwn:24 ikiwiki/directive/listdirectives.mdwn:20 ikiwiki/directive/map.mdwn:19 ikiwiki/directive/meta.mdwn:147 ikiwiki/directive/more.mdwn:16 ikiwiki/directive/orphans.mdwn:15 ikiwiki/directive/pagecount.mdwn:10 ikiwiki/directive/pagestats.mdwn:15 ikiwiki/directive/pagetemplate.mdwn:15 ikiwiki/directive/paste.mdwn:3 ikiwiki/directive/ping.mdwn:18 ikiwiki/directive/poll.mdwn:25 ikiwiki/directive/polygen.mdwn:11 ikiwiki/directive/postsparkline.mdwn:45 ikiwiki/directive/progress.mdwn:18 ikiwiki/directive/shortcut.mdwn:9 ikiwiki/directive/sparkline.mdwn:52 ikiwiki/directive/table.mdwn:45 ikiwiki/directive/tag.mdwn:30 ikiwiki/directive/taglink.mdwn:3 ikiwiki/directive/template.mdwn:18 ikiwiki/directive/testpagespec.mdwn:24 ikiwiki/directive/teximg.mdwn:23 ikiwiki/directive/toc.mdwn:21 ikiwiki/directive/toggle.mdwn:34 ikiwiki/directive/toggleable.mdwn:3 ikiwiki/directive/version.mdwn:12
+#, no-wrap
+msgid "[[!meta robots=\"noindex, follow\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/brokenlinks.mdwn:2
+msgid ""
+"The `brokenlinks` directive is supplied by the [[!iki plugins/brokenlinks "
+"desc=brokenlinks]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/brokenlinks.mdwn:6
+msgid ""
+"This directive generates a list of broken links on pages in the wiki. This "
+"is a useful way to find pages that still need to be written, or links that "
+"are written wrong."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/brokenlinks.mdwn:9
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to search for broken links, default is search them all."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/brokenlinks.mdwn:11 ikiwiki/directive/inline.mdwn:7 ikiwiki/directive/template.mdwn:9
+msgid "Example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/brokenlinks.mdwn:13
+#, no-wrap
+msgid "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:3
+msgid ""
+"The `calendar` directive is supplied by the [[!iki plugins/calendar "
+"desc=calendar]] plugin.  This plugin requires extra setup.  See the plugin "
+"documentation for details."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:6
+msgid ""
+"This directive displays a calendar, similar to the typical calendars shown "
+"on some blogs."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:7 ikiwiki/directive/postsparkline.mdwn:6 ikiwiki/directive/sparkline.mdwn:7
+#, no-wrap
+msgid "# examples\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:10
+#, no-wrap
+msgid "\t\\[[!calendar ]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:12
+#, no-wrap
+msgid "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:14
+#, no-wrap
+msgid ""
+"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and "
+"!*/Discussion\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:18
+msgid ""
+"The calendar is essentially a fancy front end to archives of previous pages, "
+"usually used for blogs. It can produce a calendar for a given month, or a "
+"list of months for a given year."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/calendar.mdwn:25
+msgid ""
+"The month format calendar simply links to any page posted on each day of the "
+"month. The year format calendar links to archive pages, with names like "
+"`archives/2007` (for all of 2007)  and `archives/2007/01` (for January, "
+"2007). For this to work, you'll need to create these archive pages. They "
+"typically use [[inline]] to display or list pages created in the given time "
+"frame."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`type` - Used to specify the type of calendar wanted. Can be one of "
+"\"month\" or \"year\". The default is a month view calendar."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the "
+"month calendar. Defaults to \"*\"."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`archivebase` - Configures the base of the archives hierarchy. The default "
+"is \"archives\". Note that this default can also be overridden for the whole "
+"wiki by setting `archivebase` in ikiwiki's setup file."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`year` - The year for which the calendar is requested. Defaults to the "
+"current year."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`month` - The numeric month for which the calendar is requested, in the "
+"range 1..12. Used only for the month view calendar, and defaults to the "
+"current month."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`week_start_day` - A number, in the range 0..6, which represents the day of "
+"the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and "
+"so on. Defaults to 0, which is Sunday."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/calendar.mdwn:45
+msgid ""
+"`months_per_row` - In the annual calendar, number of months to place in each "
+"row. Defaults to 3."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:2
+msgid ""
+"The `color` directive is supplied by the [[!iki plugins/color desc=color]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:5
+msgid ""
+"This directive can be used to color a piece of text on a page.  It can be "
+"used to set the foreground and/or background color of the text."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:8
+msgid ""
+"You can use a color name (e.g. `white`) or HTML code (e.g. `#ffffff`)  to "
+"define colors."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:9 ikiwiki/directive/table.mdwn:6 ikiwiki/directive/teximg.mdwn:5
+#, no-wrap
+msgid "## examples\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:13
+msgid ""
+"Here the foreground color is defined as a word, while the background color "
+"is defined as a HTML color code:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:15
+#, no-wrap
+msgid ""
+"\t\\[[!color foreground=white background=#ff0000 text=\"White text on red "
+"background\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:18
+msgid ""
+"The background color is missing, so the text is displayed on default "
+"background:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:20
+#, no-wrap
+msgid ""
+"\t\\[[!color foreground=white text=\"White text on default color "
+"background\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:22
+msgid "The foreground is missing, so the text has the default foreground color:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/color.mdwn:24
+#, no-wrap
+msgid ""
+"\t\\[[!color background=#ff0000 text=\"Default color text on red "
+"background\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/copy.mdwn:1 ikiwiki/directive/cut.mdwn:1 ikiwiki/directive/paste.mdwn:1
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:3
+msgid ""
+"The `copy`, `cut` and `paste` directives are supplied by the [[!iki "
+"plugins/cutpaste desc=cutpaste]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:5
+msgid "With these directives you can store and recall pieces of text in a page:"
+msgstr ""
+
+# type: Bullet: ' * '
+#: ikiwiki/directive/cutpaste.mdwn:11
+msgid ""
+"`\\[[!cut id=name text=\"text\"]]` memorizes the text allowing to recall it "
+"using the given ID.  The text being cut is not included in the output."
+msgstr ""
+
+# type: Bullet: ' * '
+#: ikiwiki/directive/cutpaste.mdwn:11
+msgid ""
+"`\\[[!copy id=name text=\"text\"]]` memorizes the text allowing to recall it "
+"using the given ID.  The text being cut *is* included in the output."
+msgstr ""
+
+# type: Bullet: ' * '
+#: ikiwiki/directive/cutpaste.mdwn:11
+msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:14
+msgid ""
+"The text being cut, copied and pasted can freely include wiki markup, "
+"including more calls to cut, copy and paste."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:19
+msgid ""
+"You do not need to memorize the text before using it: a cut directive can "
+"follow the paste directive that uses its text.  In fact, this is quite "
+"useful to postpone big blocks of text like long annotations and have a more "
+"natural flow.  For example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:23
+#, no-wrap
+msgid ""
+"\t\\[[!toggleable id=\"cut\" text=\"\\[[!paste id=cutlongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"copy\" text=\"\\[[!paste id=copylongdesc]]\"]]\n"
+"\t\\[[!toggleable id=\"paste\" text=\"\\[[!paste id=pastelongdesc]]\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:25
+#, no-wrap
+msgid "\t\\[...some time later...]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:26
+#, no-wrap
+msgid "\t\\[[!cut id=cutlongdesc text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:28 ikiwiki/directive/cutpaste.mdwn:31 ikiwiki/directive/cutpaste.mdwn:34
+#, no-wrap
+msgid "\t   blah blah blah\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:29
+#, no-wrap
+msgid "\t\\[[!cut id=copylongdesc text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:32
+#, no-wrap
+msgid "\t\\[[!cut id=pastelongdesc text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:38
+msgid ""
+"This can potentially be used to create loops, but ikiwiki is clever and "
+"breaks them."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:41
+msgid ""
+"Since you can paste without using double quotes, copy and paste can be used "
+"to nest directives that require multiline parameters inside each other:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:42
+#, no-wrap
+msgid "\t\\[[!toggleable id=foo text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:44
+#, no-wrap
+msgid "\t  \\[[!toggleable id=bar text=\"\\[[!paste id=baz]]\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:46
+#, no-wrap
+msgid "\t\\[[!cut id=baz text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/cutpaste.mdwn:48
+#, no-wrap
+msgid "\tmultiline parameter!\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:2
+msgid ""
+"The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate "
+"desc=edittemplate]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:6
+msgid ""
+"This directive allows registering template pages, that provide default "
+"content for new pages created using the web frontend. To register a "
+"template, insert a [[ikiwiki/directive/template]] directive on some other "
+"page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:8
+#, no-wrap
+msgid "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:13
+msgid ""
+"In the above example, the page named \"bugtemplate\" is registered as a "
+"template to be used when any page named \"bugs/*\" is created. To avoid the "
+"directive displaying a note about the template being registered, add "
+"\"silent=yes\"."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:17
+msgid ""
+"Often the template page contains a simple skeleton for a particular type of "
+"page. For the bug report pages in the above example, it might look something "
+"like:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:22
+#, no-wrap
+msgid ""
+"\tPackage: \n"
+"\tVersion: \n"
+"\tReproducible: y/n\n"
+"\tDetails:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:27
+#, no-wrap
+msgid ""
+"The template page can also contain [[!cpan HTML::Template]] directives,\n"
+"similar to other ikiwiki [[templates]]. Currently only one variable is\n"
+"set: `<TMPL_VAR name>` is replaced with the name of the page being\n"
+"created.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:28
+#, no-wrap
+msgid "----\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/edittemplate.mdwn:35
+msgid ""
+"It's generally not a good idea to put the `edittemplate` directive in the "
+"template page itself, since the directive would then be included as part of "
+"the template on new pages, which would then in turn be registered as "
+"templates. If multiple pages are registered as templates for a new page, an "
+"arbitrary one is chosen, so that could get confusing."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/fortune.mdwn:2
+msgid ""
+"The `fortune` directive is supplied by the [[!iki plugins/fortune "
+"desc=fortune]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/fortune.mdwn:5
+msgid ""
+"This just uses the `fortune` program to insert a fortune cookie into the "
+"page.  Usage:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/fortune.mdwn:7
+#, no-wrap
+msgid "\t\\[[!fortune ]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/graph.mdwn:2
+msgid ""
+"The `graph` directive is supplied by the [[!iki plugins/graphviz "
+"desc=graphviz]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/graph.mdwn:5
+msgid ""
+"This directive allows embedding [graphviz](http://www.graphviz.org/) graphs "
+"in a page.  Example usage:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/graph.mdwn:7
+#, no-wrap
+msgid "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/graph.mdwn:11
+msgid ""
+"Note that graphs will only show up in previews if your browser has "
+"[[!wikipedia data: URI]] support, or if the same graph already exists on "
+"that page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/graph.mdwn:13
+msgid "The `graph` directive supports the following parameters:"
+msgstr ""
+
+# type: Bullet: '- '
+#: ikiwiki/directive/graph.mdwn:22
+msgid "`src` - The graphviz source to render."
+msgstr ""
+
+# type: Bullet: '- '
+#: ikiwiki/directive/graph.mdwn:22
+msgid ""
+"`type` - The type of graph to render: `graph` or `digraph`.  Defaults to "
+"`digraph`."
+msgstr ""
+
+# type: Bullet: '- '
+#: ikiwiki/directive/graph.mdwn:22
+msgid ""
+"`prog` - The graphviz program to render with: `dot`, `neato`, `fdp`, "
+"`twopi`, or `circo`.  Defaults to `dot`."
+msgstr ""
+
+# type: Bullet: '- '
+#: ikiwiki/directive/graph.mdwn:22
+msgid ""
+"`height`, `width` - Limit the size of the graph to a given height and width, "
+"in inches. You must specify both to limit the size; otherwise, graphviz will "
+"choose a size, without any limit."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/haiku.mdwn:2
+msgid ""
+"The `haiku` directive is supplied by the [[!iki plugins/haiku desc=haiku]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/haiku.mdwn:5
+msgid ""
+"This directive allows inserting a randomly generated haiku into a wiki "
+"page.  Just type:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/haiku.mdwn:7
+#, no-wrap
+msgid "\t\\[[!haiku hint=\"argument\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/haiku.mdwn:8
+#, no-wrap
+msgid "[[!haiku hint=\"argument test\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/haiku.mdwn:14
+msgid ""
+"The hint parameter can be omitted, it only provides the generator a hint of "
+"what to write the haiku about. If no hint is given, it might base it on the "
+"page name. Since the vocabulary it knows is very small, many hints won't "
+"affect the result at all."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:2
+msgid ""
+"The `if` directive is supplied by the [[!iki plugins/conditional "
+"desc=conditional]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:5
+msgid ""
+"With this directive, you can make text be conditionally displayed on a "
+"page.  For example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:9
+#, no-wrap
+msgid ""
+"\t\\[[!if test=\"enabled(smiley)\"\n"
+"\t      then=\"The smiley plugin is enabled :-)\"\n"
+"\t      else=\"No smiley plugin here..\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:12
+msgid ""
+"If the specified `test` succeeds, the `then` text will be displayed, "
+"otherwise the `else` text will be displayed. The `else` part is optional."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:16
+msgid ""
+"The `then` and `else` values can include any markup that would be allowed in "
+"the wiki page outside the template. Triple-quoting the values even allows "
+"quotes to be included."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:21
+msgid ""
+"The `test` is a [[ikiwiki/PageSpec]]; if it matches any page in the wiki "
+"then it succeeds. So you can do things like testing for the existence of a "
+"page or pages, testing to see if any pages were created in a given month, "
+"and so on."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:25
+msgid ""
+"If you want the [[ikiwiki/PageSpec]] to only match against the page that "
+"contains the conditional, rather than matching against all pages in the "
+"wiki, set the \"all\" parameter to \"no\"."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:28
+msgid ""
+"In an `if` directive, the regular [[ikiwiki/PageSpec]] syntax is expanded "
+"with the following additional tests:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/if.mdwn:30
+msgid "enabled(plugin)"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:32
+#, no-wrap
+msgid "  Tests whether the specified plugin is enabled.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/if.mdwn:34
+msgid "sourcepage(glob)"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:37
+#, no-wrap
+msgid ""
+"  Tests whether the glob matches the name of the page that contains the\n"
+"  conditional.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/if.mdwn:39
+msgid "destpage(glob)"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:43
+#, no-wrap
+msgid ""
+"  Tests whether the glob matches the name of the page that is being built.\n"
+"  That might be different than the name of the page that contains the\n"
+"  conditional, if it's being inlined into another page.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/if.mdwn:45
+msgid "included()"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/if.mdwn:47
+#, no-wrap
+msgid "  Tests whether the page is being included onto another page.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:2
+msgid "The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:7
+msgid ""
+"This is an image handling directive.  While ikiwiki supports inlining "
+"full-size images by making a [[ikiwiki/WikiLink]] that points to the image, "
+"using this directive you can easily scale down an image for inclusion onto a "
+"page, providing a link to a full-size version."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:11
+#, no-wrap
+msgid "\t\\[[!img image1.jpg size=\"200x200\" alt=\"clouds\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:14
+msgid ""
+"The image file will be searched for using the same rules as used to find the "
+"file pointed to by a [[ikiwiki/WikiLink]]."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:20
+msgid ""
+"The `size` parameter is optional, defaulting to full size. Note that the "
+"original image's aspect ratio is always preserved, even if this means making "
+"the image smaller than the specified size. You can also specify only the "
+"width or the height, and the other value will be calculated based on it: "
+"\"200x\", \"x200\""
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:24
+msgid ""
+"You can also pass `alt`, `title`, `class` and `id` parameters. These are "
+"passed through unchanged to the html img tag. If you include a `caption` "
+"parameter, the caption will be displayed centered beneath the image."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:29
+msgid ""
+"The `link` parameter is used to control whether the scaled down image links "
+"to the full size version. By default it does; set \"link=somepage\" to link "
+"to another page instead, or \"link=no\" to disable the link, or "
+"\"link=http://url\" to link to a given url."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:32
+msgid ""
+"You can also set default values that will be applied to all later images on "
+"the page, unless overridden. Useful when including many images on a page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/img.mdwn:37
+#, no-wrap
+msgid ""
+"\t\\[[!img defaults size=200x200 alt=\"wedding photo\"]]\n"
+"\t\\[[!img photo1.jpg]]\n"
+"\t\\[[!img photo2.jpg]]\n"
+"\t\\[[!img photo3.jpg size=200x600]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:2
+msgid ""
+"The `inline` directive is supplied by the [[!iki plugins/inline "
+"desc=inline]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:5
+msgid ""
+"This is a directive that allows including one wiki page inside another.  The "
+"most common use of inlining is generating blogs and RSS or Atom feeds."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:9
+#, no-wrap
+msgid ""
+"\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" "
+"rootpage=\"blog\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:15
+msgid ""
+"Any pages that match the specified [[PageSpec]] (in the example, any "
+"[[SubPage]] of \"blog\") will be part of the blog, and the newest 10 of them "
+"will appear in the page. Note that if files that are not pages match the "
+"[[PageSpec]], they will be included in the feed using RSS enclosures, which "
+"is useful for podcasting."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:19
+msgid ""
+"The optional `rootpage` parameter tells the wiki that new posts to this blog "
+"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form "
+"at the top of the blog that can be used to add new items."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:22
+msgid ""
+"If you want your blog to have an archive page listing every post ever made "
+"to it, you can accomplish that like this:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:24
+#, no-wrap
+msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:27
+msgid ""
+"You can even create an automatically generated list of all the pages on the "
+"wiki, with the most recently added at the top, like this:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:29
+#, no-wrap
+msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:34
+msgid ""
+"If you want to be able to add pages to a given blog feed by tagging them, "
+"you can do that too. To tag a page, just make it link to a page or pages "
+"that represent its tags. Then use the special `link()` [[PageSpec]] to match "
+"all pages that have a given tag:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:36
+#, no-wrap
+msgid "\t\\[[!inline pages=\"link(life)\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:38
+msgid "Or include some tags and exclude others:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:40
+#, no-wrap
+msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:45
+msgid ""
+"There are many parameters you can use with the `inline` directive. These are "
+"the commonly used ones:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid "`pages` - A [[PageSpec]] of the pages to inline."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid ""
+"`show` - Specify the maximum number of matching pages to inline.  Default is "
+"10, unless archiving, when the default is to show all.  Set to 0 to show all "
+"matching pages."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid ""
+"`archive` - If set to \"yes\", only list page titles and some metadata, not "
+"full contents."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid ""
+"`description` - Sets the description of the rss feed if one is generated.  "
+"Defaults to the name of the wiki."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid ""
+"`skip` - Specify a number of pages to skip displaying. Can be useful to "
+"produce a feed that only shows archived pages."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid "`postform` - Set to \"yes\" to enable a form to post new pages to a blog."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid "`postformtext` - Set to specify text that is displayed in a postform."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:62
+msgid ""
+"`rootpage` - Enable the postform, and allows controling where newly posted "
+"pages should go, by specifiying the page that they should be a [[SubPage]] "
+"of."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:64
+msgid "Here are some less often needed parameters:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`actions` - If set to \"yes\" add links to the bottom of the inlined pages "
+"for editing and discussion (if they would be shown at the top of the page "
+"itself)."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`rss` - controls generation of an rss feed. If the wiki is configured to "
+"generate rss feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowrss`, set to \"yes\" to enable."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`atom` - controls generation of an atom feed. If the wiki is configured to "
+"generate atom feeds by default, set to \"no\" to disable. If the wiki is "
+"configured to `allowatom`, set to \"yes\" to enable."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`feeds` - controls generation of all types of feeds. Set to \"no\" to "
+"disable generating any feeds."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`template` - Specifies the template to fill out to display each inlined "
+"page. By default the `inlinepage` template is used, while the `archivepage` "
+"template is used for archives. Set this parameter to use some other, custom "
+"template, such as the `titlepage` template that only shows post titles. Note "
+"that you should still set `archive=yes` if your custom template does not "
+"include the page content."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`raw` - Rather than the default behavior of creating a blog, if raw is set "
+"to \"yes\", the page will be included raw, without additional markup around "
+"it, as if it were a literal part of the source of the inlining page."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`sort` - Controls how inlined pages are sorted. The default, \"age\" is to "
+"sort newest created pages first. Setting it to \"title\" will sort pages by "
+"title, and \"mtime\" sorts most recently modified pages first."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`feedshow` - Specify the maximum number of matching pages to include in the "
+"rss/atom feeds. The default is the same as the `show` value above."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`feedonly` - Only generate the feed, do not display the pages inline on the "
+"page."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`quick` - Build archives in quick mode, without reading page contents for "
+"metadata. By default, this also turns off generation of any feeds."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`timeformat` - Use this to specify how to display the time or date for pages "
+"in the blog. The format string is passed to the strftime(3) function."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom "
+"feeds. The default is the same as the `pages` value above, and only pages "
+"matches by that value are included, but some of those can be excluded by "
+"specifying a tighter [[PageSpec]] here."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/inline.mdwn:105
+msgid ""
+"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), "
+"the Atom feed will have this as its `<id>`. The default is to use the URL of "
+"the page containing the `inline` directive."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/inline.mdwn:109
+msgid ""
+"A related directive is the [[ikiwiki/directive/edittemplate]] directive, "
+"which allows default text for a new page to be specified."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/linkmap.mdwn:2
+msgid ""
+"The `linkmap` directive is supplied by the [[!iki plugins/linkmap "
+"desc=linkmap]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/linkmap.mdwn:5
+msgid ""
+"This directive uses [graphviz](http://www.graphviz.org/) to generate a graph "
+"showing the links between a set of pages in the wiki. Example usage:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/linkmap.mdwn:7
+#, no-wrap
+msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/linkmap.mdwn:15
+msgid ""
+"Only links between mapped pages will be shown; links pointing to or from "
+"unmapped pages will be omitted. If the pages to include are not specified, "
+"the links between all pages (and other files) in the wiki are mapped. For "
+"best results, only a small set of pages should be mapped, since otherwise "
+"the map can become very large, unweildy, and complicated. Also, the map is "
+"rebuilt whenever one of the mapped pages is changed, which can make the wiki "
+"a bit slow."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/linkmap.mdwn:18
+msgid ""
+"Here are descriptions of all the supported parameters to the `linkmap` "
+"directive:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/linkmap.mdwn:23
+msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/linkmap.mdwn:23
+msgid ""
+"`height`, `width` - Limit the size of the map to a given height and width, "
+"in inches. Both must be specified for the limiting to take effect, otherwise "
+"the map's size is not limited."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/listdirectives.mdwn:2
+msgid ""
+"The `listdirectives` directive is supplied by the [[!iki "
+"plugins/listdirectives desc=listdirectives]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/listdirectives.mdwn:5
+msgid ""
+"This directive generates a list of available "
+"[[directives|ikiwiki/directive]]."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/listdirectives.mdwn:7
+#, no-wrap
+msgid "\t\\[[!listdirectives]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/listdirectives.mdwn:14
+msgid ""
+"There is one optional keyword argument, `generated`.  Normally the "
+"`listdirectives` directive will list all built in directives and directives "
+"directly registered by plugins.  With this keyword, `listdirectives` will "
+"also list directives generated later.  For example, all [[shortcuts]] are "
+"directives generated in turn by the `shortcut` directive.  They will only be "
+"listed if the `generated` argument is supplied."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/listdirectives.mdwn:16
+#, no-wrap
+msgid "    \\[[!listdirectives generated]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/listdirectives.mdwn:19
+msgid ""
+"This extended list is often quite long, and often contains many undocumented "
+"directives."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:2
+msgid "The `map` directive is supplied by the [[!iki plugins/map desc=map]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:4
+msgid ""
+"This directive generates a hierarchical page map for the wiki. Example "
+"usage:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:6
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:9
+msgid ""
+"If the pages to include are not specified, all pages (and other files) in "
+"the wiki are mapped."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:13
+msgid ""
+"By default, the names of pages are shown in the map. The `show` parameter "
+"can be used to show the titles or descriptions of pages instead (as set by "
+"the [[meta]] directive). For example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:15
+#, no-wrap
+msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/map.mdwn:18
+msgid ""
+"Hint: To limit the map to displaying pages less than a certain level deep, "
+"use a [[ikiwiki/PageSpec]] like this: `pages=\"* and !*/*/*\"`"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:2
+msgid ""
+"The `meta` directive is supplied by the [[!iki plugins/meta desc=meta]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:5
+msgid ""
+"This directive allows inserting arbitrary metadata into the source of a "
+"page.  Enter the metadata as follows:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:8
+#, no-wrap
+msgid ""
+"\t\\[[!meta field=\"value\"]]\n"
+"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:11
+msgid ""
+"The first form sets a given field to a given value, while the second form "
+"also specifies some additional sub-parameters."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:14
+msgid ""
+"The field values are treated as HTML entity-escaped text, so you can include "
+"a quote in the text by writing `&quot;` and so on."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:16
+msgid "Supported fields:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:18
+msgid "title"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:21
+#, no-wrap
+msgid ""
+"  Overrides the title of the page, which is generally the same as the\n"
+"  page name.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:25
+#, no-wrap
+msgid ""
+"  Note that if the title is overridden, a \"title_overridden\" variable "
+"will\n"
+"  be set to a true value in the template; this can be used to format "
+"things\n"
+"  differently in this case.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:27
+msgid "license"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:30
+#, no-wrap
+msgid ""
+"  Specifies a license for the page, for example, \"GPL\". Can contain\n"
+"  WikiLinks and arbitrary markup.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:32
+msgid "copyright"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:35
+#, no-wrap
+msgid ""
+"  Specifies the copyright of the page, for example, \"Copyright 2007 by\n"
+"  Joey Hess\". Can contain WikiLinks and arbitrary markup.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:37
+msgid "author"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:39
+#, no-wrap
+msgid "  Specifies the author of a page.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:41
+msgid "authorurl"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:43
+#, no-wrap
+msgid "  Specifies an url for the author of a page.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:45
+msgid "description"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:48
+#, no-wrap
+msgid ""
+"  Specifies a \"description\" of the page. You could use this to provide\n"
+"  a summary, for example, to be picked up by the [[map]] directive.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:50
+msgid "permalink"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:53
+#, no-wrap
+msgid ""
+"  Specifies a permanent link to the page, if different than the page\n"
+"  generated by ikiwiki.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:55
+msgid "date"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:58
+#, no-wrap
+msgid ""
+"  Specifies the creation date of the page. The date can be entered in\n"
+"  nearly any format, since it's parsed by [[!cpan TimeDate]].\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:60
+msgid "stylesheet"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:64
+#, no-wrap
+msgid ""
+"  Adds a stylesheet to a page. The stylesheet is treated as a wiki link to\n"
+"  a `.css` file in the wiki, so it cannot be used to add links to external\n"
+"  stylesheets. Example:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:67
+#, no-wrap
+msgid ""
+"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n"
+"\ttitle=\"somestyle\"]]\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:69
+msgid "openid"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:74
+#, no-wrap
+msgid ""
+"  Adds html &lt;link&gt; tags to perform OpenID delegation to an external\n"
+"  OpenID server (for `openid` and `openid2`). An optional `xrds-location`\n"
+"  parameter lets you specify the location of any [eXtensible Resource\n"
+"  DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:76
+#, no-wrap
+msgid "  This lets you use an ikiwiki page as your OpenID. Example:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:80
+#, no-wrap
+msgid ""
+"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n"
+"\tserver=\"http://www.myopenid.com/server\"\n"
+"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:82
+msgid "link"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:86
+#, no-wrap
+msgid ""
+"  Specifies a link to another page. This can be used as a way to make the\n"
+"  wiki treat one page as linking to another without displaying a "
+"user-visible\n"
+"  [[ikiwiki/WikiLink]]:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:88
+#, no-wrap
+msgid "       \\[[!meta link=otherpage]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:90
+#, no-wrap
+msgid "  It can also be used to insert a html &lt;link&gt; tag. For example:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:92
+#, no-wrap
+msgid ""
+"       \\[[!meta link=\"http://joeyh.myopenid.com/\" "
+"rel=\"openid.delegate\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:96 ikiwiki/directive/meta.mdwn:113
+#, no-wrap
+msgid ""
+"  However, this latter syntax won't be allowed if the \n"
+"  [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since "
+"it can be used to\n"
+"  insert unsafe content.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:98
+msgid "redir"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:100
+#, no-wrap
+msgid "  Causes the page to redirect to another page in the wiki.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:102
+#, no-wrap
+msgid "  \t\\[[!meta redir=otherpage]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:105
+#, no-wrap
+msgid ""
+"  Optionally, a delay (in seconds) can be specified. The default is to\n"
+"  redirect without delay.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:107
+#, no-wrap
+msgid "  It can also be used to redirect to an external url. For example:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:109
+#, no-wrap
+msgid "  \t\\[[!meta redir=\"http://example.com/\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:116
+#, no-wrap
+msgid ""
+"  For both cases, an anchor to jump to inside the destination page may also "
+"be\n"
+"  specified using the common `#ANCHOR` syntax.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:118
+msgid "robots"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:120
+#, no-wrap
+msgid "  Causes the robots meta tag to be written:\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:122
+#, no-wrap
+msgid "        \\[[!meta robots=\"index, nofollow\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:127
+#, no-wrap
+msgid ""
+"  Valid values for the attribute are: \"index\", \"noindex\", \"follow\", "
+"and\n"
+"  \"nofollow\". Multiple comma-separated values are allowed, but obviously "
+"only\n"
+"  some combinations make sense. If there is no robots meta tag, \"index,\n"
+"  follow\" is used as the default.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:129
+#, no-wrap
+msgid "  The value is escaped, but its contents are not otherwise checked.\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/meta.mdwn:131
+msgid "guid"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:137
+#, no-wrap
+msgid ""
+"  Specifies a globally unique ID for a page. This guid should be a URI\n"
+"  (in particular, it can be `urn:uuid:` followed by a UUID, as per\n"
+"  [[!rfc 4122]]), and it will be used to identify the page's entry in RSS\n"
+"  and Atom feeds. If not given, the default is to use the page's URL as "
+"its\n"
+"  guid.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:141
+#, no-wrap
+msgid ""
+"  This is mostly useful when a page has moved, to keep the guids for\n"
+"  pages unchanged and avoid_flooding_aggregators\n"
+"  (see [[!iki tips/howto_avoid_flooding_aggregators]]).\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/meta.mdwn:146
+msgid ""
+"If the field is not one of the above predefined fields, the metadata will be "
+"written to the generated html page as a &lt;meta&gt; header. However, this "
+"won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] "
+"plugin is enabled, since it can be used to insert unsafe content."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/more.mdwn:2
+msgid ""
+"The `more` directive is supplied by the [[!iki plugins/more desc=more]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/more.mdwn:5
+msgid ""
+"This directive provides a way to have a \"more\" link on a post in a blog, "
+"that leads to the full version of the page. Use it like this:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/more.mdwn:6
+#, no-wrap
+msgid "\t\\[[!more linktext=\"click for more\" text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/more.mdwn:10
+#, no-wrap
+msgid ""
+"\tThis is the rest of my post. Not intended for people catching up on\n"
+"\ttheir blogs at 30,000 feet. Because I like to make things\n"
+"\tdifficult.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/more.mdwn:13
+msgid "If the `linktext` parameter is omitted it defaults to just \"more\"."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/more.mdwn:15
+msgid "Note that you can accomplish something similar using a [[toggle]] instead."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/orphans.mdwn:2
+msgid ""
+"The `orphans` directive is supplied by the [[!iki plugins/orphans "
+"desc=orphans]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/orphans.mdwn:5
+msgid ""
+"This directive generates a list of possibly orphaned pages -- pages that no "
+"other page links to. Example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/orphans.mdwn:7
+#, no-wrap
+msgid "\t\\[[!orphans pages=\"* and !blog/*\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/orphans.mdwn:10
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to check for orphans, default is search them all."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/orphans.mdwn:14
+msgid ""
+"Note that it takes backlinks into account, but does not count inlining a "
+"page as linking to it, so will generally count many blog-type pages as "
+"orphans."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagecount.mdwn:2
+msgid ""
+"The `pagecount` directive is supplied by the [[!iki plugins/pagecount "
+"desc=pagecount]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagecount.mdwn:4
+msgid "This directive counts pages currently in the wiki. Example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagecount.mdwn:6
+#, no-wrap
+msgid "\t\\[[!pagecount pages=\"*\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagecount.mdwn:9
+msgid ""
+"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying "
+"the pages to count, default is to count them all."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:2
+msgid ""
+"The `pagestats` directive is supplied by the [[!iki plugins/pagestats "
+"desc=pagestats]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:6
+msgid ""
+"This directive can generate stats about how pages link to each other. It can "
+"produce either a tag cloud, or a table counting the number of links to each "
+"page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:8
+msgid "Here's how to use it to create a [[tag]] cloud:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:10
+#, no-wrap
+msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:12
+msgid "And here's how to create a table of all the pages on the wiki:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagestats.mdwn:14
+#, no-wrap
+msgid "\t\\[[!pagestats style=\"table\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagetemplate.mdwn:2
+msgid ""
+"The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate "
+"desc=pagetemplate]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagetemplate.mdwn:8
+msgid ""
+"This directive allows a page to be created using a different wikitemplates.  "
+"The page text is inserted into the template, so the template controls the "
+"overall look and feel of the wiki page. This is in contrast to the "
+"[[ikiwiki/directive/template]] directive, which allows inserting templates "
+"_into_ the body of a page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagetemplate.mdwn:12
+msgid ""
+"This directive can only reference templates that are already installed by "
+"the system administrator, typically into the `/usr/share/ikiwiki/templates` "
+"directory. Example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/pagetemplate.mdwn:14
+#, no-wrap
+msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/ping.mdwn:2
+msgid ""
+"The `ping` directive is supplied by the [[!iki plugins/pinger desc=pinger]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/ping.mdwn:8
+msgid ""
+"This directive allows ikiwiki to be configured to hit a URL each time it "
+"updates the wiki. One way to use this is in conjunction with the [[!iki "
+"plugins/pingee desc=pingee]] plugin to set up a loosely coupled mirror "
+"network, or a branched version of a wiki. By pinging the mirror or branch "
+"each time the main wiki changes, it can be kept up-to-date."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/ping.mdwn:11
+#, no-wrap
+msgid ""
+"        \\[[!ping from=\"http://mywiki.com/\"\n"
+"        to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/ping.mdwn:14
+msgid ""
+"The \"from\" parameter must be identical to the url of the wiki that is "
+"doing the pinging. This is used to prevent ping loops."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/ping.mdwn:17
+msgid ""
+"The \"to\" parameter is the url to ping. The example shows how to ping "
+"another ikiwiki instance."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/poll.mdwn:2
+msgid ""
+"The `poll` directive is supplied by the [[!iki plugins/poll desc=poll]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/poll.mdwn:5
+msgid ""
+"This directive allows you to create online polls in the wiki. Here's an "
+"example use:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/poll.mdwn:7
+#, no-wrap
+msgid "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/poll.mdwn:11
+msgid ""
+"The numbers indicate how many users voted for that choice. When a user votes "
+"for a choice in the poll, the page is modified and the number incremented."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/poll.mdwn:17
+msgid ""
+"While some basic precautions are taken to prevent users from accidentially "
+"voting twice, this sort of poll should not be counted on to be very "
+"accurate; all the usual concerns about web based polling apply. Unless the "
+"page that the poll is in is locked, users can even edit the page and change "
+"the numbers!"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/poll.mdwn:19
+msgid "Parameters:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/poll.mdwn:24
+msgid ""
+"`open` - Whether voting is still open. Set to \"no\" to close the poll to "
+"voting."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/poll.mdwn:24
+msgid "`total` - Show total number of votes at bottom of poll. Default is \"yes\"."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/poll.mdwn:24
+msgid "`percent` - Whether to display percents. Default is \"yes\"."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/polygen.mdwn:2
+msgid ""
+"The `polygen` directive is supplied by the [[!iki plugins/polygen "
+"desc=polygen]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/polygen.mdwn:5
+msgid ""
+"This directive allows inserting text generated by polygen into a wiki page.  "
+"For example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/polygen.mdwn:7
+#, no-wrap
+msgid "\t\\[[!polygen grammar=\"genius\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/polygen.mdwn:10
+msgid ""
+"It's also possible to specify a starting nonterminal for the grammar by "
+"including `symbol=\"text\"` in the directive."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:2
+msgid ""
+"The `postsparkline` directive is supplied by the [[!iki "
+"plugins/postsparkline desc=postsparkline]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:5
+msgid ""
+"This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to "
+"create a [[sparkline]] of statistics about a set of pages, such as posts to "
+"a blog."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:11
+#, no-wrap
+msgid ""
+"\tPost interval: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n"
+"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:15
+#, no-wrap
+msgid ""
+"\tPosts per month this year: \n"
+"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n"
+"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:16 ikiwiki/directive/sparkline.mdwn:24
+#, no-wrap
+msgid "# usage\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:20
+msgid ""
+"All options aside fron the `pages`, `max`, `formula`, `time`, and `color` "
+"options are the same as in [[sparkline]] directive."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:25
+msgid ""
+"You don't need to specify any data points (though you can if you want to).  "
+"Instead, data points are automatically generated based on the creation times "
+"of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A maximum of "
+"`max` data points will be generated."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:28
+msgid ""
+"The `formula` parameter controls the formula used to generate data points.  "
+"Available forumlae:"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/postsparkline.mdwn:37
+msgid ""
+"`interval` - The height of each point represents how long it has been since "
+"the previous post."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/postsparkline.mdwn:37
+msgid ""
+"`perday` - Each point represents a day; the height represents how many posts "
+"were made that day."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/postsparkline.mdwn:37
+msgid ""
+"`permonth` - Each point represents a month; the height represents how many "
+"posts were made that month."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/postsparkline.mdwn:37
+msgid ""
+"`peryear` - Each point represents a day; the height represents how many "
+"posts were made that year."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:41
+msgid ""
+"The `time` parameter has a default value of \"ctime\", since forumae use the "
+"creation times of pages by default. If you instead want them to use the "
+"modification times of pages, set it to \"mtime\"."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/postsparkline.mdwn:44
+msgid ""
+"To change the color used to draw the sparkline, use the `color` parameter.  "
+"For example, \"color=red\"."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/progress.mdwn:2
+msgid ""
+"The `progress` directive is supplied by the [[!iki plugins/progress "
+"desc=progress]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/progress.mdwn:4
+msgid "This directive generates a progress bar."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/progress.mdwn:7
+msgid ""
+"There are two possible parameter sets.  The first is a single parameter "
+"\"percent\" which holds a percentage figure of how complete the progress bar "
+"is."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/progress.mdwn:12
+msgid ""
+"The second possible set of parameters is a pair of [[ikiwiki/PageSpec]]s, "
+"`totalpages` and `donepages`. The directive counts the number of pages in "
+"each pagespec and shows the percentage of the total pages that are done."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/progress.mdwn:15
+msgid "For example, to show what percentage of pages have discussion pages:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/progress.mdwn:17
+#, no-wrap
+msgid ""
+"\t\\[[!progress totalpages=\"* and !*/Discussion\" "
+"donepages=\"*/Discussion\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/shortcut.mdwn:2
+msgid ""
+"The `shortcut` directive is supplied by the [[!iki plugins/shortcut "
+"desc=shortcut]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/shortcut.mdwn:5
+msgid ""
+"This directive allows external links to commonly linked to sites to be made "
+"more easily using shortcuts."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/shortcut.mdwn:8
+msgid ""
+"The available shortcuts are defined on the [[shortcuts]] page in the "
+"wiki. The `shortcut` directive can only be used on that page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:2
+msgid ""
+"The `sparkline` directive is supplied by the [[!iki plugins/sparkline "
+"desc=sparkline]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:6
+msgid ""
+"This directive allows for embedding sparklines into wiki pages. A sparkline "
+"is a small word-size graphic chart, that is designed to be displayes "
+"alongside text."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:11
+#, no-wrap
+msgid ""
+"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n"
+"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:15
+msgid ""
+"This creates a simple line graph, graphing several points.  It will be drawn "
+"40 pixels wide and 16 pixels high. The high point in the line has a green "
+"marker, and the low point has a red marker."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:18
+#, no-wrap
+msgid ""
+"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar "
+"barwidth=2\n"
+"\tbarspacing=1 height=13]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:23
+msgid ""
+"This more complex example generates a bar graph.  The bars are 2 pixels "
+"wide, and separated by one pixel, and the graph is 13 pixels tall. Width is "
+"determined automatically for bar graphs. The points with negative values are "
+"colored red, instead of the default black."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:28
+msgid ""
+"The form for the data points is \"x,y\", or just \"y\" if the x values don't "
+"matter. Bar graphs can also add \"(color)\" to specify a color for that bar."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:32
+msgid ""
+"The following named parameters are recognised. Most of these are the same as "
+"those used by the underlying sparkline library, which is documented in more "
+"detail in [its wiki](http://sparkline.wikispaces.com/usage)."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid "`style` - Either \"line\" (the default) or \"bar\"."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid "`width` - Width of the graph in pixels. Only needed for line graphs."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid "`height` - Height of the graph in pixels. Defaults to 16."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid "`barwidth` - Width of bars in a bar graph. Default is 1 pixel."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid ""
+"`barspacing` - Spacing between bars in a bar graph, in pixels. Default is 1 "
+"pixel."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid ""
+"`ymin`, `ymax` - Minimum and maximum values for the Y axis. This is normally "
+"calculated automatically, but can be explicitly specified to get the same "
+"values for multiple related graphs."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/sparkline.mdwn:44
+msgid ""
+"`featurepoint` - Adds a circular marker to a line graph, with optional "
+"text. This can be used to label significant points."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:48
+#, no-wrap
+msgid ""
+"  The value is a comma-delimited list of parameters specifying the feature\n"
+"  point: X value, Y value, color name, circle diameter, text (optional),\n"
+"  and text location (optional). Example: `featurepoint=\"3,5,blue,3\"`\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/sparkline.mdwn:51
+#, no-wrap
+msgid ""
+"  Available values for the text location are: \"top\", \"right\", "
+"\"bottom\", and\n"
+"  \"left\".\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:2
+msgid ""
+"The `table` directive is supplied by the [[!iki plugins/table desc=table]] "
+"plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:5
+msgid ""
+"This directive can build HTML tables from data in CSV (comma-separated "
+"values)  or DSV (delimiter-separated values) format."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:8 ikiwiki/directive/table.mdwn:26
+#, no-wrap
+msgid "\t\\[[!table data=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:13
+#, no-wrap
+msgid ""
+"\tCustomer|Amount\n"
+"\tFulanito|134,34\n"
+"\tMenganito|234,56\n"
+"\tMenganito|234,56\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:16
+#, no-wrap
+msgid ""
+"\t\\[[!table class=\"book_record\" format=csv "
+"file=\"data/books/record1\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:18
+msgid "In this second example the `record1` page should be similar to:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:22
+#, no-wrap
+msgid ""
+"\t\"Title\",\"Perl Best Practices\"\n"
+"\t\"Author\",\"Damian Conway\"\n"
+"\t\"Publisher\",\"O’Reilly\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:25
+msgid ""
+"To make a cell span multiple columns, follow it with one or more empty "
+"cells. For example:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:30
+#, no-wrap
+msgid ""
+"\tleft||right|\n"
+"\ta|b|c|d\n"
+"\tthis cell spans 4 columns|||\n"
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/table.mdwn:44
+msgid "`data` - Values for the table."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/table.mdwn:44
+msgid "`file` - A file in the wiki containing the data."
+msgstr ""
+
+# type: Bullet: '* '
+#: ikiwiki/directive/table.mdwn:44
+msgid ""
+"`format` - The format of the data, either \"csv\", \"dsv\", or \"auto\" (the "
+"default)."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/table.mdwn:44
+#, no-wrap
+msgid ""
+"* `delimiter` - The character used to separate fields. By default,\n"
+"   DSV format uses a pipe (`|`), and CSV uses a comma (`,`).\n"
+"* `class` - A CSS class for the table html element.\n"
+"* `header` - By default, or if set to \"row\", the first data line is used\n"
+"  as the table header. Set it to \"no\" to make a table without a header, "
+"or\n"
+"  \"column\" to make the first column be the header.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:2
+msgid ""
+"The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag "
+"desc=tag]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:4
+msgid "These directives allow tagging pages. List tags as follows:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:6
+#, no-wrap
+msgid "\t\\[[!tag tech life linux]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:12
+msgid ""
+"The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on "
+"the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all pages "
+"that are tagged with a given tag, for example. The tags will also show up on "
+"blog entries and at the bottom of the tagged pages, as well as in RSS and "
+"Atom feeds."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:15
+msgid ""
+"If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink "
+"instead:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:18
+#, no-wrap
+msgid ""
+"\t\\[[!taglink foo]]\n"
+"\t\\[[!taglink tagged_as_foo|foo]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:23
+msgid ""
+"Note that if the wiki is configured to use a tagbase, then the tags will be "
+"located under a base directory, such as \"tags/\". This is a useful way to "
+"avoid having to write the full path to tags, if you want to keep them "
+"grouped together out of the way."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:26
+msgid ""
+"If you want to override the tagbase for a particular tag, you can use "
+"something like this:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/tag.mdwn:29
+#, no-wrap
+msgid ""
+"\t\\[[!tag ./foo]]\n"
+"\t\\[[!taglink /foo]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/taglink.mdwn:1
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/tag]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/template.mdwn:2
+msgid ""
+"The `template` directive is supplied by the [[!iki plugins/template "
+"desc=template]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/template.mdwn:7
+msgid ""
+"[[Templates]] are files that can be filled out and inserted into pages in "
+"the wiki, by using the template directive. The directive has an `id` "
+"parameter that identifies the template to use. The remaining parameters are "
+"used to fill out the template."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/template.mdwn:11
+#, no-wrap
+msgid ""
+"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my "
+"note.\"\"\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/template.mdwn:14
+msgid ""
+"This fills out the `note` template, filling in the `text` field with the "
+"specified value, and inserts the result into the page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/template.mdwn:17
+msgid ""
+"For a list of available templates, and details about how to create more, see "
+"the [[templates]] page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:2
+msgid ""
+"The `testpagespec` directive is supplied by the [[!iki plugins/testpagespec "
+"desc=testpagespec]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:5
+msgid ""
+"This directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a "
+"page, and to see the part that matches, or causes the match to fail."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:7
+msgid "Example uses:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:9
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:13
+msgid ""
+"This will print out something like \"no match: barpage does not match "
+"foopage\", highlighting which part of the [[ikiwiki/PageSpec]] is causing "
+"the match to fail."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:15
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:18
+msgid ""
+"This will print out something like \"no match: bar* matches barpage\", since "
+"the part of the [[ikiwiki/PageSpec]] that fails is this negated match."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:20
+#, no-wrap
+msgid "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/testpagespec.mdwn:23
+msgid ""
+"This will print out something like \"match: barpage matches barpage\", "
+"indicating the part of the [[ikiwiki/PageSpec]] that caused it to match."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:2
+msgid ""
+"The `teximg` directive is supplied by the [[!iki plugins/teximg "
+"desc=teximg]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:4
+msgid "This directive renders LaTeX formulas into images."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:9
+#, no-wrap
+msgid ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n"
+"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot  \\mu \\cdot e^4}{32\\pi^2 "
+"\\epsilon_0^2 \\hbar^2 n^2}\" ]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:11
+msgid "To scale the image, use height=x:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:14
+#, no-wrap
+msgid ""
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n"
+"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:18
+msgid ""
+"If no height is choosen the default height 12 is used. Valid heights are: 8, "
+"9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest "
+"available height is used."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:20
+msgid "To add an alt text to the image, use alt=\"text\":"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/teximg.mdwn:22
+#, no-wrap
+msgid "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:2
+msgid "The `toc` directive is supplied by the [[!iki plugins/toc desc=toc]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:4
+msgid "Add a table of contents to a page:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:6
+#, no-wrap
+msgid "\t\\[[!toc ]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:11
+msgid ""
+"The table of contents will be automatically generated based on the headers "
+"of the page. By default only the largest headers present on the page will be "
+"shown; to control how many levels of headers are shown, use the `levels` "
+"parameter:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:13
+#, no-wrap
+msgid "\t\\[[!toc levels=2]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:16
+msgid ""
+"The toc directive will take the level of the first header as the topmost "
+"level, even if there are higher levels seen later in the file."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toc.mdwn:20
+msgid ""
+"The table of contents will be created as an ordered list. If you want an "
+"unordered list instead, you can change the list-style in your local style "
+"sheet."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:2
+msgid ""
+"The `toggle` and `toggleable` directives are supplied by the [[!iki "
+"plugins/toggle desc=toggle]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:5
+msgid ""
+"With these directives you can create links on pages that, when clicked, "
+"toggle display of other parts of the page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:8
+msgid ""
+"It uses javascript to accomplish this; browsers without javascript will "
+"always see the full page content."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:10
+msgid "Example use:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:12
+#, no-wrap
+msgid "\t\\[[!toggle id=\"ipsum\" text=\"show\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:13
+#, no-wrap
+msgid "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:18
+#, no-wrap
+msgid ""
+"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n"
+"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n"
+"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n"
+"\taliquip ex ea commodo consequat.\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:19
+#, no-wrap
+msgid "\t[[!toggle id=\"ipsum\" text=\"hide\"]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:24
+msgid ""
+"Note that you can include wiki markup in the toggleable text, including even "
+"additional toggles, as shown in the above example."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:28
+msgid ""
+"Also, the toggle and the togglable definitions do not need to be next to "
+"each other, but can be located anywhere on the page. There can also be "
+"mutiple toggles that all toggle a single togglable."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:30
+msgid ""
+"The id has a default value of \"default\", so can be omitted in simple "
+"cases."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggle.mdwn:33
+msgid ""
+"If you'd like a toggleable to be displayed by default, and toggle to hidden, "
+"then pass a parameter \"open=yes\" when setting up the toggleable."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/toggleable.mdwn:1
+#, no-wrap
+msgid "[[!meta redir=/ikiwiki/directive/toggle]]\n"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/version.mdwn:2
+msgid ""
+"The `version` directive is supplied by the [[!iki plugins/version "
+"desc=version]] plugin."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/version.mdwn:4
+msgid "This directive allows inserting the version of ikiwiki onto a page."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/version.mdwn:7
+msgid ""
+"Whenever ikiwiki is upgraded to a new version, the page will be rebuilt, "
+"updating the version number."
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/version.mdwn:9
+msgid "Use is simple:"
+msgstr ""
+
+# type: Plain text
+#: ikiwiki/directive/version.mdwn:11
+#, no-wrap
+msgid "\t\\[[!version ]]\n"
+msgstr ""
diff --git a/po/templates.da.po b/po/templates.da.po
index f6c0e8b..6f1631b 100644
--- a/po/templates.da.po
+++ b/po/templates.da.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki templates 2.62.1\n"
-"POT-Creation-Date: 2008-08-30 05:13+0300\n"
-"PO-Revision-Date: 2008-08-04 02:14+0300\n"
+"POT-Creation-Date: 2008-10-23 13:26+0300\n"
+"PO-Revision-Date: 2008-10-23 13:30+0100\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,8 @@ msgid "[[!meta copyright=\"<TMPL_VAR NAME=\"COPYRIGHT\" ESCAPE=HTML>\"]]\n"
 msgstr "[[!meta copyright=\"<TMPL_VAR NAME=\"COPYRIGHT\" ESCAPE=HTML>\"]]\n"
 
 # type: Plain text
-#: aggregatepost.tmpl:14 change.tmpl:5
+#: aggregatepost.tmpl:14
+#: change.tmpl:5
 #, no-wrap
 msgid "</TMPL_IF>\n"
 msgstr "</TMPL_IF>\n"
@@ -665,6 +666,24 @@ msgstr ""
 "</div>\n"
 
 # type: Plain text
+#: googleform.tmpl:6
+#, no-wrap
+msgid ""
+"<form method=\"get\" action=\"http://www.google.com/search\" id=\"searchform\">\n"
+" <div>\n"
+"  <input name=\"sitesearch\" value=\"<TMPL_VAR SITEFQDN>\" type=\"hidden\">\n"
+"  <input name=\"q\" value=\"\" id=\"searchbox\" size=\"16\" maxlength=\"255\" type=\"text\">\n"
+" </div>\n"
+"</form>\n"
+msgstr ""
+"<form method=\"get\" action=\"http://www.google.com/search\" id=\"searchform\">\n"
+" <div>\n"
+"  <input name=\"sitesearch\" value=\"<TMPL_VAR SITEFQDN>\" type=\"hidden\">\n"
+"  <input name=\"q\" value=\"\" id=\"searchbox\" size=\"16\" maxlength=\"255\" type=\"text\">\n"
+" </div>\n"
+"</form>\n"
+
+# type: Plain text
 #: inlinepage.tmpl:2
 #, no-wrap
 msgid "<div class=\"inlinepage\">\n"
@@ -929,7 +948,8 @@ msgstr ""
 "</div>\n"
 
 # type: Plain text
-#: misc.tmpl:35 page.tmpl:125
+#: misc.tmpl:35
+#: page.tmpl:125
 #, no-wrap
 msgid ""
 "</body>\n"
@@ -1244,11 +1264,8 @@ msgstr ""
 
 # type: Plain text
 #: passwordmail.tmpl:5
-msgid ""
-"To change your password, visit the following url, and enter a new password:"
-msgstr ""
-"Skift din adgangskode ved at besøge følgende adresse og angive en ny "
-"adgangskode:"
+msgid "To change your password, visit the following url, and enter a new password:"
+msgstr "Skift din adgangskode ved at besøge følgende adresse og angive en ny adgangskode:"
 
 # type: Plain text
 #: passwordmail.tmpl:7
@@ -1258,12 +1275,8 @@ msgstr "<TMPL_VAR PASSWORDURL>\n"
 
 # type: Plain text
 #: passwordmail.tmpl:10
-msgid ""
-"This url can only be used once to change your password, and it will also "
-"stop working the next time you successfully log in."
-msgstr ""
-"Denne adresse kan kun benyttes én gang til at skifte din adgangskode, og vil "
-"også holde op med at fungere næste gang du logger korrekt på."
+msgid "This url can only be used once to change your password, and it will also stop working the next time you successfully log in."
+msgstr "Denne adresse kan kun benyttes én gang til at skifte din adgangskode, og vil også holde op med at fungere næste gang du logger korrekt på."
 
 # type: Plain text
 #: passwordmail.tmpl:13
@@ -1301,9 +1314,15 @@ msgstr ""
 "</TMPL_IF>\n"
 
 # type: Plain text
-#: renamesummary.tmpl:21
+#: renamesummary.tmpl:26
 #, no-wrap
 msgid ""
+"<TMPL_IF ERROR>\n"
+"<p>\n"
+"<b>Failed to rename <TMPL_VAR SRC> to <TMPL_VAR DEST>: </b>\n"
+"<TMPL_VAR ERROR>\n"
+"</p>\n"
+"<TMPL_ELSE>\n"
 "<p>\n"
 "<b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b>\n"
 "</p>\n"
@@ -1320,12 +1339,17 @@ msgid ""
 "<ul>\n"
 "<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
-"<TMPL_ELSE>\n"
-"No pages have broken links to <TMPL_VAR SRC>.\n"
 "</TMPL_IF>\n"
 "</TMPL_IF>\n"
 "</p>\n"
+"</TMPL_IF>\n"
 msgstr ""
+"<TMPL_IF ERROR>\n"
+"<p>\n"
+"<b>Omdøbning af <TMPL_VAR SRC> til <TMPL_VAR DEST> mislykkedes: </b>\n"
+"<TMPL_VAR ERROR>\n"
+"</p>\n"
+"<TMPL_ELSE>\n"
 "<p>\n"
 "<b>Succesfuldt omdøbt <TMPL_VAR SRC> til <TMPL_VAR DEST>.</b>\n"
 "</p>\n"
@@ -1342,11 +1366,10 @@ msgstr ""
 "<ul>\n"
 "<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
-"<TMPL_ELSE>\n"
-"Ingen sider har brudte henvisninger til <TMPL_VAR SRC>.\n"
 "</TMPL_IF>\n"
 "</TMPL_IF>\n"
 "</p>\n"
+"</TMPL_IF>\n"
 
 # type: Plain text
 #: rssitem.tmpl:26
@@ -1626,7 +1649,7 @@ msgstr ""
 "</div></div>\n"
 "<div style='float:left;margin-top:2px;font-size:x-small;'>\n"
 "<span title=\"$html{$date{$field{modtime},%Y-%m-%d %H:%M:%S}}\">\n"
-"Modified:<br><b>$html{$date{$field{modtime},%Y-%m-%d}}</b></span><br>\n"
+"Ændret:<br><b>$html{$date{$field{modtime},%Y-%m-%d}}</b></span><br>\n"
 "$if{$field{language},Sprog: <b>$html{$field{language}}</b><br>}\n"
 "$if{$field{size},<span title=\"$html{$field{size}} bytes\">Størrelse: <b>$html{$filesize{$field{size}}}</b></span><br>}\n"
 "</div>\n"
@@ -1635,7 +1658,7 @@ msgstr ""
 "<small>$highlight{$field{sample},$terms}$if{$field{sample},...}</small><br>\n"
 "<small>\n"
 "$percentage% relevant$. matchede:\n"
-"<i>$list{$map{$terms,$html{$prettyterm{$_}}},$. ,</i> aog <i>}</i></small>${for lynx:}<p></td></tr>}\n"
+"<i>$list{$map{$terms,$html{$prettyterm{$_}}},$. ,</i> og <i>}</i></small>${for lynx:}<p></td></tr>}\n"
 "</table>\n"
 
 # type: Plain text
@@ -1721,3 +1744,4 @@ msgstr ""
 #, no-wrap
 msgid "<p><a href=\"<TMPL_VAR PAGEURL>\"><TMPL_VAR TITLE></a></p>\n"
 msgstr "<p><a href=\"<TMPL_VAR PAGEURL>\"><TMPL_VAR TITLE></a></p>\n"
+
diff --git a/po/templates.pot b/po/templates.pot
index ce1ad64..2676365 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki templates 2.62.1\n"
-"POT-Creation-Date: 2008-08-30 05:11+0300\n"
+"POT-Creation-Date: 2008-10-23 13:26+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -445,6 +445,21 @@ msgid ""
 msgstr ""
 
 # type: Plain text
+#: googleform.tmpl:6
+#, no-wrap
+msgid ""
+"<form method=\"get\" action=\"http://www.google.com/search\" "
+"id=\"searchform\">\n"
+" <div>\n"
+"  <input name=\"sitesearch\" value=\"<TMPL_VAR SITEFQDN>\" "
+"type=\"hidden\">\n"
+"  <input name=\"q\" value=\"\" id=\"searchbox\" size=\"16\" "
+"maxlength=\"255\" type=\"text\">\n"
+" </div>\n"
+"</form>\n"
+msgstr ""
+
+# type: Plain text
 #: inlinepage.tmpl:2
 #, no-wrap
 msgid "<div class=\"inlinepage\">\n"
@@ -878,9 +893,15 @@ msgid ""
 msgstr ""
 
 # type: Plain text
-#: renamesummary.tmpl:21
+#: renamesummary.tmpl:26
 #, no-wrap
 msgid ""
+"<TMPL_IF ERROR>\n"
+"<p>\n"
+"<b>Failed to rename <TMPL_VAR SRC> to <TMPL_VAR DEST>: </b>\n"
+"<TMPL_VAR ERROR>\n"
+"</p>\n"
+"<TMPL_ELSE>\n"
 "<p>\n"
 "<b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b>\n"
 "</p>\n"
@@ -898,11 +919,10 @@ msgid ""
 "<ul>\n"
 "<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>\n"
 "</ul>\n"
-"<TMPL_ELSE>\n"
-"No pages have broken links to <TMPL_VAR SRC>.\n"
 "</TMPL_IF>\n"
 "</TMPL_IF>\n"
 "</p>\n"
+"</TMPL_IF>\n"
 msgstr ""
 
 # type: Plain text