summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile4
-rw-r--r--ikiwiki.setup398
-rw-r--r--perl/Locale/Po4a/Text.pm2
-rw-r--r--po/basewiki.da.po2118
-rw-r--r--po/basewiki.pot1025
-rw-r--r--po/directives.pot2716
-rw-r--r--po/templates.da.po68
-rw-r--r--po/templates.pot28
9 files changed, 3784 insertions, 2577 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 e246e38..ba1228e 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 = clean-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 3b28c97..29bde3a 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -1,157 +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/wiki.example.org",
-
- url => "http://wiki.example.org",
- cgiurl => "http://wiki.example.org/ikiwiki.cgi",
- templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates",
- underlaydir => $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki",
-
- # 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",
-
- wrappers => [
- #{
- # # The cgi wrapper.
- # cgi => 1,
- # wrapper => $ENV{'HOME'} . "/public_cgi/wiki.example.org/ikiwiki.cgi",
- # wrappermode => "06755",
- #},
- #{
- # # 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",
- #},
- ],
-
- # 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/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',
+ # 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',
+ # 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` - contro