From: Joey Hess Date: Sat, 17 Apr 2010 16:50:23 +0000 (-0400) Subject: Merge remote branch 'davrieb/autotag' into autotag X-Git-Tag: 3.20100427~62^2~28 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=54f600af14bf6dc067ffc30ec6f22d517001fe99;hp=981400177d68a279f485727be3f013e68f0bf691 Merge remote branch 'davrieb/autotag' into autotag Conflicts: IkiWiki.pm IkiWiki/Plugin/tag.pm --- diff --git a/.gitignore b/.gitignore index 8de36e2c8..e9ab152b6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,10 @@ blib/* doc/.ikiwiki/* html/* ikiwiki.out +ikiwiki-transition.out +ikiwiki-calendar.out pm_to_blib *.man -build-stamp po/po2wiki_stamp po/underlays/*/*.mdwn po/underlays/basewiki/*/*.mdwn diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm index 48bd127f1..5bbd7b8c6 100644 --- a/Bundle/IkiWiki/Extras.pm +++ b/Bundle/IkiWiki/Extras.pm @@ -35,6 +35,7 @@ Text::WikiCreole Term::ReadLine::Gnu HTML::Tree Sort::Naturally +YAML =head1 AUTHOR diff --git a/IkiWiki.pm b/IkiWiki.pm index 966a3bbc6..2f26a16ce 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -7,24 +7,25 @@ use strict; use Encode; use HTML::Entities; use URI::Escape q{uri_escape_utf8}; -use POSIX; +use POSIX (); use Storable; use open qw{:utf8 :std}; use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase %pagestate %wikistate %renderedfiles %oldrenderedfiles %pagesources %destsources %depends %depends_simple %hooks - %forcerebuild %loaded_plugins %autofiles %del_hash}; + %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks + %autofiles %del_hash}; use Exporter q{import}; our @EXPORT = qw(hook debug error template htmlpage deptype add_depends pagespec_match pagespec_match_list bestlink htmllink readfile writefile pagetype srcfile pagename - displaytime will_render gettext urlto targetpage + displaytime will_render gettext ngettext urlto targetpage add_underlay pagetitle titlepage linkpage newpagefile inject add_link add_autofile %config %links %pagestate %wikistate %renderedfiles - %pagesources %destsources); + %pagesources %destsources %typedlinks); our $VERSION = 3.00; # plugin interface version, next is ikiwiki version our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE @@ -37,6 +38,7 @@ our $DEPEND_LINKS=4; # Optimisation. use Memoize; memoize("abs2rel"); +memoize("sortspec_translate"); memoize("pagespec_translate"); memoize("template_file"); @@ -334,11 +336,20 @@ sub getsetup () { safe => 0, # paranoia rebuild => 0, }, + include => { + type => "string", + default => undef, + example => '^\.htaccess$', + description => "regexp of normally excluded files to include", + advanced => 1, + safe => 0, # regexp + rebuild => 1, + }, exclude => { type => "string", default => undef, - example => '\.wav$', - description => "regexp of source files to ignore", + example => '^(*\.private|Makefile)$', + description => "regexp of files that should be skipped", advanced => 1, safe => 0, # regexp rebuild => 1, @@ -409,6 +420,13 @@ sub getsetup () { safe => 0, rebuild => 0, }, + clean => { + type => "internal", + default => 0, + description => "running in clean mode", + safe => 0, + rebuild => 0, + }, refresh => { type => "internal", default => 0, @@ -423,10 +441,9 @@ sub getsetup () { safe => 0, rebuild => 0, }, - getctime => { + gettime => { type => "internal", - default => 0, - description => "running in getctime mode", + description => "running in gettime mode", safe => 0, rebuild => 0, }, @@ -451,6 +468,13 @@ sub getsetup () { safe => 0, rebuild => 0, }, + setuptype => { + type => "internal", + default => "Standard", + description => "perl class to use to dump setup file", + safe => 0, + rebuild => 0, + }, allow_symlinks_before_srcdir => { type => "boolean", default => 0, @@ -941,7 +965,12 @@ sub linkpage ($) { sub cgiurl (@) { my %params=@_; - return $config{cgiurl}."?". + my $cgiurl=$config{cgiurl}; + if (exists $params{cgiurl}) { + $cgiurl=$params{cgiurl}; + delete $params{cgiurl}; + } + return $cgiurl."?". join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params); } @@ -1090,6 +1119,11 @@ sub htmllink ($$$;@) { return "$linktext"; } +sub userpage ($) { + my $user=shift; + return length $config{userdir} ? "$config{userdir}/$user" : $user; +} + sub openiduser ($) { my $user=shift; @@ -1098,11 +1132,10 @@ sub openiduser ($) { my $display; if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) { - # this works in at least 2.x $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user); } else { - # this only works in 1.x + # backcompat with old version my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); $display=$oid->display; } @@ -1115,7 +1148,7 @@ sub openiduser ($) { # Convert "http://somehost.com/user" to "user [somehost.com]". # (also "https://somehost.com/user/") if ($display !~ /\[/) { - $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/; + $display=~s/^https?:\/\/(.+)\/([^\/#?]+)\/?(?:[#?].*)?$/$2 [$1]/; } $display=~s!^https?://!!; # make sure this is removed eval q{use CGI 'escapeHTML'}; @@ -1125,23 +1158,6 @@ sub openiduser ($) { return; } -sub userlink ($) { - my $user=shift; - - my $oiduser=eval { openiduser($user) }; - if (defined $oiduser) { - return "$oiduser"; - } - else { - eval q{use CGI 'escapeHTML'}; - error($@) if $@; - - return htmllink("", "", escapeHTML( - length $config{userdir} ? $config{userdir}."/".$user : $user - ), noimageinline => 1); - } -} - sub htmlize ($$$$) { my $page=shift; my $destpage=shift; @@ -1149,7 +1165,7 @@ sub htmlize ($$$$) { my $content=shift; my $oneline = $content !~ /\n/; - + if (exists $hooks{htmlize}{$type}) { $content=$hooks{htmlize}{$type}{call}->( page => $page, @@ -1170,10 +1186,9 @@ sub htmlize ($$$$) { if ($oneline) { # hack to get rid of enclosing junk added by markdown - # and other htmlizers + # and other htmlizers/sanitizers $content=~s/^

//i; - $content=~s/<\/p>$//i; - chomp $content; + $content=~s/<\/p>\n*$//i; } return $content; @@ -1228,7 +1243,7 @@ sub preprocess ($$$;$$) { (?: """(.*?)""" # 2: triple-quoted value | - "([^"]+)" # 3: single-quoted value + "([^"]*?)" # 3: single-quoted value | (\S+) # 4: unquoted value ) @@ -1314,7 +1329,7 @@ sub preprocess ($$$;$$) { (?: """.*?""" # triple-quoted value | - "[^"]+" # single-quoted value + "[^"]*?" # single-quoted value | [^"\s\]]+ # unquoted value ) @@ -1337,7 +1352,7 @@ sub preprocess ($$$;$$) { (?: """.*?""" # triple-quoted value | - "[^"]+" # single-quoted value + "[^"]*?" # single-quoted value | [^"\s\]]+ # unquoted value ) @@ -1488,7 +1503,7 @@ sub loadindex () { if (! $config{rebuild}) { %pagesources=%pagemtime=%oldlinks=%links=%depends= %destsources=%renderedfiles=%pagecase=%pagestate= - %depends_simple=(); + %depends_simple=%typedlinks=%oldtypedlinks=(); } my $in; if (! open ($in, "<", "$config{wikistatedir}/indexdb")) { @@ -1497,6 +1512,7 @@ sub loadindex () { open ($in, "<", "$config{wikistatedir}/indexdb") || return; } else { + $config{gettime}=1; # first build return; } } @@ -1554,6 +1570,14 @@ sub loadindex () { if (exists $d->{state}) { $pagestate{$page}=$d->{state}; } + if (exists $d->{typedlinks}) { + $typedlinks{$page}=$d->{typedlinks}; + + while (my ($type, $links) = each %{$typedlinks{$page}}) { + next unless %$links; + $oldtypedlinks{$page}{$type} = {%$links}; + } + } } $oldrenderedfiles{$page}=[@{$d->{dest}}]; } @@ -1602,6 +1626,10 @@ sub saveindex () { $index{page}{$src}{depends_simple} = $depends_simple{$page}; } + if (exists $typedlinks{$page} && %{$typedlinks{$page}}) { + $index{page}{$src}{typedlinks} = $typedlinks{$page}; + } + if (exists $pagestate{$page}) { foreach my $id (@hookids) { foreach my $key (keys %{$pagestate{$page}{$id}}) { @@ -1763,6 +1791,10 @@ sub rcs_getctime ($) { $hooks{rcs}{rcs_getctime}{call}->(@_); } +sub rcs_getmtime ($) { + $hooks{rcs}{rcs_getmtime}{call}->(@_); +} + sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } @@ -1781,7 +1813,7 @@ sub add_depends ($$;$) { # Add explicit dependencies for influences. my $sub=pagespec_translate($pagespec); - return if $@; + return unless defined $sub; foreach my $p (keys %pagesources) { my $r=$sub->($p, location => $page); my $i=$r->influences; @@ -1811,6 +1843,7 @@ sub deptype (@) { return $deptype; } +my $file_prune_regexp; sub file_pruned ($;$) { my $file=shift; if (@_) { @@ -1821,34 +1854,52 @@ sub file_pruned ($;$) { $file =~ s#^\Q$base\E/+##; } - my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')'; - return $file =~ m/$regexp/; + if (defined $config{include} && length $config{include}) { + return 0 if $file =~ m/$config{include}/; + } + + if (! defined $file_prune_regexp) { + $file_prune_regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')'; + $file_prune_regexp=qr/$file_prune_regexp/; + } + return $file =~ m/$file_prune_regexp/; } sub define_gettext () { # If translation is needed, redefine the gettext function to do it. # Otherwise, it becomes a quick no-op. - no warnings 'redefine'; + my $gettext_obj; + my $getobj; if ((exists $ENV{LANG} && length $ENV{LANG}) || (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) || (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) { - *gettext=sub { - my $gettext_obj=eval q{ + $getobj=sub { + $gettext_obj=eval q{ use Locale::gettext q{textdomain}; Locale::gettext->domain('ikiwiki') }; - - if ($gettext_obj) { - $gettext_obj->get(shift); - } - else { - return shift; - } }; } - else { - *gettext=sub { return shift }; - } + + no warnings 'redefine'; + *gettext=sub { + $getobj->() if $getobj; + if ($gettext_obj) { + $gettext_obj->get(shift); + } + else { + return shift; + } + }; + *ngettext=sub { + $getobj->() if $getobj; + if ($gettext_obj) { + $gettext_obj->nget(@_); + } + else { + return ($_[2] == 1 ? $_[0] : $_[1]) + } + }; } sub gettext { @@ -1856,6 +1907,11 @@ sub gettext { gettext(@_); } +sub ngettext { + define_gettext(); + ngettext(@_); +} + sub yesno ($) { my $val=shift; @@ -1887,12 +1943,82 @@ sub inject { use warnings; } -sub add_link ($$) { +sub add_link ($$;$) { my $page=shift; my $link=shift; + my $type=shift; push @{$links{$page}}, $link unless grep { $_ eq $link } @{$links{$page}}; + + if (defined $type) { + $typedlinks{$page}{$type}{$link} = 1; + } +} + +sub sortspec_translate ($$) { + my $spec = shift; + my $reverse = shift; + + my $code = ""; + my @data; + while ($spec =~ m{ + \s* + (-?) # group 1: perhaps negated + \s* + ( # group 2: a word + \w+\([^\)]*\) # command(params) + | + [^\s]+ # or anything else + ) + \s* + }gx) { + my $negated = $1; + my $word = $2; + my $params = undef; + + if ($word =~ m/^(\w+)\((.*)\)$/) { + # command with parameters + $params = $2; + $word = $1; + } + elsif ($word !~ m/^\w+$/) { + error(sprintf(gettext("invalid sort type %s"), $word)); + } + + if (length $code) { + $code .= " || "; + } + + if ($negated) { + $code .= "-"; + } + + if (exists $IkiWiki::SortSpec::{"cmp_$word"}) { + if (defined $params) { + push @data, $params; + $code .= "IkiWiki::SortSpec::cmp_$word(\$data[$#data])"; + } + else { + $code .= "IkiWiki::SortSpec::cmp_$word(undef)"; + } + } + else { + error(sprintf(gettext("unknown sort type %s"), $word)); + } + } + + if (! length $code) { + # undefined sorting method... sort arbitrarily + return sub { 0 }; + } + + if ($reverse) { + $code="-($code)"; + } + + no warnings; + return eval 'sub { '.$code.' }'; } sub add_autofile ($$) { @@ -1986,7 +2112,7 @@ sub pagespec_match ($$;@) { my $sub=pagespec_translate($spec); return IkiWiki::ErrorReason->new("syntax error in pagespec \"$spec\"") - if $@ || ! defined $sub; + if ! defined $sub; return $sub->($page, @params); } @@ -2004,7 +2130,9 @@ sub pagespec_match_list ($$;@) { my $sub=pagespec_translate($pagespec); error "syntax error in pagespec \"$pagespec\"" - if $@ || ! defined $sub; + if ! defined $sub; + my $sort=sortspec_translate($params{sort}, $params{reverse}) + if defined $params{sort}; my @candidates; if (exists $params{list}) { @@ -2017,39 +2145,19 @@ sub pagespec_match_list ($$;@) { ? grep { ! $params{filter}->($_) } keys %pagesources : keys %pagesources; } - - if (defined $params{sort}) { - my $f; - if ($params{sort} eq 'title') { - $f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) }; - } - elsif ($params{sort} eq 'title_natural') { - eval q{use Sort::Naturally}; - if ($@) { - error(gettext("Sort::Naturally needed for title_natural sort")); - } - $f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) }; - } - elsif ($params{sort} eq 'mtime') { - $f=sub { $pagemtime{$b} <=> $pagemtime{$a} }; - } - elsif ($params{sort} eq 'age') { - $f=sub { $pagectime{$b} <=> $pagectime{$a} }; - } - else { - error sprintf(gettext("unknown sort type %s"), $params{sort}); - } - @candidates = sort { &$f } @candidates; - } - - @candidates=reverse(@candidates) if $params{reverse}; - - $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT); # clear params, remainder is passed to pagespec + $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT); my $num=$params{num}; delete @params{qw{num deptype reverse sort filter list}}; + # when only the top matches will be returned, it's efficient to + # sort before matching to pagespec, + if (defined $num && defined $sort) { + @candidates=IkiWiki::SortSpec::sort_pages( + $sort, @candidates); + } + my @matches; my $firstfail; my $count=0; @@ -2071,14 +2179,21 @@ sub pagespec_match_list ($$;@) { $depends_simple{$page}{lc $k} |= $i->{$k}; } - return @matches; + # when all matches will be returned, it's efficient to + # sort after matching + if (! defined $num && defined $sort) { + return IkiWiki::SortSpec::sort_pages( + $sort, @matches); + } + else { + return @matches; + } } sub pagespec_valid ($) { my $spec=shift; - my $sub=pagespec_translate($spec); - return ! $@; + return defined pagespec_translate($spec); } sub glob2re ($) { @@ -2198,26 +2313,34 @@ sub match_link ($$;@) { $link=derel($link, $params{location}); my $from=exists $params{location} ? $params{location} : ''; + my $linktype=$params{linktype}; + my $qualifier=''; + if (defined $linktype) { + $qualifier=" with type $linktype"; + } my $links = $IkiWiki::links{$page}; - return IkiWiki::FailReason->new("$page has no links", "" => 1) + return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1) unless $links && @{$links}; my $bestlink = IkiWiki::bestlink($from, $link); foreach my $p (@{$links}) { if (length $bestlink) { - return IkiWiki::SuccessReason->new("$page links to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1) - if $bestlink eq IkiWiki::bestlink($page, $p); + if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && $bestlink eq IkiWiki::bestlink($page, $p)) { + return IkiWiki::SuccessReason->new("$page links to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1) + } } else { - return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1) - if match_glob($p, $link, %params); + if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p}) && match_glob($p, $link, %params)) { + return IkiWiki::SuccessReason->new("$page links to page $p$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1) + } my ($p_rel)=$p=~/^\/?(.*)/; $link=~s/^\///; - return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1) - if match_glob($p_rel, $link, %params); + if ((!defined $linktype || exists $IkiWiki::typedlinks{$page}{$linktype}{$p_rel}) && match_glob($p_rel, $link, %params)) { + return IkiWiki::SuccessReason->new("$page links to page $p_rel$qualifier, matching $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1) + } } } - return IkiWiki::FailReason->new("$page does not link to $link", "" => 1); + return IkiWiki::FailReason->new("$page does not link to $link$qualifier", $page => $IkiWiki::DEPEND_LINKS, "" => 1); } sub match_backlink ($$;@) { @@ -2298,11 +2421,13 @@ sub match_user ($$;@) { my $user=shift; my %params=@_; + my $regexp=IkiWiki::glob2re($user); + if (! exists $params{user}) { return IkiWiki::ErrorReason->new("no user specified"); } - if (defined $params{user} && lc $params{user} eq lc $user) { + if (defined $params{user} && $params{user}=~/^$regexp$/i) { return IkiWiki::SuccessReason->new("user is $user"); } elsif (! defined $params{user}) { @@ -2350,4 +2475,22 @@ sub match_ip ($$;@) { } } +package IkiWiki::SortSpec; + +# This is in the SortSpec namespace so that the $a and $b that sort() uses +# are easily available in this namespace, for cmp functions to use them. +sub sort_pages { + my $f=shift; + sort $f @_ +} + +sub cmp_title { + IkiWiki::pagetitle(IkiWiki::basename($a)) + cmp + IkiWiki::pagetitle(IkiWiki::basename($b)) +} + +sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} } +sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} } + 1 diff --git a/IkiWiki/Plugin/404.pm b/IkiWiki/Plugin/404.pm index 85486e559..8adfd5dd9 100644 --- a/IkiWiki/Plugin/404.pm +++ b/IkiWiki/Plugin/404.pm @@ -21,6 +21,7 @@ sub getsetup () { # server admin action too safe => 0, rebuild => 0, + section => "web", } } diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm index 3571c4189..cfd8cd347 100644 --- a/IkiWiki/Plugin/amazon_s3.pm +++ b/IkiWiki/Plugin/amazon_s3.pm @@ -132,6 +132,10 @@ sub getbucket { }); } + if (! $bucket) { + # Try to use existing bucket. + $bucket=$s3->bucket($config{amazon_s3_bucket}); + } if (! $bucket) { error(gettext("Failed to create S3 bucket: "). $s3->err.": ".$s3->errstr."\n"); @@ -178,7 +182,7 @@ sub writefile ($$$;$$) { # First, write the file to disk. my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer); - + my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file"); # Store the data in S3. diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm index 243b98920..0e74cbfad 100644 --- a/IkiWiki/Plugin/anonok.pm +++ b/IkiWiki/Plugin/anonok.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, anonok_pagespec => { type => "pagespec", diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index cbe6efc21..ad1dd9bca 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "web", }, allowed_attachments => { type => "pagespec", diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm index 555856b11..c71d73349 100644 --- a/IkiWiki/Plugin/autoindex.pm +++ b/IkiWiki/Plugin/autoindex.pm @@ -61,8 +61,16 @@ sub refresh () { } my %deleted; - if (ref $pagestate{index}{autoindex}{deleted}) { - %deleted=%{$pagestate{index}{autoindex}{deleted}}; + if (ref $wikistate{autoindex}{deleted}) { + %deleted=%{$wikistate{autoindex}{deleted}}; + } + elsif (ref $pagestate{index}{autoindex}{deleted}) { + # compatability code + %deleted=%{$pagestate{index}{autoindex}{deleted}}; + delete $pagestate{index}{autoindex}; + } + + if (keys %deleted) { foreach my $dir (keys %deleted) { # remove deleted page state if the deleted page is re-added, # or if all its subpages are deleted @@ -71,7 +79,7 @@ sub refresh () { delete $deleted{$dir}; } } - $pagestate{index}{autoindex}{deleted}=\%deleted; + $wikistate{autoindex}{deleted}=\%deleted; } my @needed; @@ -82,10 +90,10 @@ sub refresh () { # This page must have just been deleted, so # don't re-add it. And remember it was # deleted. - if (! ref $pagestate{index}{autoindex}{deleted}) { - $pagestate{index}{autoindex}{deleted}={}; + if (! ref $wikistate{autoindex}{deleted}) { + $wikistate{autoindex}{deleted}={}; } - ${$pagestate{index}{autoindex}{deleted}}{$dir}=1; + ${$wikistate{autoindex}{deleted}}{$dir}=1; } else { push @needed, $dir; diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm index 626c8ec42..c4e5cf390 100644 --- a/IkiWiki/Plugin/blogspam.pm +++ b/IkiWiki/Plugin/blogspam.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, blogspam_pagespec => { type => 'pagespec', diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm index 883007367..f79ca7c8f 100644 --- a/IkiWiki/Plugin/bzr.pm +++ b/IkiWiki/Plugin/bzr.pm @@ -20,6 +20,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -36,6 +37,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, bzr_wrapper => { type => "string", @@ -72,31 +74,40 @@ sub bzr_log ($) { my @infos = (); my $key = undef; + my %info; while (<$out>) { my $line = $_; my ($value); if ($line =~ /^message:/) { $key = "message"; - $infos[$#infos]{$key} = ""; + $info{$key} = ""; } elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) { $key = "files"; - unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; } + $info{$key} = "" unless defined $info{$key}; } elsif (defined($key) and $line =~ /^ (.*)/) { - $infos[$#infos]{$key} .= "$1\n"; + $info{$key} .= "$1\n"; } elsif ($line eq "------------------------------------------------------------\n") { + push @infos, {%info} if keys %info; + %info = (); $key = undef; - push (@infos, {}); } - else { + elsif ($line =~ /: /) { chomp $line; + if ($line =~ /^revno: (\d+)/) { + $key = "revno"; + $value = $1; + } + else { ($key, $value) = split /: +/, $line, 2; - $infos[$#infos]{$key} = $value; - } + } + $info{$key} = $value; + } } close $out; + push @infos, {%info} if keys %info; return @infos; } @@ -212,7 +223,7 @@ sub rcs_recentchanges ($) { foreach my $info (bzr_log($out)) { my @pages = (); my @message = (); - + foreach my $msgline (split(/\n/, $info->{message})) { push @message, { line => $msgline }; } @@ -296,4 +307,8 @@ sub rcs_getctime ($) { return $ctime; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for bzr\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 2b87451ce..aeb5f3d29 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -22,7 +22,7 @@ use warnings; use strict; use IkiWiki 3.00; use Time::Local; -use POSIX; +use POSIX (); my $time=time; my @now=localtime($time); @@ -38,6 +38,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, archivebase => { type => "string", @@ -46,6 +47,14 @@ sub getsetup () { safe => 1, rebuild => 1, }, + archive_pagespec => { + type => "pagespec", + example => "posts/* and !*/Discussion", + description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command", + link => 'ikiwiki/PageSpec', + safe => 1, + rebuild => 0, + }, } sub is_leap_year (@) { @@ -155,11 +164,11 @@ sub format_month (@) { # Start producing the month calendar $calendar=< - - $purl - $url - $nurl - + + $purl + $url + $nurl + EOF @@ -303,13 +312,14 @@ sub format_year (@) { add_depends($params{page}, "$archivebase/$nyear", deptype("presence")); # Start producing the year calendar + my $m=$params{months_per_row}-2; $calendar=< - - $purl - $url - $nurl - + + $purl + $url + $nurl + Months diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm index 20505893b..d550dd9f4 100644 --- a/IkiWiki/Plugin/color.pm +++ b/IkiWiki/Plugin/color.pm @@ -10,6 +10,16 @@ use IkiWiki 3.00; sub import { hook(type => "preprocess", id => "color", call => \&preprocess); hook(type => "format", id => "color", call => \&format); + hook(type => "getsetup", id => "color", call => \&getsetup); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + section => "widget", + }, } sub preserve_style ($$$) { diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 5586cca52..0aa043215 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -38,6 +38,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "web", }, comments_pagespec => { type => 'pagespec', @@ -171,9 +172,8 @@ sub preprocess { else { $commentauthorurl = IkiWiki::cgiurl( do => 'goto', - page => (length $config{userdir} - ? "$config{userdir}/$commentuser" - : "$commentuser")); + page => IkiWiki::userpage($commentuser) + ); $commentauthor = $commentuser; } @@ -221,7 +221,9 @@ sub preprocess { } if (defined $params{subject}) { - $pagestate{$page}{meta}{title} = $params{subject}; + # decode title the same way meta does + eval q{use HTML::Entities}; + $pagestate{$page}{meta}{title} = decode_entities($params{subject}); } if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) { @@ -736,39 +738,43 @@ sub pagetemplate (@) { } if ($shown && commentsopen($page)) { - my $addcommenturl = IkiWiki::cgiurl(do => 'comment', - page => $page); - $template->param(addcommenturl => $addcommenturl); + $template->param(addcommenturl => addcommenturl($page)); } } - if ($template->query(name => 'commentsurl')) { - if ($shown) { + if ($shown) { + if ($template->query(name => 'commentsurl')) { $template->param(commentsurl => urlto($page, undef, 1).'#comments'); } - } - if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) { - if ($shown) { + if ($template->query(name => 'atomcommentsurl') && $config{usedirs}) { # This will 404 until there are some comments, but I # think that's probably OK... $template->param(atomcommentsurl => urlto($page, undef, 1).'comments.atom'); } - } - if ($template->query(name => 'commentslink')) { - # XXX Would be nice to say how many comments there are in - # the link. But, to update the number, blog pages - # would have to update whenever comments of any inlines - # page are added, which is not currently done. - if ($shown) { - $template->param(commentslink => - htmllink($page, $params{destpage}, $page, - linktext => gettext("Comments"), + if ($template->query(name => 'commentslink')) { + my $num=num_comments($page, $config{srcdir}); + my $link; + if ($num > 0) { + $link = htmllink($page, $params{destpage}, $page, + linktext => sprintf(ngettext("%i comment", "%i comments", $num), $num), anchor => "comments", - noimageinline => 1)); + noimageinline => 1 + ); + } + elsif (commentsopen($page)) { + $link = "". + #translators: Here "Comment" is a verb; + #translators: the user clicks on it to + #translators: post a comment. + gettext("Comment"). + ""; + } + $template->param(commentslink => $link) + if defined $link; } } @@ -816,6 +822,12 @@ sub pagetemplate (@) { } } +sub addcommenturl ($) { + my $page=shift; + + return IkiWiki::cgiurl(do => 'comment', page => $page); +} + sub num_comments ($$) { my $page=shift; my $dir=shift; @@ -829,7 +841,7 @@ sub unique_comment_location ($$$) { eval q{use Digest::MD5 'md5_hex'}; error($@) if $@; - my $content_md5=md5_hex(shift); + my $content_md5=md5_hex(Encode::encode_utf8(shift)); my $dir=shift; @@ -845,14 +857,14 @@ sub unique_comment_location ($$$) { sub page_to_id ($) { # Converts a comment page name into a unique, legal html id - # addtibute value, that can be used as an anchor to link to the + # attribute value, that can be used as an anchor to link to the # comment. my $page=shift; eval q{use Digest::MD5 'md5_hex'}; error($@) if $@; - return "comment-".md5_hex($page); + return "comment-".md5_hex(Encode::encode_utf8(($page))); } package IkiWiki::PageSpec; diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm index aad617812..8a5796149 100644 --- a/IkiWiki/Plugin/conditional.pm +++ b/IkiWiki/Plugin/conditional.pm @@ -16,6 +16,7 @@ sub getsetup { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } @@ -29,7 +30,7 @@ sub preprocess_if (@) { } my $result=0; - if (! IkiWiki::yesno($params{all}) || + if ((exists $params{all} && ! IkiWiki::yesno($params{all})) || # An optimisation to avoid needless looping over every page # for simple uses of some of the tests. $params{test} =~ /^([\s\!()]*((enabled|sourcepage|destpage|included)\([^)]*\)|(and|or))[\s\!()]*)+$/) { diff --git a/IkiWiki/Plugin/creole.pm b/IkiWiki/Plugin/creole.pm index 425e71043..a1e4b31d3 100644 --- a/IkiWiki/Plugin/creole.pm +++ b/IkiWiki/Plugin/creole.pm @@ -17,6 +17,7 @@ sub getsetup { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm index 417442f34..01e9ce043 100644 --- a/IkiWiki/Plugin/cutpaste.pm +++ b/IkiWiki/Plugin/cutpaste.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm index f6db8bc98..360d97249 100644 --- a/IkiWiki/Plugin/cvs.pm +++ b/IkiWiki/Plugin/cvs.pm @@ -49,6 +49,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub genwrapper () { @@ -85,6 +86,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, cvsrepo => { type => "string", @@ -484,4 +486,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for cvs\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm index 0d68f27e5..c1d6661d3 100644 --- a/IkiWiki/Plugin/darcs.pm +++ b/IkiWiki/Plugin/darcs.pm @@ -18,6 +18,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub silentsystem (@) { @@ -51,7 +52,7 @@ sub darcs_info ($$$) { return $_; } -sub file_in_vc($$) { +sub file_in_vc ($$) { my $repodir = shift; my $file = shift; @@ -69,7 +70,7 @@ sub file_in_vc($$) { return $found; } -sub darcs_rev($) { +sub darcs_rev ($) { my $file = shift; # Relative to the repodir. my $repodir = $config{srcdir}; @@ -78,7 +79,7 @@ sub darcs_rev($) { return defined $hash ? $hash : ""; } -sub checkconfig() { +sub checkconfig () { if (defined $config{darcs_wrapper} && length $config{darcs_wrapper}) { push @{$config{wrappers}}, { wrapper => $config{darcs_wrapper}, @@ -87,11 +88,12 @@ sub checkconfig() { } } -sub getsetup() { +sub getsetup () { return plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, darcs_wrapper => { type => "string", @@ -237,7 +239,7 @@ sub rcs_commit ($$$;$$) { } } -sub rcs_commit_staged($$$) { +sub rcs_commit_staged ($$$) { my ($message, $user, $ipaddr) = @_; my $author; @@ -426,4 +428,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for darcs\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm index 652e6df0a..ea5c9a9c5 100644 --- a/IkiWiki/Plugin/date.pm +++ b/IkiWiki/Plugin/date.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/editdiff.pm b/IkiWiki/Plugin/editdiff.pm index 7df6a9ffb..d8f53a42e 100644 --- a/IkiWiki/Plugin/editdiff.pm +++ b/IkiWiki/Plugin/editdiff.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "web", }, } diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index fca970c60..44fe5514a 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, } @@ -245,8 +246,9 @@ sub cgi_editpage ($$) { push @page_locs, $dir.$page; } - push @page_locs, "$config{userdir}/$page" - if length $config{userdir}; + my $userpage=IkiWiki::userpage($page); + push @page_locs, $userpage + if ! grep { $_ eq $userpage } @page_locs; } @page_locs = grep { @@ -271,8 +273,10 @@ sub cgi_editpage ($$) { check_canedit($_, $q, $session, 1) } @page_locs; if (! @editable_locs) { - # let it throw an error this time - map { check_canedit($_, $q, $session) } @page_locs; + # now let it throw an error, or prompt for + # login + map { check_canedit($_, $q, $session) } + ($best_loc, @page_locs); } my @page_types; diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index a163b0d84..5f0551d92 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -23,6 +23,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "web", }, } diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index 01d490961..1549b82db 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -5,7 +5,7 @@ use warnings; use strict; use IkiWiki 3.00; -my %units=( #{{{ # size in bytes +my %units=( # size in bytes B => 1, byte => 1, KB => 2 ** 10, @@ -75,9 +75,9 @@ sub match_maxsize ($$;@) { } my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } if (-s $file > $maxsize) { @@ -96,9 +96,9 @@ sub match_minsize ($$;@) { } my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } if (-s $file < $minsize) { @@ -114,9 +114,9 @@ sub match_mimetype ($$;@) { my $wanted=shift; my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } # Use ::magic to get the mime type, the idea is to only trust @@ -147,9 +147,9 @@ sub match_virusfree ($$;@) { my $wanted=shift; my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } if (! exists $IkiWiki::config{virus_checker} || diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm index 1513cbed7..d54e71131 100644 --- a/IkiWiki/Plugin/format.pm +++ b/IkiWiki/Plugin/format.pm @@ -7,6 +7,16 @@ use IkiWiki 3.00; sub import { hook(type => "preprocess", id => "format", call => \&preprocess); + hook(type => "getsetup", id => "format", call => \&getsetup); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + section => "widget", + }, } sub preprocess (@) { diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm index 17e57dea1..f481c7eac 100644 --- a/IkiWiki/Plugin/fortune.pm +++ b/IkiWiki/Plugin/fortune.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm index d1555430e..b362de726 100644 --- a/IkiWiki/Plugin/getsource.pm +++ b/IkiWiki/Plugin/getsource.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "web", }, getsource_mimetype => { type => "string", diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 1eec6aee6..aa402c04f 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -25,6 +25,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); } @@ -68,6 +69,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, git_wrapper => { type => "string", @@ -614,23 +616,51 @@ sub rcs_diff ($) { } } -sub rcs_getctime ($) { +{ +my %time_cache; + +sub findtimes ($$) { my $file=shift; + my $id=shift; # 0 = mtime ; 1 = ctime + # Remove srcdir prefix $file =~ s/^\Q$config{srcdir}\E\/?//; - my @raw_lines = run_or_die('git', 'log', - '--follow', '--no-merges', - '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c', - '-r', '--', $file); - my @ci; - while (my $parsed = parse_diff_tree("", \@raw_lines)) { - push @ci, $parsed; + if (! keys %time_cache) { + my $date; + foreach my $line (run_or_die('git', 'log', + '--pretty=format:%ct', + '--name-only', '--relative')) { + if (! defined $date && $line =~ /^(\d+)$/) { + $date=$line; + } + elsif (! length $line) { + $date=undef; + } + else { + if (! $time_cache{$line}) { + $time_cache{$line}[0]=$date; # mtime + } + $time_cache{$line}[1]=$date; # ctime + } + } } - my $ctime = $ci[$#ci]->{'author_epoch'}; - debug("ctime for '$file': ". localtime($ctime)); - return $ctime; + return exists $time_cache{$file} ? $time_cache{$file}[$id] : 0; +} + +} + +sub rcs_getctime ($) { + my $file=shift; + + return findtimes($file, 1); +} + +sub rcs_getmtime ($) { + my $file=shift; + + return findtimes($file, 0); } sub rcs_receive () { diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm index 483fa1707..48ad4c8ce 100644 --- a/IkiWiki/Plugin/google.pm +++ b/IkiWiki/Plugin/google.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "web", }, } diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm index 439552f62..03bd682b3 100644 --- a/IkiWiki/Plugin/goto.pm +++ b/IkiWiki/Plugin/goto.pm @@ -14,6 +14,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "web", } } diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index 32e994d6b..bec122076 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm index 5a062a276..bf23dce67 100644 --- a/IkiWiki/Plugin/haiku.pm +++ b/IkiWiki/Plugin/haiku.pm @@ -16,6 +16,7 @@ sub getsetup { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 9bdde85ae..e517ac5c0 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -23,6 +23,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, tohighlight => { type => "string", @@ -79,7 +80,7 @@ my %highlighters; # Parse highlight's config file to get extension => language mappings. sub read_filetypes () { - open (IN, $filetypes); + open (IN, $filetypes) || error("$filetypes: $!"); while () { chomp; if (/^\$ext\((.*)\)=(.*)$/) { diff --git a/IkiWiki/Plugin/hnb.pm b/IkiWiki/Plugin/hnb.pm index bd2177a06..32c9cf3ad 100644 --- a/IkiWiki/Plugin/hnb.pm +++ b/IkiWiki/Plugin/hnb.pm @@ -23,6 +23,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff --git a/IkiWiki/Plugin/html.pm b/IkiWiki/Plugin/html.pm index a7d5e8ce9..4dbae081b 100644 --- a/IkiWiki/Plugin/html.pm +++ b/IkiWiki/Plugin/html.pm @@ -21,6 +21,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index a249cdf7a..9f40c752f 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -30,9 +30,9 @@ sub import { "msnim", "notes", "rsync", "secondlife", "skype", "ssh", "sftp", "smb", "sms", "snews", "webcal", "ymsgr", ); - # data is a special case. Allow data:image/*, but - # disallow data:text/javascript and everything else. - $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i; + # data is a special case. Allow a few data:image/ types, + # but disallow data:text/javascript and everything else. + $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i; } sub getsetup () { @@ -40,6 +40,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "core", }, htmlscrubber_skip => { type => "pagespec", diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index 127c321f0..478f67446 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -9,6 +9,10 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "httpauth", call => \&getsetup); hook(type => "auth", id => "httpauth", call => \&auth); + hook(type => "formbuilder_setup", id => "httpauth", + call => \&formbuilder_setup); + hook(type => "canedit", id => "httpauth", call => \&canedit, + first => 1); } sub getsetup () { @@ -16,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, cgiauthurl => { type => "string", @@ -24,6 +29,23 @@ sub getsetup () { safe => 1, rebuild => 0, }, + httpauth_pagespec => { + type => "pagespec", + example => "!*/Discussion", + description => "PageSpec of pages where only httpauth will be used for authentication", + safe => 0, + rebuild => 0, + }, +} + +sub redir_cgiauthurl ($;@) { + my $cgi=shift; + + IkiWiki::redirect($cgi, + @_ > 1 ? IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_) + : $config{cgiauthurl}."?@_" + ); + exit; } sub auth ($$) { @@ -33,9 +55,53 @@ sub auth ($$) { if (defined $cgi->remote_user()) { $session->param("name", $cgi->remote_user()); } - elsif (defined $config{cgiauthurl}) { - IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string()); - exit; +} + +sub formbuilder_setup (@) { + my %params=@_; + + my $form=$params{form}; + my $session=$params{session}; + my $cgi=$params{cgi}; + my $buttons=$params{buttons}; + + if ($form->title eq "signin" && + ! defined $cgi->remote_user() && defined $config{cgiauthurl}) { + my $button_text="Login with HTTP auth"; + push @$buttons, $button_text; + + if ($form->submitted && $form->submitted eq $button_text) { + # bounce thru cgiauthurl and then back to + # the stored postsignin action + redir_cgiauthurl($cgi, do => "postsignin"); + } + } +} + +sub test_httpauth_pagespec ($) { + my $page=shift; + + return ( + ); +} + +sub canedit ($$$) { + my $page=shift; + my $cgi=shift; + my $session=shift; + + if (! defined $cgi->remote_user() && + defined $config{httpauth_pagespec} && + length $config{httpauth_pagespec} && + defined $config{cgiauthurl} && + pagespec_match($page, $config{httpauth_pagespec})) { + return sub { + # bounce thru cgiauthurl and back to edit action + redir_cgiauthurl($cgi, $cgi->query_string()); + }; + } + else { + return undef; } } diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 82db15a7e..f06121578 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 401852513..3359af314 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -49,6 +49,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "core", }, rss => { type => "boolean", @@ -159,7 +160,7 @@ sub preprocess_inline (@) { my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss}; my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom}; my $quick=exists $params{quick} ? yesno($params{quick}) : 0; - my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick); + my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick && ! $raw); my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1; my $feedonly=yesno($params{feedonly}); if (! exists $params{show} && ! $archive) { @@ -552,7 +553,8 @@ sub genfeed ($$$$$@) { if (exists $pagestate{$p}) { if (exists $pagestate{$p}{meta}{guid}) { - $itemtemplate->param(guid => $pagestate{$p}{meta}{guid}); + eval q{use HTML::Entities}; + $itemtemplate->param(guid => HTML::Entities::encode_numeric($pagestate{$p}{meta}{guid})); } if (exists $pagestate{$p}{meta}{updated}) { diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm index 4c1add985..3838aec09 100644 --- a/IkiWiki/Plugin/link.pm +++ b/IkiWiki/Plugin/link.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm index 68eb6c8c6..ac26e072e 100644 --- a/IkiWiki/Plugin/linkmap.pm +++ b/IkiWiki/Plugin/linkmap.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm index 09f08c567..8a67f7160 100644 --- a/IkiWiki/Plugin/listdirectives.pm +++ b/IkiWiki/Plugin/listdirectives.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, directive_description_dir => { type => "string", diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 74ddbb153..1466e8337 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, locked_pages => { type => "pagespec", diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 788b96827..ce3ac1d24 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -21,6 +21,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index 3de59ef3d..b892eabee 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, multimarkdown => { type => "boolean", diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm index 11fdec529..34e009c7a 100644 --- a/IkiWiki/Plugin/mercurial.pm +++ b/IkiWiki/Plugin/mercurial.pm @@ -20,6 +20,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -36,6 +37,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, mercurial_wrapper => { type => "string", @@ -253,4 +255,8 @@ sub rcs_getctime ($) { return $ctime; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for mercurial\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 55c9ddbd1..128a6342c 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "core", }, } @@ -87,15 +88,21 @@ sub preprocess (@) { # Metadata collection that needs to happen during the scan pass. if ($key eq 'title') { - $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value); + $pagestate{$page}{meta}{title}=$value; + if (exists $params{sortas}) { + $pagestate{$page}{meta}{titlesort}=$params{sortas}; + } + else { + delete $pagestate{$page}{meta}{titlesort}; + } return ""; } elsif ($key eq 'description') { - $pagestate{$page}{meta}{description}=HTML::Entities::encode_numeric($value); + $pagestate{$page}{meta}{description}=$value; # fallthrough } elsif ($key eq 'guid') { - $pagestate{$page}{meta}{guid}=HTML::Entities::encode_numeric($value); + $pagestate{$page}{meta}{guid}=$value; # fallthrough } elsif ($key eq 'license') { @@ -115,6 +122,12 @@ sub preprocess (@) { } elsif ($key eq 'author') { $pagestate{$page}{meta}{author}=$value; + if (exists $params{sortas}) { + $pagestate{$page}{meta}{authorsort}=$params{sortas}; + } + else { + delete $pagestate{$page}{meta}{authorsort}; + } # fallthorough } elsif ($key eq 'authorurl') { @@ -263,15 +276,20 @@ sub pagetemplate (@) { $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}})); } if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) { - $template->param(title => $pagestate{$page}{meta}{title}); + $template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title})); $template->param(title_overridden => 1); } - foreach my $field (qw{author authorurl description permalink}) { + foreach my $field (qw{author authorurl permalink}) { $template->param($field => $pagestate{$page}{meta}{$field}) if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field); } + foreach my $field (qw{description}) { + $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field})) + if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field); + } + foreach my $field (qw{license copyright}) { if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field) && ($page eq $destpage || ! exists $pagestate{$destpage}{meta}{$field} || @@ -281,6 +299,33 @@ sub pagetemplate (@) { } } +sub get_sort_key { + my $page = shift; + my $meta = shift; + + # e.g. titlesort (also makes sense for author) + my $key = $pagestate{$page}{meta}{$meta . "sort"}; + return $key if defined $key; + + # e.g. title + $key = $pagestate{$page}{meta}{$meta}; + return $key if defined $key; + + # fall back to closer-to-core things + if ($meta eq 'title') { + return pagetitle(IkiWiki::basename($page)); + } + elsif ($meta eq 'date') { + return $IkiWiki::pagectime{$page}; + } + elsif ($meta eq 'updated') { + return $IkiWiki::pagemtime{$page}; + } + else { + return ''; + } +} + sub match { my $field=shift; my $page=shift; @@ -331,4 +376,27 @@ sub match_copyright ($$;@) { IkiWiki::Plugin::meta::match("copyright", @_); } +package IkiWiki::SortSpec; + +sub cmp_meta { + my $meta = shift; + error(gettext("sort=meta requires a parameter")) unless defined $meta; + + if ($meta eq 'updated' || $meta eq 'date') { + return IkiWiki::Plugin::meta::get_sort_key($a, $meta) + <=> + IkiWiki::Plugin::meta::get_sort_key($b, $meta); + } + + return IkiWiki::Plugin::meta::get_sort_key($a, $meta) + cmp + IkiWiki::Plugin::meta::get_sort_key($b, $meta); +} + +# A prototype of how sort=title could behave in 4.0 or something +sub cmp_meta_title { + $_[0] = 'title'; + return cmp_meta(@_); +} + 1 diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm index d0a6107ef..92be7913e 100644 --- a/IkiWiki/Plugin/mirrorlist.pm +++ b/IkiWiki/Plugin/mirrorlist.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "web", }, mirrorlist => { type => "string", diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm index 2555927b7..b0a328a06 100644 --- a/IkiWiki/Plugin/moderatedcomments.pm +++ b/IkiWiki/Plugin/moderatedcomments.pm @@ -15,11 +15,13 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, - moderate_users => { - type => 'boolean', - example => 1, - description => 'Moderate comments of logged-in users?', + moderate_pagespec => { + type => 'pagespec', + example => 'user(http://*)', + description => 'PageSpec matching users or comment locations to moderate', + link => 'ikiwiki/PageSpec', safe => 1, rebuild => 0, }, @@ -31,14 +33,32 @@ sub checkcontent (@) { # only handle comments return undef unless pagespec_match($params{page}, "postcomment(*)", location => $params{page}); + + # backwards compatability + if (exists $config{moderate_users} && + ! exists $config{moderate_pagespec}) { + $config{moderate_pagespec} = $config{moderate_users} + ? "!admin()" + : "!user(*)"; + } + + # default is to moderate all except admins + if (! exists $config{moderate_pagespec}) { + $config{moderate_pagespec}="!admin()"; + } - # admins and maybe users can comment w/o moderation my $session=$params{session}; my $user=$session->param("name") if $session; - return undef if defined $user && (IkiWiki::is_admin($user) || - (exists $config{moderate_users} && ! $config{moderate_users})); - - return gettext("comment needs moderation"); + if (pagespec_match($params{page}, $config{moderate_pagespec}, + location => $params{page}, + (defined $user ? (user => $user) : ()), + (defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()), + )) { + return gettext("comment needs moderation"); + } + else { + return undef; + } } 1 diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 9502804f1..67d4abbaa 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -23,6 +23,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -68,6 +69,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, mtn_wrapper => { type => "string", @@ -692,4 +694,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for monotone\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm index 77d5fb077..266c8e1d0 100644 --- a/IkiWiki/Plugin/more.pm +++ b/IkiWiki/Plugin/more.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm index bfe84c0e1..053652a5f 100644 --- a/IkiWiki/Plugin/norcs.pm +++ b/IkiWiki/Plugin/norcs.pm @@ -18,6 +18,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub getsetup () { @@ -25,6 +26,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => 0, + section => "rcs", }, } @@ -62,7 +64,11 @@ sub rcs_diff ($) { } sub rcs_getctime ($) { - error gettext("getctime not implemented"); + return 0; +} + +sub rcs_getmtime ($) { + return 0; } 1 diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 4517ff88b..2805f60ef 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -7,7 +7,8 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "opendiscussion", call => \&getsetup); - hook(type => "canedit", id => "opendiscussion", call => \&canedit); + hook(type => "canedit", id => "opendiscussion", call => \&canedit, + first => 1); } sub getsetup () { @@ -15,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, } @@ -24,6 +26,7 @@ sub canedit ($$) { my $session=shift; return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i; + return "" if pagespec_match($page, "postcomment(*)"); return undef; } diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index dc0e0f48e..7b1a17831 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -26,6 +26,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, openidsignup => { type => "string", @@ -56,7 +57,7 @@ sub formbuilder_setup (@) { # OpenID fieldset. $form->fieldsets("OpenID"); - $form->field( + $form->field( name => "openid_url", label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), fieldset => "OpenID", @@ -82,13 +83,14 @@ sub formbuilder_setup (@) { } } } - elsif ($form->title eq "preferences") { - if (! defined $form->field(name => "name")) { - $form->field(name => "OpenID", disabled => 1, - value => $session->param("name"), - size => 50, force => 1, - fieldset => "login"); - } + elsif ($form->title eq "preferences" && + IkiWiki::openiduser($session->param("name"))) { + $form->field(name => "openid_url", disabled => 1, + label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), + value => $session->param("name"), + size => 50, force => 1, + fieldset => "login"); + $form->field(name => "email", type => "hidden"); } } @@ -112,6 +114,28 @@ sub validate ($$$;$) { } } + # Ask for client to provide a name and email, if possible. + # Try sreg and ax + if ($claimed_identity->can("set_extension_args")) { + $claimed_identity->set_extension_args( + 'http://openid.net/extensions/sreg/1.1', + { + optional => 'email,fullname,nickname', + }, + ); + $claimed_identity->set_extension_args( + 'http://openid.net/srv/ax/1.0', + { + mode => 'fetch_request', + 'required' => 'email,fullname,nickname,firstname', + 'type.email' => "http://schema.openid.net/contact/email", + 'type.fullname' => "http://axschema.org/namePerson", + 'type.nickname' => "http://axschema.org/namePerson/friendly", + 'type.firstname' => "http://axschema.org/namePerson/first", + }, + ); + } + my $check_url = $claimed_identity->check_url( return_to => IkiWiki::cgiurl(do => "postsignin"), trust_root => $config{cgiurl}, @@ -138,6 +162,32 @@ sub auth ($$) { } elsif (my $vident = $csr->verified_identity) { $session->param(name => $vident->url); + + my @extensions; + if ($vident->can("signed_extension_fields")) { + @extensions=grep { defined } ( + $vident->signed_extension_fields('http://openid.net/extensions/sreg/1.1'), + $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'), + ); + } + foreach my $ext (@extensions) { + foreach my $field (qw{value.email email}) { + if (exists $ext->{$field} && + defined $ext->{$field} && + length $ext->{$field}) { + $session->param(email => $ext->{$field}); + last; + } + } + foreach my $field (qw{value.nickname nickname value.fullname fullname value.firstname}) { + if (exists $ext->{$field} && + defined $ext->{$field} && + length $ext->{$field}) { + $session->param(username => $ext->{$field}); + last; + } + } + } } else { error("OpenID failure: ".$csr->err); diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 702943f87..e3cc3c940 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/otl.pm b/IkiWiki/Plugin/otl.pm index 3ab2441bf..3801a6ec2 100644 --- a/IkiWiki/Plugin/otl.pm +++ b/IkiWiki/Plugin/otl.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm index 8d36f057e..dd5de3c83 100644 --- a/IkiWiki/Plugin/pagecount.pm +++ b/IkiWiki/Plugin/pagecount.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm index 4313aa271..17b26f7ba 100644 --- a/IkiWiki/Plugin/pagestats.pm +++ b/IkiWiki/Plugin/pagestats.pm @@ -27,6 +27,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } @@ -74,7 +75,7 @@ sub preprocess (@) { } if ($style eq 'table') { - return "\n". + return "
\n". join("\n", map { "
". htmllink($params{page}, $params{destpage}, $_, noimageinline => 1). @@ -86,16 +87,31 @@ sub preprocess (@) { else { # In case of misspelling, default to a page cloud - my $res = "
\n"; + my $res; + if ($style eq 'list') { + $res = "
    \n"; + } + else { + $res = "
    \n"; + } foreach my $page (sort keys %counts) { next unless $counts{$page} > 0; my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)]; + + $res.="
  • " if $style eq 'list'; $res .= "". htmllink($params{page}, $params{destpage}, $page). "\n"; + $res.="
    • " if $style eq 'list'; + + } + if ($style eq 'list') { + $res .= "
\n"; + } + else { + $res .= "
\n"; } - $res .= "\n"; return $res; } diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm index e678a057d..728bbc399 100644 --- a/IkiWiki/Plugin/parentlinks.pm +++ b/IkiWiki/Plugin/parentlinks.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 8cf5af51e..4848b47bb 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, account_creation_password => { type => "string", @@ -104,11 +105,11 @@ sub formbuilder_setup (@) { my $session=$params{session}; my $cgi=$params{cgi}; - if ($form->title eq "signin" || $form->title eq "register") { + if ($form->title eq "signin" || $form->title eq "register" || $cgi->param("do") eq "register") { $form->field(name => "name", required => 0); $form->field(name => "password", type => "password", required => 0); - if ($form->submitted eq "Register" || $form->submitted eq "Create Account") { + if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $cgi->param("do") eq "register") { $form->field(name => "confirm_password", type => "password"); $form->field(name => "account_creation_password", type => "password") if (defined $config{account_creation_password} && @@ -207,19 +208,34 @@ sub formbuilder_setup (@) { } } elsif ($form->title eq "preferences") { - $form->field(name => "name", disabled => 1, - value => $session->param("name"), force => 1, - fieldset => "login"); - $form->field(name => "password", type => "password", - fieldset => "login", - validate => sub { - shift eq $form->field("confirm_password"); - }), - $form->field(name => "confirm_password", type => "password", - fieldset => "login", - validate => sub { - shift eq $form->field("password"); - }), + my $user=$session->param("name"); + if (! IkiWiki::openiduser($user)) { + $form->field(name => "name", disabled => 1, + value => $user, force => 1, + fieldset => "login"); + $form->field(name => "password", type => "password", + fieldset => "login", + validate => sub { + shift eq $form->field("confirm_password"); + }); + $form->field(name => "confirm_password", type => "password", + fieldset => "login", + validate => sub { + shift eq $form->field("password"); + }); + + my $userpage=IkiWiki::userpage($user); + if (exists $pagesources{$userpage}) { + $form->text(gettext("Your user page: "). + htmllink("", "", $userpage, + noimageinline => 1)); + } + else { + $form->text(" "edit", page => $userpage). + "\">".gettext("Create your user page").""); + } + } } } @@ -232,7 +248,7 @@ sub formbuilder (@) { my $buttons=$params{buttons}; if ($form->title eq "signin" || $form->title eq "register") { - if ($form->submitted && $form->validate) { + if (($form->submitted && $form->validate) || $cgi->param("do") eq "register") { if ($form->submitted eq 'Login') { $session->param("name", $form->field("name")); IkiWiki::cgi_postsignin($cgi, $session); @@ -295,7 +311,7 @@ sub formbuilder (@) { $form->field(name => "name", required => 0); push @$buttons, "Reset Password"; } - elsif ($form->submitted eq "Register") { + elsif ($form->submitted eq "Register" || $cgi->param("do") eq "register") { @$buttons="Create Account"; } } @@ -336,6 +352,14 @@ sub sessioncgi ($$) { IkiWiki::cgi_prefs($q, $session); exit; } + elsif ($q->param("do") eq "register") { + # After registration, need to go somewhere, so show prefs page. + $session->param(postsignin => "do=prefs"); + # Due to do=register, this will run in registration-only + # mode. + IkiWiki::cgi_signin($q, $session); + exit; + } } sub auth ($$) { diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index f8801185e..759e812e6 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -85,7 +85,8 @@ sub getsetup () { return plugin => { safe => 0, - rebuild => 1, + rebuild => 1, # format plugin + section => "format", }, po_master_language => { type => "string", @@ -132,6 +133,7 @@ sub checkconfig () { $field, 'po')); } } + delete $config{po_slave_languages}{$config{po_master_language}{code}};; map { islanguagecode($_) @@ -173,7 +175,8 @@ sub checkconfig () { if ($config{po_master_language}{code} ne 'en') { # Add underlay containing translated source files # for the master language. - add_underlay("locale/$config{po_master_language}{code}/$underlay"); + add_underlay("locale/$config{po_master_language}{code}/$underlay") + if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay"; } } } @@ -307,7 +310,7 @@ sub pagetemplate (@) { if (ishomepage($page) && $template->query(name => "title")) { $template->param(title => $config{wikiname}); } -} # }}} +} # Add the renamed page translations to the list of to-be-renamed pages. sub renamepages (@) { diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index bc1e3501e..6bc4579c2 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/polygen.pm b/IkiWiki/Plugin/polygen.pm index bc21d71c7..78e3611e1 100644 --- a/IkiWiki/Plugin/polygen.pm +++ b/IkiWiki/Plugin/polygen.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm index 0d5a12e33..2fae9c5fe 100644 --- a/IkiWiki/Plugin/postsparkline.pm +++ b/IkiWiki/Plugin/postsparkline.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm index fe64b40b1..d27df5ca8 100644 --- a/IkiWiki/Plugin/progress.pm +++ b/IkiWiki/Plugin/progress.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/rawhtml.pm b/IkiWiki/Plugin/rawhtml.pm index ad8a610c1..0838bcb22 100644 --- a/IkiWiki/Plugin/rawhtml.pm +++ b/IkiWiki/Plugin/rawhtml.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # changes file types + section => "format", }, } diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index fa851e466..5c7b71aaa 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -124,7 +124,7 @@ sub store ($$$) { elsif (length $config{cgiurl}) { $change->{authorurl} = IkiWiki::cgiurl( do => "goto", - page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author}, + page => IkiWiki::userpage($change->{author}), ); } diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index 06df2efd5..7f006af83 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -5,7 +5,7 @@ use warnings; no warnings 'redefine'; use strict; use IkiWiki 3.00; -use POSIX; +use POSIX (); use Encode; sub import { diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index 3c1e0c713..0fc180f69 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "web", }, } @@ -48,7 +49,7 @@ sub check_canremove ($$$) { # This is sorta overkill, but better safe than sorry. if (! defined pagetype($pagesources{$page})) { if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file"); } else { error("removal of attachments is not allowed"); diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 8213d21f6..1a9da6363 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "web", }, } @@ -49,7 +50,7 @@ sub check_canrename ($$$$$$) { IkiWiki::check_canedit($src, $q, $session); if ($attachment) { if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile); + IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile"); } else { error("renaming of attachments is not allowed"); @@ -84,7 +85,7 @@ sub check_canrename ($$$$$$) { if ($attachment) { # Note that $srcfile is used here, not $destfile, # because it wants the current file, to check it. - IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile); + IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile"); } } diff --git a/IkiWiki/Plugin/repolist.pm b/IkiWiki/Plugin/repolist.pm index f69ec3988..ba7c5f0aa 100644 --- a/IkiWiki/Plugin/repolist.pm +++ b/IkiWiki/Plugin/repolist.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "web", }, repositories => { type => "string", diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 393c17e0f..c0e8703d8 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "web", }, omega_cgi => { type => "string", @@ -109,6 +110,7 @@ sub index (@) { # data used by omega # Decode html entities in it, since omega re-encodes them. eval q{use HTML::Entities}; + error $@ if $@; $doc->set_data( "url=".urlto($params{page}, "")."\n". "sample=".decode_entities($sample)."\n". @@ -213,9 +215,19 @@ sub setupfiles () { writefile("omega.conf", $config{wikistatedir}."/xapian", "database_dir .\n". "template_dir ./templates\n"); + + # Avoid omega interpreting anything in the misctemplate + # as an omegascript command. + my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0"); + eval q{use HTML::Entities}; + error $@ if $@; + $misctemplate=encode_entities($misctemplate, '\$'); + + my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl")); + $misctemplate=~s/\0/$querytemplate/; + writefile("query", $config{wikistatedir}."/xapian/templates", - IkiWiki::misctemplate(gettext("search"), - readfile(IkiWiki::template_file("searchquery.tmpl")))); + $misctemplate); $setup=1; } } diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm index 1840a5722..0cedbe447 100644 --- a/IkiWiki/Plugin/shortcut.pm +++ b/IkiWiki/Plugin/shortcut.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/sidebar.pm b/IkiWiki/Plugin/sidebar.pm index 41812e1c1..0350f2b71 100644 --- a/IkiWiki/Plugin/sidebar.pm +++ b/IkiWiki/Plugin/sidebar.pm @@ -10,6 +10,7 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "sidebar", call => \&getsetup); + hook(type => "preprocess", id => "sidebar", call => \&preprocess); hook(type => "pagetemplate", id => "sidebar", call => \&pagetemplate); } @@ -19,11 +20,51 @@ sub getsetup () { safe => 1, rebuild => 1, }, + global_sidebars => { + type => "boolean", + examples => 1, + description => "show sidebar page on all pages?", + safe => 1, + rebuild => 1, + }, +} + +my %pagesidebar; + +sub preprocess (@) { + my %params=@_; + + my $page=$params{page}; + return "" unless $page eq $params{destpage}; + + if (! defined $params{content}) { + $pagesidebar{$page}=undef; + } + else { + my $file = $pagesources{$page}; + my $type = pagetype($file); + + $pagesidebar{$page}= + IkiWiki::htmlize($page, $page, $type, + IkiWiki::linkify($page, $page, + IkiWiki::preprocess($page, $page, + IkiWiki::filter($page, $page, $params{content})))); + } + + return ""; } +my $oldfile; +my $oldcontent; + sub sidebar_content ($) { my $page=shift; + return delete $pagesidebar{$page} if defined $pagesidebar{$page}; + + return if ! exists $pagesidebar{$page} && + defined $config{global_sidebars} && ! $config{global_sidebars}; + my $sidebar_page=bestlink($page, "sidebar") || return; my $sidebar_file=$pagesources{$sidebar_page} || return; my $sidebar_type=pagetype($sidebar_file); @@ -34,7 +75,16 @@ sub sidebar_content ($) { # currently requires a wiki rebuild. add_depends($page, $sidebar_page); - my $content=readfile(srcfile($sidebar_file)); + my $content; + if (defined $oldfile && $sidebar_file eq $oldfile) { + $content=$oldcontent; + } + else { + $content=readfile(srcfile($sidebar_file)); + $oldcontent=$content; + $oldfile=$sidebar_file; + } + return unless length $content; return IkiWiki::htmlize($sidebar_page, $page, $sidebar_type, IkiWiki::linkify($sidebar_page, $page, @@ -47,11 +97,10 @@ sub sidebar_content ($) { sub pagetemplate (@) { my %params=@_; - my $page=$params{page}; my $template=$params{template}; - - if ($template->query(name => "sidebar")) { - my $content=sidebar_content($page); + if ($params{destpage} eq $params{page} && + $template->query(name => "sidebar")) { + my $content=sidebar_content($params{destpage}); if (defined $content && length $content) { $template->param(sidebar => $content); } diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm index 8b44a68f7..31160c02f 100644 --- a/IkiWiki/Plugin/signinedit.pm +++ b/IkiWiki/Plugin/signinedit.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, } diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm new file mode 100644 index 000000000..62e42767c --- /dev/null +++ b/IkiWiki/Plugin/sortnaturally.pm @@ -0,0 +1,32 @@ +#!/usr/bin/perl +# Sort::Naturally-powered title_natural sort order for IkiWiki +package IkiWiki::Plugin::sortnaturally; + +use IkiWiki 3.00; +no warnings; + +sub import { + hook(type => "getsetup", id => "sortnaturally", call => \&getsetup); +} + +sub getsetup { + return + plugin => { + safe => 1, + rebuild => undef, + }, +} + +sub checkconfig () { + eval q{use Sort::Naturally}; + error $@ if $@; +} + +package IkiWiki::SortSpec; + +sub cmp_title_natural { + Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($a)), + IkiWiki::pagetitle(IkiWiki::basename($b))) +} + +1; diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm index fb4849492..42665ac63 100644 --- a/IkiWiki/Plugin/sparkline.pm +++ b/IkiWiki/Plugin/sparkline.pm @@ -24,6 +24,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index 06b987f51..d10b4888d 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -19,6 +19,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -44,6 +45,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, svnrepo => { type => "string", @@ -348,9 +350,18 @@ sub rcs_diff ($) { return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`; } -sub rcs_getctime ($) { +{ + +my ($lastfile, $lastmtime, $lastctime); + +sub findtimes ($) { my $file=shift; + if (defined $lastfile && $lastfile eq $file) { + return $lastmtime, $lastctime; + } + $lastfile=$file; + my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/; my $child = open(SVNLOG, "-|"); @@ -358,24 +369,39 @@ sub rcs_getctime ($) { exec("svn", "log", $file) || error("svn log $file failed to run"); } - my $date; + my ($cdate, $mdate); while () { if (/$svn_log_infoline/) { - $date=$1; + $cdate=$1; + $mdate=$1 unless defined $mdate; } } - close SVNLOG || warn "svn log $file exited $?"; + close SVNLOG || error "svn log $file exited $?"; - if (! defined $date) { - warn "failed to parse svn log for $file\n"; - return 0; + if (! defined $cdate) { + error "failed to parse svn log for $file\n"; } eval q{use Date::Parse}; error($@) if $@; - $date=str2time($date); - debug("found ctime ".localtime($date)." for $file"); - return $date; + + $lastctime=str2time($cdate); + $lastmtime=str2time($mdate); + return $lastmtime, $lastctime; +} + +} + +sub rcs_getctime ($) { + my $file=shift; + + return (findtimes($file))[1]; +} + +sub rcs_getmtime ($) { + my $file=shift; + + return (findtimes($file))[0]; } 1 diff --git a/IkiWiki/Plugin/table.pm b/IkiWiki/Plugin/table.pm index 96d63f455..2edd1eacd 100644 --- a/IkiWiki/Plugin/table.pm +++ b/IkiWiki/Plugin/table.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index fdd63d637..9e6f417bf 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -6,8 +6,6 @@ use warnings; use strict; use IkiWiki 3.00; -my %tags; - sub import { hook(type => "getopt", id => "tag", call => \&getopt); hook(type => "getsetup", id => "tag", call => \&getsetup); @@ -94,13 +92,12 @@ sub preprocess_tag (@) { foreach my $tag (keys %params) { $tag=linkpage($tag); - $tags{$page}{$tag}=1; - + + # hidden WikiLink + add_link($page, tagpage($tag), 'tag'); + # add tagpage if necessary gentag($tag); - - # hidden WikiLink - add_link($page, tagpage($tag)); } return ""; @@ -114,15 +111,13 @@ sub preprocess_taglink (@) { return join(" ", map { if (/(.*)\|(.*)/) { my $tag=linkpage($2); - $tags{$params{page}}{$tag}=1; - add_link($params{page}, tagpage($tag)); + add_link($params{page}, tagpage($tag), 'tag'); return taglink($params{page}, $params{destpage}, $tag, linktext => pagetitle($1)); } else { my $tag=linkpage($_); - $tags{$params{page}}{$tag}=1; - add_link($params{page}, tagpage($tag)); + add_link($params{page}, tagpage($tag), 'tag'); return taglink($params{page}, $params{destpage}, $tag); } } @@ -137,17 +132,19 @@ sub pagetemplate (@) { my $destpage=$params{destpage}; my $template=$params{template}; + my $tags = $typedlinks{$page}{tag}; + $template->param(tags => [ map { link => taglink($page, $destpage, $_, rel => "tag") - }, sort keys %{$tags{$page}} - ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags"); + }, sort keys %$tags + ]) if defined $tags && %$tags && $template->query(name => "tags"); if ($template->query(name => "categories")) { # It's an rss/atom template. Add any categories. - if (exists $tags{$page} && %{$tags{$page}}) { + if (defined $tags && %$tags) { $template->param(categories => [map { category => $_ }, - sort keys %{$tags{$page}}]); + sort keys %$tags]); } } } @@ -155,9 +152,7 @@ sub pagetemplate (@) { package IkiWiki::PageSpec; sub match_tagged ($$;@) { - my $page = shift; - my $glob = shift; - return match_link($page, IkiWiki::Plugin::tag::tagpage($glob)); + return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag'); } 1 diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 39d9667f9..98a13b5fa 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } @@ -36,7 +37,13 @@ sub preprocess (@) { my $template_page="templates/$params{id}"; add_depends($params{page}, $template_page); - my $template_file=$pagesources{$template_page}; + my $template_file; + if (exists $pagesources{$template_page}) { + $template_file=srcfile($pagesources{$template_page}); + } + else { + $template_file=IkiWiki::template_file("$params{id}.tmpl") + } return sprintf(gettext("template %s not found"), htmllink($params{page}, $params{destpage}, "/".$template_page)) unless defined $template_file; @@ -49,7 +56,7 @@ sub preprocess (@) { $$text_ref=&Encode::decode_utf8($$text_ref); chomp $$text_ref; }, - filename => srcfile($template_file), + filename => $template_file, die_on_bad_params => 0, no_includes => 1, blind_cache => 1, diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm index f92ed0132..521af499f 100644 --- a/IkiWiki/Plugin/teximg.pm +++ b/IkiWiki/Plugin/teximg.pm @@ -8,6 +8,7 @@ use strict; use Digest::MD5 qw(md5_hex); use File::Temp qw(tempdir); use HTML::Entities; +use Encode; use IkiWiki 3.00; my $default_prefix = < { safe => 1, rebuild => undef, + section => "widget", }, teximg_dvipng => { type => "boolean", @@ -102,7 +104,7 @@ sub create ($$$) { $height = 12; } - my $digest = md5_hex($code, $height); + my $digest = md5_hex(Encode::encode_utf8($code), $height); my $imglink= $params->{page} . "/$digest.png"; my $imglog = $params->{page} . "/$digest.log"; diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm index 8cc5a7951..56bb4bffc 100644 --- a/IkiWiki/Plugin/textile.pm +++ b/IkiWiki/Plugin/textile.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm index f4b20a6ec..f5ad0cc96 100644 --- a/IkiWiki/Plugin/tla.pm +++ b/IkiWiki/Plugin/tla.pm @@ -18,6 +18,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -34,6 +35,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, tla_wrapper => { type => "string", @@ -161,7 +163,7 @@ sub rcs_remove ($) { error("rcs_remove not implemented for tla"); # TODO } -sub rcs_rename ($$) { # {{{a +sub rcs_rename ($$) { my ($src, $dest) = @_; error("rcs_rename not implemented for tla"); # TODO @@ -283,4 +285,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for tla\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm index b8537d3eb..ac07b9af6 100644 --- a/IkiWiki/Plugin/toc.pm +++ b/IkiWiki/Plugin/toc.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index ef066a42f..f9c899540 100644 --- a/IkiWiki/Plugin/toggle.pm +++ b/IkiWiki/Plugin/toggle.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm index 8599bdc8e..0d9a0b35b 100644 --- a/IkiWiki/Plugin/txt.pm +++ b/IkiWiki/Plugin/txt.pm @@ -29,6 +29,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } @@ -38,7 +39,14 @@ sub filter (@) { my %params = @_; my $content = $params{content}; - if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) { + if (defined $pagesources{$params{page}} && + $pagesources{$params{page}} =~ /\.txt$/) { + if ($pagesources{$params{page}} eq 'robots.txt' && + $params{page} eq $params{destpage}) { + will_render($params{page}, 'robots.txt'); + writefile('robots.txt', $config{destdir}, $content); + } + encode_entities($content, "<>&"); if ($findurl) { my $finder = URI::Find->new(sub { diff --git a/IkiWiki/Plugin/typography.pm b/IkiWiki/Plugin/typography.pm index f62be82bb..9389b24d4 100644 --- a/IkiWiki/Plugin/typography.pm +++ b/IkiWiki/Plugin/typography.pm @@ -9,7 +9,7 @@ use IkiWiki 3.00; sub import { hook(type => "getopt", id => "typography", call => \&getopt); hook(type => "getsetup", id => "typography", call => \&getsetup); - IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize); + hook(type => "sanitize", id => "typography", call => \&sanitize); } sub getopt () { diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm index 587cd55fa..c13643478 100644 --- a/IkiWiki/Plugin/version.pm +++ b/IkiWiki/Plugin/version.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index e477bcc20..d444c0a3d 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "web", }, websetup_force_plugins => { type => "string", @@ -26,6 +27,13 @@ sub getsetup () { safe => 0, rebuild => 0, }, + websetup_unsafe => { + type => "string", + example => [], + description => "list of additional setup field keys to treat as unsafe", + safe => 0, + rebuild => 0, + }, websetup_show_unsafe => { type => "boolean", example => 1, @@ -56,6 +64,12 @@ sub formatexample ($$) { } } +sub issafe ($) { + my $key=shift; + + return ! grep { $_ eq $key } @{$config{websetup_unsafe}}; +} + sub showfields ($$$@) { my $form=shift; my $plugin=shift; @@ -66,27 +80,30 @@ sub showfields ($$$@) { while (@_) { my $key=shift; my %info=%{shift()}; + + if ($key eq 'plugin') { + %plugininfo=%info; + next; + } # skip internal settings next if defined $info{type} && $info{type} eq "internal"; # XXX hashes not handled yet next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH'; # maybe skip unsafe settings - next if ! $info{safe} && ! ($config{websetup_show_unsafe} && $config{websetup_advanced}); + next if ! ($config{websetup_show_unsafe} && $config{websetup_advanced}) && + (! $info{safe} || ! issafe($key)); # maybe skip advanced settings next if $info{advanced} && ! $config{websetup_advanced}; # these are handled specially, so don't show next if $key eq 'add_plugins' || $key eq 'disable_plugins'; - if ($key eq 'plugin') { - %plugininfo=%info; - next; - } - push @show, $key, \%info; } - my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main"; + my $section=defined $plugin + ? sprintf(gettext("%s plugin:"), $plugininfo{section}).$plugin + : "main"; my %enabledfields; my $shownfields=0; @@ -97,6 +114,16 @@ sub showfields ($$$@) { @show=(); } + my $section_fieldset; + if (defined $plugin) { + # Define the combined fieldset for the plugin's section. + # This ensures that this fieldset comes first. + $section_fieldset=sprintf(gettext("%s plugins"), $plugininfo{section}); + $form->field(name => "placeholder.$plugininfo{section}", + type => "hidden", + fieldset => $section_fieldset); + } + # show plugin toggle if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) { my $name="enable.$plugin"; @@ -137,10 +164,13 @@ sub showfields ($$$@) { my $name=defined $plugin ? $plugin.".".$key : $section.".".$key; my $value=$config{$key}; + if (! defined $value) { + $value=""; + } - if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { - $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) } @{$value} : ""), - "", ""]; # blank items for expansion + if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') { + $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) } @{$value} : "")]; + push @$value, "", "" if $info{safe} && issafe($key); # blank items for expansion } else { $value=Encode::encode_utf8($value); @@ -194,7 +224,7 @@ sub showfields ($$$@) { } } - if (! $info{safe}) { + if (! $info{safe} || ! issafe($key)) { $form->field(name => $name, disabled => 1); } else { @@ -203,11 +233,11 @@ sub showfields ($$$@) { $shownfields++; } - # if no fields were shown for the plugin, drop it into the - # plugins fieldset + # if no fields were shown for the plugin, drop it into a combined + # fieldset for its section if (defined $plugin && (! $plugin_forced || $config{websetup_advanced}) && ! $shownfields) { - $form->field(name => "enable.$plugin", fieldset => "plugins"); + $form->field(name => "enable.$plugin", fieldset => $section_fieldset); } return %enabledfields; @@ -258,7 +288,6 @@ sub showform ($$) { params => $cgi, fieldsets => [ [main => gettext("main")], - [plugins => gettext("plugins")] ], action => $config{cgiurl}, template => {type => 'div'}, @@ -331,7 +360,7 @@ sub showform ($$) { @value=0; } - if (! $info{safe}) { + if (! $info{safe} || ! issafe($key)) { error("unsafe field $key"); # should never happen } diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm index accb03bbe..b24630b15 100644 --- a/IkiWiki/Plugin/wikitext.pm +++ b/IkiWiki/Plugin/wikitext.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 0, # format plugin rebuild => undef, + section => "format", }, } diff --git a/IkiWiki/Plugin/wmd.pm b/IkiWiki/Plugin/wmd.pm index 9ddd237ab..99b136281 100644 --- a/IkiWiki/Plugin/wmd.pm +++ b/IkiWiki/Plugin/wmd.pm @@ -4,7 +4,6 @@ package IkiWiki::Plugin::wmd; use warnings; use strict; use IkiWiki 3.00; -use POSIX; use Encode; sub import { @@ -17,6 +16,8 @@ sub getsetup () { return plugin => { safe => 1, + rebuild => 0, + section => "web", }, } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0c21455fb..796af6af2 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -167,6 +167,7 @@ sub scan ($) { else { $links{$page}=[]; } + delete $typedlinks{$page}; run_hooks(scan => sub { shift->( @@ -346,6 +347,8 @@ sub find_new_files ($) { my @new; my @internal_new; + my $times_noted; + foreach my $file (@$files) { my $page=pagename($file); if (exists $pagesources{$page} && $pagesources{$page} ne $file) { @@ -357,16 +360,33 @@ sub find_new_files ($) { if (isinternal($page)) { push @internal_new, $file; } - else { + elsif ($config{rcs}) { + if (! $times_noted) { + debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs})); + $times_noted=1; + } + push @new, $file; - if ($config{getctime} && -e "$config{srcdir}/$file") { + if ($config{gettime} && -e "$config{srcdir}/$file") { eval { - my $time=rcs_getctime("$config{srcdir}/$file"); - $pagectime{$page}=$time; + my $ctime=rcs_getctime("$config{srcdir}/$file"); + if ($ctime > 0) { + $pagectime{$page}=$ctime; + } }; if ($@) { print STDERR $@; } + my $mtime; + eval { + $mtime=rcs_getmtime("$config{srcdir}/$file"); + }; + if ($@) { + print STDERR $@; + } + elsif ($mtime > 0) { + utime($mtime, $mtime, "$config{srcdir}/$file"); + } } } $pagecase{lc $page}=$page; @@ -393,6 +413,7 @@ sub find_del_files ($) { push @del, $pagesources{$page}; } $links{$page}=[]; + delete $typedlinks{$page}; $renderedfiles{$page}=[]; $pagemtime{$page}=0; } @@ -494,6 +515,29 @@ sub remove_unrendered () { } } +sub link_types_changed ($$) { + # each is of the form { type => { link => 1 } } + my $new = shift; + my $old = shift; + + return 0 if !defined $new && !defined $old; + return 1 if !defined $new || !defined $old; + + while (my ($type, $links) = each %$new) { + foreach my $link (keys %$links) { + return 1 unless exists $old->{$type}{$link}; + } + } + + while (my ($type, $links) = each %$old) { + foreach my $link (keys %$links) { + return 1 unless exists $new->{$type}{$link}; + } + } + + return 0; +} + sub calculate_changed_links ($$$) { my ($changed, $del, $oldlink_targets)=@_; @@ -520,6 +564,14 @@ sub calculate_changed_links ($$$) { } $linkchangers{lc($page)}=1; } + + # we currently assume that changing the type of a link doesn't + # change backlinks + if (!exists $linkchangers{lc($page)}) { + if (link_types_changed($typedlinks{$page}, $oldtypedlinks{$page})) { + $linkchangers{lc($page)}=1; + } + } } return \%backlinkchanged, \%linkchangers; @@ -560,7 +612,7 @@ sub render_dependent ($$$$$$$) { if (exists $depends{$p} && ! defined $reason) { foreach my $dep (keys %{$depends{$p}}) { my $sub=pagespec_translate($dep); - next if $@ || ! defined $sub; + next unless defined $sub; # only consider internal files # if the page explicitly depends @@ -695,6 +747,17 @@ sub refresh () { } } +sub clean_rendered { + lockwiki(); + loadindex(); + remove_unrendered(); + foreach my $page (keys %oldrenderedfiles) { + foreach my $file (@{$oldrenderedfiles{$page}}) { + prune($config{destdir}."/".$file); + } + } +} + sub commandline_render () { lockwiki(); loadindex(); diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 8a25ecc57..06102058b 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -1,6 +1,8 @@ #!/usr/bin/perl -# Ikiwiki setup files are perl files that 'use IkiWiki::Setup::foo', -# passing it some sort of configuration data. +# Ikiwiki setup files can be perl files that 'use IkiWiki::Setup::foo', +# passing it some sort of configuration data. Or, they can contain +# the module name at the top, without the 'use', and the whole file is +# then fed into that module. package IkiWiki::Setup; @@ -10,24 +12,58 @@ use IkiWiki; use open qw{:utf8 :std}; use File::Spec; -sub load ($) { - my $setup=IkiWiki::possibly_foolish_untaint(shift); - $config{setupfile}=File::Spec->rel2abs($setup); +sub load ($;$) { + my $file=IkiWiki::possibly_foolish_untaint(shift); + my $safemode=shift; + + $config{setupfile}=File::Spec->rel2abs($file); #translators: The first parameter is a filename, and the second #translators: is a (probably not translated) error message. - open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!)); - my $code; + open (IN, $file) || error(sprintf(gettext("cannot read %s: %s"), $file, $!)); + my $content; { local $/=undef; - $code= || error("$setup: $!"); + $content= || error("$file: $!"); } - - ($code)=$code=~/(.*)/s; close IN; - eval $code; - error("$setup: ".$@) if $@; + if ($content=~/((?:use|require)\s+)?IkiWiki::Setup::(\w+)/) { + $config{setuptype}=$2; + if ($1) { + error sprintf(gettext("cannot load %s in safe mode"), $file) + if $safemode; + eval IkiWiki::possibly_foolish_untaint($content); + error("$file: ".$@) if $@; + } + else { + eval qq{require IkiWiki::Setup::$config{setuptype}}; + error $@ if $@; + "IkiWiki::Setup::$config{setuptype}"->loaddump(IkiWiki::possibly_foolish_untaint($content)); + } + } + else { + error sprintf(gettext("failed to parse %s"), $file); + } +} + +sub dump ($) { + my $file=IkiWiki::possibly_foolish_untaint(shift); + + eval qq{require IkiWiki::Setup::$config{setuptype}}; + error $@ if $@; + my @dump="IkiWiki::Setup::$config{setuptype}"->gendump( + "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.", + ); + + open (OUT, ">", $file) || die "$file: $!"; + print OUT "$_\n" foreach @dump; + close OUT; } sub merge ($) { @@ -77,7 +113,6 @@ sub merge ($) { sub getsetup () { # Gets all available setup data from all plugins. Returns an # ordered list of [plugin, setup] pairs. - my @ret; # disable logging to syslog while dumping, broken plugins may # whine when loaded @@ -85,38 +120,116 @@ sub getsetup () { $config{syslog}=undef; # Load all plugins, so that all setup options are available. - my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins()); - unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st + my @plugins=IkiWiki::listplugins(); foreach my $plugin (@plugins) { eval { IkiWiki::loadplugin($plugin) }; if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) { my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() }; } } - + + my %sections; foreach my $plugin (@plugins) { if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) { # use an array rather than a hash, to preserve order my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() }; next unless @s; - push @ret, [ $plugin, \@s ], + + # set default section value (note use of shared + # hashref between array and hash) + my %s=@s; + if (! exists $s{plugin} || ! $s{plugin}->{section}) { + $s{plugin}->{section}="other"; + } + + # only the selected rcs plugin is included + if ($config{rcs} && $plugin eq $config{rcs}) { + $s{plugin}->{section}="core"; + } + elsif ($s{plugin}->{section} eq "rcs") { + next; + } + + push @{$sections{$s{plugin}->{section}}}, [ $plugin, \@s ]; } } $config{syslog}=$syslog; - return @ret; + return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} } + sort { # core first, other last, otherwise alphabetical + ($b eq "core") <=> ($a eq "core") + || + ($a eq "other") <=> ($b eq "other") + || + $a cmp $b + } keys %sections; } -sub dump ($) { - my $file=IkiWiki::possibly_foolish_untaint(shift); +sub commented_dump ($$) { + my $dumpline=shift; + my $indent=shift; + + my %setup=(%config); + my @ret; - require IkiWiki::Setup::Standard; - my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki."); + # disable logging to syslog while dumping + $config{syslog}=undef; - open (OUT, ">", $file) || die "$file: $!"; - print OUT "$_\n" foreach @dump; - close OUT; + eval q{use Text::Wrap}; + die $@ if $@; + + my %section_plugins; + push @ret, commented_dumpvalues($dumpline, $indent, \%setup, IkiWiki::getsetup()); + foreach my $pair (IkiWiki::Setup::getsetup()) { + my $plugin=$pair->[0]; + my $setup=$pair->[1]; + my %s=@{$setup}; + my $section=$s{plugin}->{section}; + push @{$section_plugins{$section}}, $plugin; + if (@{$section_plugins{$section}} == 1) { + push @ret, "", $indent.("#" x 70), "$indent# $section plugins", + sub { + wrap("$indent# (", "$indent# ", + join(", ", @{$section_plugins{$section}})).")" + }, + $indent.("#" x 70); + } + + my @values=commented_dumpvalues($dumpline, $indent, \%setup, @{$setup}); + if (@values) { + push @ret, "", "$indent# $plugin plugin", @values; + } + } + + return map { ref $_ ? $_->() : $_ } @ret; +} + +sub commented_dumpvalues ($$$@) { + my $dumpline=shift; + my $indent=shift; + my $setup=shift; + my @ret; + while (@_) { + my $key=shift; + my %info=%{shift()}; + + next if $key eq "plugin" || $info{type} eq "internal"; + + push @ret, "$indent# ".$info{description} if exists $info{description}; + + if (exists $setup->{$key} && defined $setup->{$key}) { + push @ret, $dumpline->($key, $setup->{$key}, $info{type}, ""); + delete $setup->{$key}; + } + elsif (exists $info{example}) { + push @ret, $dumpline->($key, $info{example}, $info{type}, "#"); + } + else { + push @ret, $dumpline->($key, "", $info{type}, "#"); + } + } + return @ret; } 1 diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 9fee4dcb7..2dcb424e5 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -38,19 +38,22 @@ sub sanitize_wikiname ($) { sub import (@) { my $this=shift; + $config{setuptype}='Standard'; IkiWiki::Setup::merge({@_}); - # Avoid overwriting any existing files. - foreach my $key (qw{srcdir destdir repository dumpsetup}) { - next unless exists $config{$key}; - my $add=""; - my $dir=IkiWiki::dirname($config{$key})."/"; - my $base=IkiWiki::basename($config{$key}); - while (-e $dir.$add.$base) { - $add=1 if ! $add; - $add++; + if (! $config{force_overwrite}) { + # Avoid overwriting any existing files. + foreach my $key (qw{srcdir destdir repository dumpsetup}) { + next unless exists $config{$key}; + my $add=""; + my $dir=IkiWiki::dirname($config{$key})."/"; + my $base=IkiWiki::basename($config{$key}); + while (-e $dir.$add.$base) { + $add=1 if ! $add; + $add++; + } + $config{$key}=$dir.$add.$base; } - $config{$key}=$dir.$add.$base; } # Set up wrapper @@ -69,9 +72,15 @@ sub import (@) { } elsif ($config{rcs} eq 'bzr') { # TODO + print STDERR "warning: do not know how to set up the bzr_wrapper hook!\n"; } elsif ($config{rcs} eq 'mercurial') { # TODO + print STDERR "warning: do not know how to set up the mercurial_wrapper hook!\n"; + } + elsif ($config{rcs} eq 'tla') { + # TODO + print STDERR "warning: do not know how to set up the tla_wrapper hook!\n"; } elsif ($config{rcs} eq 'cvs') { $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit"; @@ -121,9 +130,10 @@ sub import (@) { IkiWiki::run_hooks(checkconfig => sub { shift->() }); }; if ($@) { + my $err=$@; print STDERR sprintf(gettext("** Disabling plugin %s, since it is failing with this message:"), $plugin)."\n"; - print STDERR "$@\n"; + print STDERR "$err\n"; push @{$bakconfig{disable_plugins}}, $plugin; } } @@ -142,7 +152,7 @@ sub import (@) { # Create admin user(s). foreach my $admin (@{$config{adminuser}}) { - next if $admin=~/^http\?:\/\//; # openid + next if defined IkiWiki::openiduser($admin); # Prompt for password w/o echo. my ($password, $password2); diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 951bcfc56..c85069304 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -1,7 +1,4 @@ #!/usr/bin/perl -# Standard ikiwiki setup module. -# Parameters to import should be all the standard ikiwiki config stuff, -# plus an array of wrappers to set up. package IkiWiki::Setup::Standard; @@ -9,10 +6,22 @@ use warnings; use strict; use IkiWiki; +# Parameters to import should be all the standard ikiwiki config, in a hash. sub import { IkiWiki::Setup::merge($_[1]); } +sub gendump ($@) { + my $class=shift; + + "#!/usr/bin/perl", + "#", + (map { "# $_" } @_), + "use IkiWiki::Setup::Standard {", + IkiWiki::Setup::commented_dump(\&dumpline, "\t"), + "}" +} + sub dumpline ($$$$) { my $key=shift; my $value=shift; @@ -57,61 +66,4 @@ sub dumpline ($$$$) { return "\t$prefix$key => $dumpedvalue,"; } -sub dumpvalues ($@) { - my $setup=shift; - my @ret; - while (@_) { - my $key=shift; - my %info=%{shift()}; - - next if $key eq "plugin" || $info{type} eq "internal"; - - push @ret, "\t# ".$info{description} if exists $info{description}; - - if (exists $setup->{$key} && defined $setup->{$key}) { - push @ret, dumpline($key, $setup->{$key}, $info{type}, ""); - delete $setup->{$key}; - } - elsif (exists $info{example}) { - push @ret, dumpline($key, $info{example}, $info{type}, "#"); - } - else { - push @ret, dumpline($key, "", $info{type}, "#"); - } - } - return @ret; -} - -sub gendump ($) { - my $description=shift; - my %setup=(%config); - my @ret; - - # disable logging to syslog while dumping - $config{syslog}=undef; - - push @ret, dumpvalues(\%setup, IkiWiki::getsetup()); - foreach my $pair (IkiWiki::Setup::getsetup()) { - my $plugin=$pair->[0]; - my $setup=$pair->[1]; - my @values=dumpvalues(\%setup, @{$setup}); - if (@values) { - push @ret, "", "\t# $plugin plugin", @values; - } - } - - unshift @ret, - "#!/usr/bin/perl", - "# $description", - "#", - "# 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 {"; - push @ret, "}"; - - return @ret; -} - 1 diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm new file mode 100644 index 000000000..904784728 --- /dev/null +++ b/IkiWiki/Setup/Yaml.pm @@ -0,0 +1,50 @@ +#!/usr/bin/perl + +package IkiWiki::Setup::Yaml; + +use warnings; +use strict; +use IkiWiki; + +sub loaddump ($$) { + my $class=shift; + my $content=shift; + + eval q{use YAML::Any}; + eval q{use YAML} if $@; + die $@ if $@; + $YAML::Syck::ImplicitUnicode=1; + IkiWiki::Setup::merge(Load($content)); +} + +sub gendump ($@) { + my $class=shift; + + "# IkiWiki::Setup::Yaml - YAML formatted setup file", + "#", + (map { "# $_" } @_), + "#", + IkiWiki::Setup::commented_dump(\&dumpline, "") +} + + +sub dumpline ($$$$) { + my $key=shift; + my $value=shift; + my $type=shift; + my $prefix=shift; + + eval q{use YAML::Old}; + eval q{use YAML} if $@; + die $@ if $@; + $YAML::UseHeader=0; + + my $dump=Dump({$key => $value}); + chomp $dump; + if (length $prefix) { + $dump=join("\n", map { $prefix.$_ } split(/\n/, $dump)); + } + return $dump; +} + +1 diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 5427a5c80..3f3e63ca6 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -76,8 +76,8 @@ EOF { int fd=open("$config{wikistatedir}/cgilock", O_CREAT | O_RDWR, 0666); if (fd != -1 && flock(fd, LOCK_EX) == 0) { - char *fd_s; - asprintf(&fd_s, "%i", fd); + char *fd_s=malloc(8); + sprintf(fd_s, "%i", fd); setenv("IKIWIKI_CGILOCK_FD", fd_s, 1); } } @@ -105,7 +105,7 @@ extern char **environ; char *newenviron[$#envsave+6]; int i=0; -addenv(char *var, char *val) { +void addenv(char *var, char *val) { char *s=malloc(strlen(var)+1+strlen(val)+1); if (!s) perror("malloc"); @@ -121,8 +121,18 @@ $check_commit_hook $envsave newenviron[i++]="HOME=$ENV{HOME}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; + +#ifdef __TINYC__ + if (clearenv() != 0) { + perror("clearenv"); + exit(1); + } + for (; i>0; i--) + putenv(newenviron[i-1]); +#else newenviron[i]=NULL; environ=newenviron; +#endif if (setregid(getegid(), -1) != 0 && setregid(getegid(), -1) != 0) { diff --git a/Makefile.PL b/Makefile.PL index 462f7364d..38db20d44 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -28,15 +28,17 @@ W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) +outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out +scripts=ikiwiki-update-wikilist ikiwiki-makerepo -ikiwiki.out: ikiwiki.in - ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out - chmod +x ikiwiki.out +%.out: %.in + ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@ + chmod +x $@ ikiwiki.setup: ikiwiki.out HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup -extra_build: ikiwiki.out ikiwiki.setup docwiki +extra_build: $(outprogs) ikiwiki.setup docwiki ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man @@ -51,8 +53,8 @@ docwiki: ikiwiki.out $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh extra_clean: - rm -rf html doc/.ikiwiki - rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc + $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean + rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc $(MAKE) -C po clean underlay_install: @@ -115,8 +117,9 @@ extra_install: underlay_install install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN) install -d $(DESTDIR)$(PREFIX)/bin - install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki - install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist ikiwiki-calendar $(DESTDIR)$(PREFIX)/bin/ + for prog in $(outprogs) $(scripts); do \ + install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | sed 's/\.out//'); \ + done $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) diff --git a/README b/README index a4dc0d641..7efc59a51 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ All other documentation is in the ikiwiki documentation wiki, which is also available online at -A few special variables you can set while using the Makefile: +A few special variables you can set while using the Makefile.PL: PROFILE=1 turns on profiling for the build of the doc wiki. (Uses Devel::NYTProf) diff --git a/auto-blog.setup b/auto-blog.setup index 82aa8d415..ef03295d6 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments blogspam}], + add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, @@ -46,5 +46,9 @@ IkiWiki::Setup::Automator->import( example => "blog", comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", + archive_pagespec => "posts/* and !*/Discussion", + global_sidebars => 0, discussion => 0, + locked_pages => "*", + tagbase => "tags", ) diff --git a/debian/NEWS b/debian/NEWS index 50332670f..25ebed0b4 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,20 @@ +ikiwiki (3.20100406) unstable; urgency=low + + The title_natural sort method (as used by the inline directive, etc) + have been moved to the new sortnaturally plugin, which is not enabled + by default since it requires the Sort::Naturally perl module. + + Starting from this version, the `tagged()` pagespec only matches tags, + not regular wikilinks. If your wiki accidentially relied on the old, + buggy behavior, you might need to change pagespecs to use `link()`. + + Due to the above and other changes, all wikis need to be rebuilt on + upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist + this will be done automatically when the Debian package is upgraded. Or + use ikiwiki-mass-rebuild to force a rebuild. + + -- Simon McVittie Tue, 06 Apr 2010 20:53:07 +0100 + ikiwiki (3.20091017) unstable; urgency=low To take advantage of significant performance improvements, all diff --git a/debian/changelog b/debian/changelog index 8e01950a8..01d650290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,163 @@ -ikiwiki (3.20100123) UNRELEASED; urgency=low +ikiwiki (3.20100415) UNRELEASED; urgency=low + + [ Joey Hess ] + * bzr: Fix bzr log parsing to work with bzr 2.0. (liw) + * comments: Fix missing entity encoding in title. + * txt: Add a special case for robots.txt. + + [ Simon McVittie ] + * Add support for link types, and make the the tagged() pagespec only + match tags, not regular links (a bugfix). + * Rebuild wikis on upgrade to this version to get tag link types recorded + correctly. + * Revamp sorting system; allow new sort methods to be added by plugins, + and add a "sortspec" syntax that can combine, reverse, etc sort methods. + * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting + by metadata. + * meta: Add optional sortas parameter to author and title meta directives. + This can be used to get names sorted by last name without displaying + them last name first. + * sortnaturally: New plugin; the title_natural sort method has moved here. + * meta: store fields consistently unescaped, and escape on use. + (A wiki rebuild is also needed due to this change.) + + [ Joey Hess ] + * Update dependency for git-core to git transition. + * po: Check that translated underlay directories exist before using them + for master language. + * po: Configuring the same language as master and slave confuses processing; + so filter out such a misconfiguration. + * calendar: Add archive_pagespec, which is used by ikiwiki-calendar to + specify which pages to include on the calendar archive pages. + (The pagespec can still also be specified on the ikiwiki-calendar command + line.) + * pagestats: Class parameter can be used to override default class for + custom styling. + * pagestats: Use style=list to get a list of tags, scaled by use like + in a tag cloud. This is useful to put in a sidebar. + * Rework example blog front page. + * CSS and templates for sidebar changed to use a class, not an id. + * sidebar: Now a sidebar directive can be used to override the sidebar + shown on a page. + * Enable calendar and sidebar in auto-blog.setup. + * sidebar: Add global_sidebars setting. + * conditional: Fix bug that forced "all" mode off by default. + * calendarmonth.tmpl: The month calendar is now put in a sidebar. + * calendar: Improved display of arrows. + * Rename --getctime to --gettime. (The old name still works for + backwards compatability.) + * --gettime now also looks up last modification time. + * Automatically run --gettime the first time ikiwiki is run on + a given srcdir. (Use --no-gettime to disable.) + * Add rcs_getmtime to plugin API; currently only implemented + for git and svn. + * Optimise --gettime for git, so it's appropriatly screamingly + fast. (This could be done for most other backends too.) + * However, --gettime for git no longer follows renames. That would + be slow, and whether a renamed wiki page is the same page is really + an iffy thing. + * Use above to fix up timestamps on docwiki, as well as ensure that + timestamps on basewiki files shipped in the deb are sane. + * autoindex: Switch to using %wikistate instead of abusing + $pagestate{index}. + + -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 + +ikiwiki (3.20100403) unstable; urgency=low + + * websetup: Add websetup_unsafe to allow marking other settings + as unsafe. + * Improve openid url munging; do not display anchors and cgi parameters, + as used by yahoo and google urls. + * Add complete German basewiki and directives translation done by + Sebastian Kuhnert. + * Add a include setting, which can be used to make ikiwiki process + wiki source files, such as .htaccess, that would normally be skipped + for security or other reasons. Closes: #447267 + (Thanks to Aaron Wilson for the original patch.) + * Add support for setup files written in YAML. + * Add --set-yaml switch for setting more complex config file options. + * filecheck: Fix bugs that prevented the pagespecs from matching when + not called by attachment plugin. + * Fix incorrect influence info returned by a failing link() pagespec, + that could lead to bad dependency handling in certian situations. + * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar + if necessary for unusual install. + * auto-blog.setup: Set tagbase by default, since most bloggers will want it. + * Allow wrappers to be built using tcc. (Workaround #452876) + * openid: Use Openid Simple Registration or OpenID Attribute Exchange + to get the user's email address and username. (Neither is yet + used, but they are available in the session object now.) + * page.tmpl: Add Cache-Control must-revalidate to ensure that users + (especially of Firefox) see fresh page content. + * htmlscrubber: Allow colons in urls after '?' + * template: Search for templates in the templatedir, if they are not + found as pages in the wiki. + + -- Joey Hess Sat, 03 Apr 2010 14:17:28 -0400 + +ikiwiki (3.20100312) unstable; urgency=HIGH + + * Fix utf8 issues in calls to md5_hex. + * moderatedcomments: Added moderate_pagespec that can be used + to control which users or comment locations are moderated. + This can be used, just for example, to moderate "user(http://myopenid.com/*)" + if you're getting a lot of spammers from one particular openid + provider (who should perhaps answer your emails about them), + while not moderating other users. + * moderatedcomments: The moderate_users setting is deprecated. Instead, + set moderate_pagespec to "!admin()" or "user(*)". + * Fix missing span on recentchanges page template. + * search: Avoid '$' in the wikiname appearing unescaped on omega's + query template, where it might crash omega. + * htmlscrubber: Security fix: In data:image/* uris, only allow a few + whitelisted image types. No svg. + + -- Joey Hess Tue, 09 Mar 2010 19:46:35 -0500 + +ikiwiki (3.20100302) unstable; urgency=low + + * comments: Display number of comments in comment action link. + * Rebuild wikis on upgrade to this version to get the comment counts + added to existing pages. + * Loosen regexp, to allow empty quoted parameters in directives. + * Add force_overwrite setting to make setup automator overwrite existing + files/directories. + * Fix admin openid detection in setup automator, and avoid prompting + for a password. + * Add new --clean option; this makes ikiwiki remove all built + files in the destdir, as well as wrappers and the .ikiwiki directory. + + -- Joey Hess Tue, 02 Mar 2010 22:17:30 -0500 + +ikiwiki (3.20100212) unstable; urgency=low * template: Preprocess parameters before htmlizing. * img: Fix a bug that could taint @links with undef values. * setup automator: Configure Term::Readline to use bold for prompt, rather than default underline. Closes: #517656 - - -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 + * Allow jumping directly into account registration process by going to + ikiwiki.cgi?do=register + * Improve display of openid in preferences page. + * Add link to userpage (or creation link) to top of preferences page. + * opendiscussion: This plugin will also now allow posting comments + to otherwise locked-down sites. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default, and enable opendiscussion so others can comment. + * Fix color and format plugins to appear in the websetup interface. + * amazon_s3: Fix to support the EU S3 datacenter, which is more picky + about attempts to create already existing buckets. + * httpauth: When cgiauthurl is configured, httpauth can now be used + alongside other authentication methods (like openid or anonok). Rather + than always redirect to the cgiauthurl for authentication, there is now + a button on the login form to use it. + * httpauth: Add httpauth_pagespec setting that can be used to limit + pages to only being edited via users authed with httpauth. + * Allow globs to be used in user() pagespecs. + * Group related plugins into sections in the setup file, and drop + unused rcs plugins from the setup file. + + -- Joey Hess Fri, 12 Feb 2010 16:45:50 -0500 ikiwiki (3.20100122) unstable; urgency=low diff --git a/debian/control b/debian/control index 172e1b23d..ae06f32b0 100644 --- a/debian/control +++ b/debian/control @@ -7,10 +7,10 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34), - libfile-chdir-perl + libfile-chdir-perl, Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libhtml-parser-perl, liburi-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, - subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, + subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), @@ -35,24 +35,24 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, - sparkline-php, texlive, dvipng, libtext-wikicreole-perl, + libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, - po4a (>= 0.35-1), gettext + po4a (>= 0.35-1), gettext, libyaml-perl Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table Description: a wiki compiler - ikiwiki converts a directory full of wiki pages into HTML pages suitable + Ikiwiki converts a directory full of wiki pages into HTML pages suitable for publishing on a website. Unlike many wikis, ikiwiki does not have its own ad-hoc means of storing page history, and instead uses a revision control system such as Subversion or Git. . - ikiwiki implements all of the other standard features of a wiki, including + Ikiwiki implements all of the other standard features of a wiki, including web-based page editing, user registration and logins, a RecentChanges page, BackLinks, search, Discussion pages, tags, smart merging and conflict resolution, and page locking. . - ikiwiki also supports generating news feeds (RSS and Atom) and blogging. + Ikiwiki also supports generating news feeds (RSS and Atom) and blogging. ikiwiki provides a plugin system which allows many other features to be added. Some of the plugins have additional dependencies, found among the Recommends and Suggests of this package. diff --git a/debian/copyright b/debian/copyright index 050a4dd61..ad72a0459 100644 --- a/debian/copyright +++ b/debian/copyright @@ -163,6 +163,7 @@ Copyright: 2007 Cyril Brulebois 2007 Daniel Nylander 2009 Fernando González de Requena + 2010 Sebastian Kuhnert License: Redistribution and use in source and compiled forms, with or without modification, are permitted under any circumstances. No warranty. diff --git a/debian/postinst b/debian/postinst index bf1825ab7..fa0591153 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=3.20091010 +firstcompat=3.20100410 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/doc/bugs/404_plugin_and_lighttpd.mdwn b/doc/bugs/404_plugin_and_lighttpd.mdwn new file mode 100644 index 000000000..ffbad8add --- /dev/null +++ b/doc/bugs/404_plugin_and_lighttpd.mdwn @@ -0,0 +1,35 @@ +Lighttpd apparently sets REDIRECT_STATUS=200 for the server.error-handler-404 page. This breaks the 404 plugin which checks this variable for 404 before processing the URI. It also doesn't seem to set REDIRECT_URL. + +I was able to fix my server to check the REQUEST_URI for ikiwiki.cgi and to continue processing if it was not found, passing $ENV{SEVER_NAME} . $ENV{REQUEST_URI} as the first parameter to cgi_page_from_404. However, my perl is terrible and I just made it work rather than figuring out exactly what to do to get it to work on both lighttpd and apache. + +This is with lighttpd 1.4.19 on Debian. + +> /cgi-bin/ikiwiki.cgi?do=goto also provides redirection in the same way, +> if that's any help? You might need to set the lighttpd 404 handler to +> that, then compose REDIRECT_URL from other variables if necessary. +> +> I originally wrote the plugin for Apache; [[weakish]] contributed the +> lighttpd docs and might know more about how to make it work there. +> --[[smcv]] + +>> As I said, I got it working for me, but somebody who knows perl should probably look at it with the aim of making it work for everyone. +>> I considered having lighttpd construct a proper url for the 404 redirect itself, but I don't know if it can do something like that or not. +>> For what it's worth, here's the change I made to the module: + + sub cgi ($) { + my $cgi=shift; + if ($ENV{REQUEST_URI} !~ /ikiwiki\.cgi/) { + my $page = cgi_page_from_404( + Encode::decode_utf8($ENV{SERVER_NAME} . $ENV{REQUEST_URI}), + $config{url}, $config{usedirs}); + IkiWiki::Plugin::goto::cgi_goto($cgi, $page); + } + + # if (exists $ENV{REDIRECT_STATUS} && + # $ENV{REDIRECT_STATUS} eq '404') { + # my $page = cgi_page_from_404( + # Encode::decode_utf8($ENV{REDIRECT_URL}), + # $config{url}, $config{usedirs}); + # IkiWiki::Plugin::goto::cgi_goto($cgi, $page); + # } + } diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn new file mode 100644 index 000000000..7ff1a012f --- /dev/null +++ b/doc/bugs/Comments_dissapeared.mdwn @@ -0,0 +1,35 @@ +Although I have comments enabled and I have been using them successfully for ages now, I've come to notice that they have stopped working in the last week or two. + +I am running version 3.20100312 with the following configuration: + + + +In my (HTML5 modified page.tmpl) it doesn't seem to enter the "TMPL_IF COMMENTS" block anymore. I tried the stock page.tmpl and they didn't seem to work either, so the variable name hasn't changed has it? + +Any other ideas? With thanks, + + comments_pagespec => 'archives/* and !*/Discussion', + +> Your setup file only allows comments to pages under archives. That +> seems unlikely to be right, so I guess it is causing your problem. +> --[[Joey]] + +That's the only place where I want comments. +Has the pagespec changed? Is it `archives/*/*` or something like that? + +It worked just fine with this configuration. I swear I have not modified it. :) -- [[Kai Hendry]] + +> No changes that I can think of. 'archives/*' will match *all* pages under +> archives. Anyway, I can see in your site's rss feed that comments are +> enabled for posts, since they have comments tags there. And +> in fact I see comments on eg +> . +> +> So I suspect you have simply not rebuilt your wiki after making some +> change that fixed the comments, and so only newer pages are getting them. +> --[[Joey]] + +I have tried rebuilding on my squeeze system and still comments don't appear. Any clues how to debug this? + + +I was worried is was due to a time skew problem I was experiencing on my VPS in the last month, though the time is right now and still comments do not appear on blog posts like diff --git a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn index 046d6e10d..b993cd8e7 100644 --- a/doc/bugs/Error:_Your_login_session_has_expired._.mdwn +++ b/doc/bugs/Error:_Your_login_session_has_expired._.mdwn @@ -41,4 +41,6 @@ Whilst trying to edit http://hugh.vm.bytemark.co.uk/ikiwiki.cgi via OpenID. Any Thanks for you excellent analysis. The bug was due to old pre-3.0 **templates** laying about. After deleting them, ikiwiki defaults to its own templates. Clever. :-) +Great, this saved me big time! It is a google 1st hit. I had the same with accidentally using old templates. Thanks! --[[cstamas]] + [[bugs/done]] diff --git a/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn new file mode 100644 index 000000000..189ba740f --- /dev/null +++ b/doc/bugs/Exception:_Unknown_function___96__this__39___.mdwn @@ -0,0 +1,70 @@ +I'm very excited to try out ikiwiki, since it should fit my purposes extremely well, but I'm having trouble with the search plugin. I'm pretty sure that right after I installed ikiwiki and needed dependencies, the search plugin was working fine. However, now when I try to use search, I get "Exception: Unknown function `this'" error on a blank page. I'm not sure how I should go about debugging this issue - my server's (I use Lighttpd 1.4.22) error log has no mention of the exception and there's nothing in /var/log/syslog either. + +What might be causing this exception and how I might go about debugging exceptions? + +> Appears to be coming from your xapian omega cgi binary. If you +> run `strings /usr/lib/cgi-bin/omega/omega` you can see it has +> "Exception: " in it, and I have found some similar (but not identical) +> error messages from xapian in a web search. +> +> I don´t know what to suggest, other than upgrade/downgrade/reinstall +> xapian-omega, and contacting the xapian developers for debugging. +> You could try rebuilding your wiki in case it is somehow +> caused by a problem with the xapian database. Failing everything, you +> could switch to [[google_search_plugin|plugins/google]]. --[[Joey]] + +>> Thanks, Joey. With your help I was able to figure out what was wrong. It's a fun little bug (or feature): the title of my wiki had string `$this` in title and that's what was causing the omega binary to choke. My wiki's title was inserted without escaping into the query template used by omega. Omega treated `$this` in the title as a function name and threw an exception because no such function was defined. To avoid this behavior, I used an html entity in the title, so `$this` became `$this`. I don't think that the wiki title should be inserted into the template without escaping - it can produce an error that's not trivial to debug. If users want to modify the html in the title, they should be editing respective templates, not typing html in the wiki title input. What do you think? --[[dkobozev]] + +>>> Sounds like a bug in omega, and one that probably would affect other +>>> users of omega too. Ikiwiki could work around it by pre-escaping +>>> data before passing it to xapian. I have not quite managed to reproduce it though; +>>> tried setting a page title to '$this' and 'foo $this'. +>>> That's with version 1.0.18 of omega. +>>> --[[Joey]] + +>>>> I tried it with both omega 1.0.13 and omega 1.0.18 and the issue is present in both. If I view the contents of {$srcdir}/.ikiwiki/xapian/templates/query, I can see that the wiki title is inserted verbatim and there are calls to `$setmap`, `$set` and `$def` etc in the template. --[[dkobozev]] + +>>>>> I don't see how that's relevant. It would help if you showed me +>>>>> exactly something that could be inserted into a page to cause the +>>>>> problem. --[[Joey]] + +>>>>>> Correct me if I'm wrong: ikiwiki generates an Omega template from its own templates, such as searchquery.tmpl and puts it into {$srcdir}/.ikiwiki/xapian/templates/query. Omega has its own template syntax, where function names are prefixed with dollar signs (`$`). So, when I call my wiki `$foobar`, ikiwiki generates an Omega template that looks like this snippet: + +
+
+
+ + $foobar/search + +
+
+ +
+ $setmap{prefix,title,S} + $setmap{prefix,link,XLINK} + $set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} + ${ + $def{PREV, + $if{$ne{$topdoc,0},, + } + +>>>>>> So `$foobar` clashes with Omega's template tags. Does this help? + +>>>>>>> Ahh. I had somehow gotten it into my head that you were talking +>>>>>>> about the title of a single page, not of the whole wiki. But +>>>>>>> you were clear all along it was the wiki title. Sorry for +>>>>>>> misunderstanding. I've put in a complete fix for this problem. +>>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] + +>>>>>>>> Rather than escaping `$` as an HTML entity, it would be more natural +>>>>>>>> to escape it as `$$` (since you are escaping it for Omega, not for +>>>>>>>> the web browser. +>>>>>>>> +>>>>>>>> Also if ikiwiki can put arbitrary text inside the parameters of an +>>>>>>>> OmegaScript command, you should also escape `{`, `}` and `,` as +>>>>>>>> `$(`, `$)` and `$.`. It's only necessary to do so inside the +>>>>>>>> parameters of a command, but it will work and be easier to escape +>>>>>>>> them in any substituted text. --OllyBetts + +[[done]] diff --git a/doc/bugs/External_links_with_Creole.mdwn b/doc/bugs/External_links_with_Creole.mdwn new file mode 100644 index 000000000..3d800b04e --- /dev/null +++ b/doc/bugs/External_links_with_Creole.mdwn @@ -0,0 +1,3 @@ +When using Creole for markup, creating an external link appears to be impossible. Neither \[[Outside URL|http://example.com]] nor <> nor \[Outside URL]\(http://example.com) work. The first gets rendered as a broken WikiLink, the second get eaten and the last is not parsed in anyway so you end up with that exact text in your page. + +I'd have made this as a Creole page as a practical demonstration, but that doesn't seem possible here. Here's a page with an example: diff --git a/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn new file mode 100644 index 000000000..39d57a4fe --- /dev/null +++ b/doc/bugs/Tab_delimited_tables_don__39__t_work.mdwn @@ -0,0 +1,22 @@ +Table directive should support tab-delimited data, especially important since this is the format you will get if copy/pasting from an HTML table or spreadsheet (Gnumeric, OO Calc, Excel). Test case which fails: + +[[!table format=dsv delimiter="\t" data=""" +1 2 +2 4 +"""]] + +> They do work, but C-style backslash escapes aren't recognised, +> so the syntax `delimiter="\t"` (as in your test case) looks +> for the literal string `\t`. Replacing `\t` with a literal +> tab character makes it work - here's a test (I changed the data +> to make the table layout more obvious): +> +> [[!table format=dsv delimiter=" " data=""" +left 2 +2 right +alpha beta +"""]] +> +> So, I think this can be considered [[not_a_bug|done]]? --[[smcv]] + +>> I've clarified the documentation. --[[smcv]] diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn index 0a62164cb..bff37e18b 100644 --- a/doc/bugs/anonok_vs._httpauth.mdwn +++ b/doc/bugs/anonok_vs._httpauth.mdwn @@ -58,3 +58,61 @@ and a whitelist of OpenIDs in `locked_pages`...) >> On reflection, I've stopped being bothered by the >> redirect-to-signin-page approach. (It only needs to happen once per >> browser session, anyway.) Can we try that? --[[schmonz]] + +Here is an attempt. With this httpauth will only redirect to the +`cgiauth_url` when a page is edited, and it will defer to other plugins +like anonok first. I have not tested this. --[[Joey]] + +
+diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
+index 127c321..a18f8ca 100644
+--- a/IkiWiki/Plugin/httpauth.pm
++++ b/IkiWiki/Plugin/httpauth.pm
+@@ -9,6 +9,8 @@ use IkiWiki 3.00;
+ sub import {
+ 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+ 	hook(type => "auth", id => "httpauth", call => \&auth);
++	hook(type => "canedit", id => "httpauth", call => \&canedit,
++		last => 1);
+ }
+ 
+ sub getsetup () {
+@@ -33,9 +35,21 @@ sub auth ($$) {
+ 	if (defined $cgi->remote_user()) {
+ 		$session->param("name", $cgi->remote_user());
+ 	}
+-	elsif (defined $config{cgiauthurl}) {
+-		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+-		exit;
++}
++
++sub canedit ($$$) {
++	my $page=shift;
++	my $cgi=shift;
++	my $session=shift;
++
++	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
++		return sub {
++			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
++			exit;
++		};
++	}
++	else {
++		return undef;
+ 	}
+ }
+ 
+
+ +> With `anonok` enabled, this works for anonymous editing of an +> existing Discussion page. auth is still needed to create one. --[[schmonz]] + +>> Refreshed above patch to fix that. --[[Joey]] + +>> Remaining issue: This patch will work with anonok, but not openid or +>> passwordauth, both of which want to display a login page at the same +>> time that httpauth is redirecting to the cgiauthurl. As mentioned above, +>> the only way to deal with that would be to add a link to the signin page +>> that does the httpauth signin. --[[Joey]] + +>>> That's dealt with in final version. [[done]] --[[Joey]] diff --git a/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn b/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn index 42e6b9e27..c3cbff43e 100644 --- a/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn +++ b/doc/bugs/barfs_on_recentchange_entry_for_a_change_removing_an_invalid_pagespec.mdwn @@ -39,3 +39,6 @@ a year ago in September 2007. > ikiwiki. (Doesn't quite seem to be version 2.53.x either) Try with a current > version, and see if you can send me a source tree that can reproduce the > problem? --[[Joey]] + +Did not hear back, so calling this [[done]], unless I hear differently. +--[[Joey]] diff --git a/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn new file mode 100644 index 000000000..39500af20 --- /dev/null +++ b/doc/bugs/bzr_2.0_breaks_bzr_plugin.mdwn @@ -0,0 +1,87 @@ +Version 2.0 of bzr seems to break the bzr plugin. + +I traced this to the bzr_log method in the plugin, and patching that seems to fix it. The plugin just needs to parse the input little bit differently. +--liw + +> Patch applied, [[done]] (but, it would be good if it could be tested with +> an older bzr, and it's a pity bzr's human-targeted log has to be parsed, +> I assume there is no machine-targeted version?) --[[Joey]] + + From fb897114124e627fd3acf5af8e784c9a77419a81 Mon Sep 17 00:00:00 2001 + From: Lars Wirzenius + Date: Sun, 4 Apr 2010 21:05:07 +1200 + Subject: [PATCH] Fix bzr plugin to work with bzr 2.0. + + The output of "bzr log" seems to have changed a bit, so we change the + parsing accordingly. This has not been tested with earlier versions of + bzr. + + Several problems seemed to occur, all in the bzr_log subroutine: + + 1. The @infos list would contain an empty hash, which would confuse the + rest of the program. + 2. This was because bzr_log would push an empty anonymous hash to the + list whenever it thought a new record would start. + 3. However, a new record marker (now?) also happens at th end of bzr log + output. + 4. Now we collect the record to a hash that gets pushed to the list only + if it is not empty. + 5. Also, sometimes bzr log outputs "revno: 1234 [merge]", so we catch only + the revision number. + 6. Finally, there may be non-headers at the of the output, so we ignore + those. + --- + IkiWiki/Plugin/bzr.pm | 23 ++++++++++++++++------- + 1 files changed, 16 insertions(+), 7 deletions(-) + + diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm + index 1ffdc23..e813331 100644 + --- a/IkiWiki/Plugin/bzr.pm + +++ b/IkiWiki/Plugin/bzr.pm + @@ -73,28 +73,37 @@ sub bzr_log ($) { + my @infos = (); + my $key = undef; + + + my $hash = {}; + while (<$out>) { + my $line = $_; + my ($value); + if ($line =~ /^message:/) { + $key = "message"; + - $infos[$#infos]{$key} = ""; + + $$hash{$key} = ""; + } + elsif ($line =~ /^(modified|added|renamed|renamed and modified|removed):/) { + $key = "files"; + - unless (defined($infos[$#infos]{$key})) { $infos[$#infos]{$key} = ""; } + + unless (defined($$hash{$key})) { $$hash{$key} = ""; } + } + elsif (defined($key) and $line =~ /^ (.*)/) { + - $infos[$#infos]{$key} .= "$1\n"; + + $$hash{$key} .= "$1\n"; + } + elsif ($line eq "------------------------------------------------------------\n") { + + if (keys %$hash) { + + push (@infos, $hash); + + } + + $hash = {}; + $key = undef; + - push (@infos, {}); + } + - else { + + elsif ($line =~ /: /) { + chomp $line; + - ($key, $value) = split /: +/, $line, 2; + - $infos[$#infos]{$key} = $value; + + if ($line =~ /^revno: (\d+)/) { + + $key = "revno"; + + $value = $1; + + } else { + + ($key, $value) = split /: +/, $line, 2; + + } + + $$hash{$key} = $value; + } + } + close $out; + -- + 1.7.0 diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn new file mode 100644 index 000000000..f38c86e03 --- /dev/null +++ b/doc/bugs/clearenv_not_present_at_FreeBSD_.mdwn @@ -0,0 +1,5 @@ +When build wrapper on FreeBSD system, is error occured with clearenv reference. clearenv() das not exists at FreeBSD system, use workaround environ[0]=NULL; +P.S. new git instalation, FreeBSD 7.x + +> `#include ` fixed with nasty ifdefs to handle tcc w/o +> breaking everything else. [[done]] --[[Joey]] diff --git a/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn b/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn new file mode 100644 index 000000000..713198b61 --- /dev/null +++ b/doc/bugs/clearenv_not_present_at_FreeBSD_/discussion.mdwn @@ -0,0 +1 @@ +Mmmm... i see. But it not setup under FreeBSD without magic manual passes. diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn new file mode 100644 index 000000000..2603ff04c --- /dev/null +++ b/doc/bugs/depends_simple_mixup.mdwn @@ -0,0 +1,23 @@ +The [[bugs]] page, at least before I commit this, has a bug at the top that +has been modified to link to done, and ikiwiki's dependency calculations +failed to notice and update the bugs page. Looking at the indexdb, I saw +that the page was not included in the `depends_simple` of the bugs page. + +I was able to replicate the problem locally by starting off with the page +marked done (when it did appear in the bugs page `depends_simple` +(appropriatly as a link dependency, since a change to the page removing the +link would make it match)), then removing the done link. + +At that point, it vanished from `depends_simple`. Presumably because +the main (pagespec) depends for the bugs page now matched it, as a content +dependency. But, it seems to me it should still be listed in +`depends_simple` here. This, I think, is the cause of the bug. + +Then re-add the done link, and the dependency calc code breaks down, +not noticing that bugs dependeded on the page and needs to be updated. + +Ok.. Turns out this was not a problem with the actual influences +calculation or dependency calculation code. Whew! `match_link` +just didn't set the influence correctly when failing. [[fixed|done]] + +--[[Joey]] diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn new file mode 100644 index 000000000..6501508e4 --- /dev/null +++ b/doc/bugs/filecheck_failing_to_find_files.mdwn @@ -0,0 +1,65 @@ +Using the attachment plugin, when filecheck was checking the mime-type of the attachment before allowing the attachment to be removed, it was returning with an error saying that the mime-type of the file was "unknown" (when the mime-type definitely was known!) + +It turns out that the filecheck plugin couldn't find the file, because it was merely using the $pagesources hash, rather than finding the absolute path of the file in question. + +> I don't understand why the file was not in `%pagesources`. Do you? +> --[[Joey]] + +>> The file *was* in `%pagesources`, but what returns from that is the filename relative to the `srcdir` directory; for example, `foo/bar.gif`. +>> When File::MimeInfo::Magic::magic is given that, it can't find the file. +>> But if it is given `/path/to/srcdir/foo/bar.gif` instead, then it *can* find the file, and returns the mime-type correctly. +>> --[[KathrynAndersen]] + +>>> Ok, so it's not removal specific, can in fact be triggered by using +>>> testpagespec (or really anything besides attachment, which passes +>>> the filename parameter). Nor is it limited to mimetype, all the tests in +>>> filecheck have the problem. --[[Joey]] + +>>>> Alas, not fixed. It seems I was mistaken in some of my assumptions. +>>>> It still happens when attempting to remove attachments. +>>>> With your fix, the `IkiWiki::srcfile` function is only called when the filename is not passed in, but it appears that in the case of removing attachments, the filename IS passed in, but it is the relative filename as mentioned above. Thus, the file is still not found, and the mime-type comes back as unknown. +>>>> The reason my patch worked is because, rather than checking whether a filename was passed in before applying IkiWiki::srcfile to the filename, it checks whether the file can be found, and if it cannot be found, then it applies IkiWiki::srcfile to the filename. +>>>> --[[KathrynAndersen]] + +>>>>> Can you test if this patch fixes that? --[[Joey]] + +>>>>>> Yes, it works! --[[KathrynAndersen]] + +applied && [[done]] + +
+diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
+index f59d026..0fc180f 100644
+--- a/IkiWiki/Plugin/remove.pm
++++ b/IkiWiki/Plugin/remove.pm
+@@ -49,7 +49,7 @@ sub check_canremove ($$$) {
+ 	# This is sorta overkill, but better safe than sorry.
+ 	if (! defined pagetype($pagesources{$page})) {
+ 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+-			IkiWiki::Plugin::attachment::check_canattach($session, $page, $file);
++			IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file");
+ 		}
+ 		else {
+ 			error("removal of attachments is not allowed");
+diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
+index 3908443..1a9da63 100644
+--- a/IkiWiki/Plugin/rename.pm
++++ b/IkiWiki/Plugin/rename.pm
+@@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) {
+ 	IkiWiki::check_canedit($src, $q, $session);
+ 	if ($attachment) {
+ 		if (IkiWiki::Plugin::attachment->can("check_canattach")) {
+-			IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile);
++			IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile");
+ 		}
+ 		else {
+ 			error("renaming of attachments is not allowed");
+@@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) {
+ 		if ($attachment) {
+ 			# Note that $srcfile is used here, not $destfile,
+ 			# because it wants the current file, to check it.
+-			IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile);
++			IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile");
+ 		}
+ 	}
+
diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn index 46e77a265..558eb90c8 100644 --- a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn +++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn @@ -5,3 +5,10 @@ Only explicitly pressing "reload" helps. Is it a bug? I haven't been noticing such problems usually on other sites. --Ivan Z. This remains to be true now, with Epiphany 2.26.3 (Mozilla/5.0 (X11; U; Linux i686; en; rv:1.9.1.4pre) Gecko/20080528 Epiphany/2.22 Firefox/3.5). --Ivan Z. + +> In the most recent ikiwiki release, I added a Cache-Control hack +> explicitly to work around firefox's broken over-caching. +> +> (When I tested epiphany and chromium, neither had firefox's problem.) +> +> [[!tag done]] diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn new file mode 100644 index 000000000..b3e87b529 --- /dev/null +++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn @@ -0,0 +1,17 @@ +When installing ikiwiki the perl module path is setup correctly + + use lib '/usr/local/ikiwiki-3.20100312/share/perl/5.10.0'; + +This is not true for ikiwiki-transition: + + $ PATH=/usr/local/ikiwiki-3.20100312/bin ikiwiki-transition prefix_directives ikiwiki.setup + Can't locate IkiWiki.pm in @INC (@INC contains: /etc/perl /usr/local/lib/perl/5.10.0 + /usr/local/share/perl/5.10.0 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) + at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4. + BEGIN failed--compilation aborted at /usr/local/ikiwiki-3.20100312/bin/ikiwiki-transition line 4. + +The missing line should be added. + +Thanks! + +[[done]] --[[Joey]] diff --git a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn index f8e257daf..d12414d55 100644 --- a/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn +++ b/doc/bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used.mdwn @@ -1,4 +1,4 @@ -The [[directive/map]] directive sorty by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then. +The [[ikiwiki/directive/map]] directive sort by pagename. That looks kind of odd, when used together with show=title. I would expect it to sort by title then. > This would be quite hard to fix. Map sorts the pages it displays by page > name, which has the happy effect of making "foo/bar" come after "foo"; @@ -6,3 +6,15 @@ The [[directive/map]] directive sorty by pagename. That looks kind of odd, when > it's located in. If sorting by title, that wouldn't hold. So, map > would have to be effectively totally rewritten, to build up each group > of child pages, and then re-sort those. --[[Joey]] + +>> Ok, you are right, that does would break the tree. This made me think that I do not +>> need to generate a tree for my particular use case just a list, so i thought i could use [[ikiwiki/directive/inline]] instead. +>> This created two new issues: +>> +>> 1. inline also does sort by pagename even when explicitly told to sort by title. +>> +>> 2. I cannot get inline to create a list when the htmltidy plugin is switched on. I have a template which is enclosed in an li tag, and i put the ul tag around the inline manually, but htmltidy breaks this. --martin + +>>>> You might want to check if the [[plugins/contrib/report]] plugin solves your problem. It can sort by title, among other things. --[[KathrynAndersen]] + +>> See also: [[todo/sort_parameter_for_map_plugin_and_directive]] --[[smcv]] diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn new file mode 100644 index 000000000..a8fb19888 --- /dev/null +++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn @@ -0,0 +1,19 @@ +Thinking that any c compiler would do the job, I tried to use tcc with ikiwiki, as explicitely allowed by the Debian package dependencies. + +I installed `tcc` and `libc6-dev` (for `libcrt1`). The wrapper compilation was OK, but the wrapper fails to run correctly and dies with + + usage: ikiwiki [options] source dest + ikiwiki --setup configfile + +Everything works fine with gcc. + +versions: Debian lenny + backports + +> Seems that tcc does not respect changing where `environ` points as a way +> to change the environment seen after `exec` +> +> Given that the man page for `clearenv` suggests using `environ=NULL` +> if `clearenv` is not available, I would be lerry or using tcc to compile +> stuff, since that could easily lead to a security compromise of code that +> expects that to work. However, I have fixed ikiwiki to use `clearenv`. +> --[[Joey]] [[done]] diff --git a/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn new file mode 100644 index 000000000..8613ef03c --- /dev/null +++ b/doc/bugs/rebuild_after_changing_the_underlaydir_config_option.mdwn @@ -0,0 +1,12 @@ +It seems that rebuild a wiki (`ikiwiki --rebuild`) after changing the `underlaydir` config option doesn't remove the pages coming from the previous underlaydir. + +I've noticed this with the debian package version 3.20100102.3~bpo50+1. + +Perhaps it is possible to improve this or mention it in the manual page? + +--prosper + +> --rebuild causes ikiwiki to throw away all its info about what it built +> before, so it will never clean up pages that have been removed, by any +> means. Suggest you do a --refresh, possibly followed by a --rebuild +> if that is really necessary. --[[Joey]] diff --git a/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn new file mode 100644 index 000000000..587771ba4 --- /dev/null +++ b/doc/bugs/some_but_not_all_meta_fields_are_stored_escaped.mdwn @@ -0,0 +1,44 @@ +[[!template id=gitbranch branch=smcv/unescaped-meta author="[[Simon_McVittie|smcv]]"]] +[[!tag patch]] +(Warning: this branch has not been tested thoroughly.) + +While discussing the [[plugins/meta]] plugin on IRC, Joey pointed out that +it stores most meta fields unescaped, but 'title', 'guid' and 'description' +are special-cased and stored escaped (with numeric XML/HTML entities). This +is to avoid emitting markup in the `` of a HTML page, or in an RSS/Atom +feed, neither of which are subject to the [[plugins/htmlscrubber]]. + +However, having the meta fields "partially escaped" like this is somewhat +error-prone. Joey suggested that perhaps everything should be stored +unescaped, and the escaping should be done on output; this branch +implements that. + +Points of extra subtlety: + +* The title given to the [[plugins/search]] plugin was previously HTML; + now it's plain text, potentially containing markup characters. I suspect + that that's what Xapian wants anyway (which is why I didn't change it), + but I could be wrong... + + > AFAICS, this if anything, fixes a bug, xapian definitely expects + > unescaped text here. --[[Joey]] + +* Page descriptions in the HTML `<head>` were previously double-escaped: + the description was stored escaped with numeric entities, then that was + output with a second layer of escaping! In this branch, I just emit + the page description escaped once, as was presumably the intention. + +* It's safe to apply this change to a wiki and neglect to rebuild it + (assuming I implemented it correctly!), but until the wiki is rebuilt, + titles, descriptions and GUIDs for unchanged pages will appear + double-escaped on any page that inlines them in `quick=yes` mode, and + is rebuilt for some other reason. The failure mode is too much escaping + rather than too little, so it shouldn't be a security problem. + +* Reverting this change, if applied, is more dangerous; until the wiki is + rebuilt, any titles, descriptions and GUIDs on unchanged pages that + contained markup could appear unescaped on any page that inlines them + in `quick=yes` mode, and is rebuilt for some other reason. The failure + mode here would be too little escaping, i.e. cross-site scripting. + +[[!tag done]] diff --git a/doc/bugs/stray___60____47__p__62___tags.mdwn b/doc/bugs/stray___60____47__p__62___tags.mdwn index 6e508ffda..99d6fe09f 100644 --- a/doc/bugs/stray___60____47__p__62___tags.mdwn +++ b/doc/bugs/stray___60____47__p__62___tags.mdwn @@ -13,3 +13,5 @@ I believe that this snippet in `IkiWiki.pm` might be the reason for the imbalanc } The fact that HTML in a `\[[!meta title]]` is added but then escaped might indicate that some other bug is involved. + +> [[done]] --[[Joey]] diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn index e7e4af7c3..a211654f1 100644 --- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn +++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn @@ -28,6 +28,8 @@ rationale on this, or what am I doing wrong, and how to achieve what I want? >> is valid. [[todo/matching_different_kinds_of_links]] is probably >> how it will eventually be solved. --[[Joey]] +>>> [[Done]]: `tagged` no longer matches other wikilinks. --[[smcv]] + > And this is an illustration why a clean work-around (without changing the software) is not possible: while thinking about [[todo/matching_different_kinds_of_links]], I thought one could work around the problem by simply explicitly including the kind of the relation into the link target (like the tagbase in tags), and by having a separate page without the "tagbase" to link to when one wants simply to refer to the tag without tagging. But this won't work: one has to at least once refer to the real tag page if one wants to talk about it, and this reference will count as tagging (unwanted). --Ivan Z. > But well, perhaps there is a workaround without introducing different kinds of links. One could modify the [[tag plugin|plugins/tag]] so that it adds 2 links to a page: for tagging -- `tagbase/TAG`, and for navigation -- `tagdescription/TAG` (displayed at the bottom). Then the `tagdescription/TAG` page would hold whatever list one wishes (with `tagged(TAG)` in the pagespec), and whenever one wants to merely refer to the tag, one should link to `tagdescription/TAG`--this link won't count as tagging. So, `tagbase/TAG` would become completely auxiliary (internal) link targets for ikiwiki, the users would edit or link to only `tagdescription/TAG`. --Ivan Z. diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn new file mode 100644 index 000000000..5c322991a --- /dev/null +++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn @@ -0,0 +1,26 @@ +In the template for ikiwiki's recent changes page + + /usr/share/ikiwiki/templates/change.tmpl + +there is a missing </span> tag after the + + <span class="changedate"><TMPL_VAR COMMITDATE> + +This results in the recentchanges/ page being invalid and rendering quite horrifyingly in Internet Exploder. + +[I'm running](http://wiki.shlrm.org) (linked so you can see the one I'm running if you need to) the latest version of ikiwiki, and I note that it's broken on [ikiwiki.info](http://validator.w3.org/check?uri=http%3A%2F%2Fikiwiki.info%2Frecentchanges%2F&charset=%28detect+automatically%29&doctype=Inline&group=0&user-agent=W3C_Validator%2F1.767) too :) + +[This one on debian](https://www.icanttype.org/recentchanges/) is somehow [valid](http://validator.w3.org/check?uri=https%3A%2F%2Fwww.icanttype.org%2F%2Frecentchanges%2F&charset=%28detect+automatically%29&doctype=Inline&group=0&user-agent=W3C_Validator%2F1.767), although it's using the same template. Perhaps there's an additional scrubbing going on his end. + +Thanks, +David + +PS: I have fixed the template by hand on my server, so it will validate, however ikiwiki.info will not. + +> [[!template id="gitbranch" branch=smcv/trivia author="[[smcv]]"]] [[!tag patch]] +> Enabling either [[plugins/htmltidy]] or [[plugins/htmlbalance]] will automatically fix unbalanced +> markup like this; using [[plugins/comments]] without having one or other of those is a bad idea +> from the point of view of avoiding comment forgery, which is probably why icanttype.org works +> correctly. Anyway, I've fixed this in a branch: Joey, care to review smcv/trivia? --[[smcv]] + +[[done]], thanks guys --[[Joey]] diff --git a/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn new file mode 100644 index 000000000..9804d86c5 --- /dev/null +++ b/doc/bugs/wrapper_can__39__t_find_the_perl_modules.mdwn @@ -0,0 +1,16 @@ +If i intsall perl modules in my custom directory, cgi wrapper can't find them. I found clearing enviroment variables in code of wrapper. But information about custom directories put to perl with PERL5LIB variable. + +Workaround: add newenviron variable PERL5LIB + +My additional question - what wrapper do? I'am russian hosting provider. I am interesting with ikiwiki. + +> The wrapper allows ikiwiki to run as the user who owns the wiki, which +> is generally not the same as the user that runs the web server. +> (It also handles some other things, like some locking.) +> +> As a suid program, the wrapper cannot safely let environment variables +> pass through. +> +> If you want to install ikiwiki's perl modules in a nonstandard location, +> you can set `INSTALL_BASE` when running `Makefile.PL`. ikiwiki will then +> be built to look in that location. --[[Joey]] [[!tag done]] diff --git a/doc/download.mdwn b/doc/download.mdwn index 45d0d7870..92c8a4f75 100644 --- a/doc/download.mdwn +++ b/doc/download.mdwn @@ -35,7 +35,7 @@ own RPM. ## BSD ports -IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki) +Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki) by running `sudo port install ikiwiki`. NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html). diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index f542cad0c..8775c01ab 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -13,16 +13,11 @@ Some additional configuration you might want to do: example of how to tag a post is: \[[!tag tags/life]] -* Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all - the categories you've tagged posts with. - * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud to display on the [[index]]. -* Enable the [[comments|plugins/comments]] plugin and configure it to - enable comments to posts to the blog: - - comments_pagespec => 'blog/posts/* and !*/Discussion', +* Enable the [[comments|plugins/comments]] plugin to + enable comments to posts to the blog. * Enable the [[calendar|plugins/calendar]] plugin and run the [[ikiwiki-calendar]] command from cron daily to get an interlinked diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn new file mode 100644 index 000000000..d07b73b74 --- /dev/null +++ b/doc/examples/blog/archives.mdwn @@ -0,0 +1,8 @@ +[[!if test="archives/*" then=""" +Browse through blog archives by year: +[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]] +""" +else=""" +You need to use the `ikiwiki-calendar` program to generate calendar-based +archive pages. +"""]] diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn index 4735dea08..0b503ba01 100644 --- a/doc/examples/blog/comments.mdwn +++ b/doc/examples/blog/comments.mdwn @@ -1,3 +1,3 @@ -This page will show all comments made to posts in my [[blog|index]]. +This page will show recent comments made to posts in the [[blog|index]]. [[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]] diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index 01b714fcd..a22c40c72 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -1,13 +1,6 @@ -[[!pagestats pages="./tags/*" among="./posts/*"]] - -Welcome to my blog. - -Have a look at the most recent posts below, or browse the tag cloud on the -right. Archives of all [[posts]] and all [[comments]] are also available. - [[!inline pages="./posts/* and !*/Discussion" show="10" actions=yes rootpage="posts"]] ----- +[[!sidebar]] This blog is powered by [ikiwiki](http://ikiwiki.info). diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn index d49432341..f2729fcef 100644 --- a/doc/examples/blog/posts/first_post.mdwn +++ b/doc/examples/blog/posts/first_post.mdwn @@ -1,4 +1,4 @@ This is the first post to this example blog. To add new posts, just add files to the posts/ subdirectory, or use the web form. -[[!tag tags/tech]] +[[!tag tech]] diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn index a9fac388e..5c1f17723 100644 --- a/doc/examples/blog/sidebar.mdwn +++ b/doc/examples/blog/sidebar.mdwn @@ -1,7 +1,10 @@ -Example sidebar +[[!if test="enabled(calendar)" then=""" +[[!calendar pages="./posts/* and !*/Discussion"]] +"""]] -* [[Blog|index]] -* [[Archive|posts]] +[[Recent Comments|comments]] -Categories: -[[!map pages="./tags/* and !*/Discussion"]] +[[Archives]] + +[[Tags]]: +[[!pagestats style="list" pages="./tags/*" among="./posts/*"]] diff --git a/doc/examples/softwaresite.mdwn b/doc/examples/softwaresite.mdwn index e43a9d116..99f791177 100644 --- a/doc/examples/softwaresite.mdwn +++ b/doc/examples/softwaresite.mdwn @@ -14,3 +14,6 @@ Some additional configuration you might want to do: * Read the [[tips/integrated_issue_tracking_with_ikiwiki]] article for tips about how to use ikiwiki as a BTS. + +* Read [[tips/spam_and_softwaresites]] for information on how to keep spam + and spam-fighting commits out of your main version control history. diff --git a/doc/examples/softwaresite/news.mdwn b/doc/examples/softwaresite/news.mdwn index 9b53c7d99..20efba6e0 100644 --- a/doc/examples/softwaresite/news.mdwn +++ b/doc/examples/softwaresite/news.mdwn @@ -1,4 +1,4 @@ -This is where annoucements of new releases, features, and other news is +This is where announcements of new releases, features, and other news is posted. FooBar users are recommended to subscribe to this page's RSS feed. diff --git a/doc/features.mdwn b/doc/features.mdwn index 3925d78ef..ab521213d 100644 --- a/doc/features.mdwn +++ b/doc/features.mdwn @@ -13,7 +13,7 @@ Instead of editing pages in a stupid web form, you can use vim and commit changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other [[Revision_Control_Systems|rcs]]. -ikiwiki can be run from a [[post-commit]] hook to update your wiki +Ikiwiki can be run from a [[post-commit]] hook to update your wiki immediately whenever you commit a change using the RCS. It's even possible to securely let @@ -25,7 +25,7 @@ run a simple wiki without page history, it can do that too. ## A wiki compiler -ikiwiki is a wiki compiler; it builds a static website for your wiki, and +Ikiwiki is a wiki compiler; it builds a static website for your wiki, and updates it as pages are edited. It is fast and smart about updating a wiki, it only builds pages that have changed (and tracks things like creation of new pages and links that can indirectly cause a page to need a rebuild) @@ -45,7 +45,7 @@ easily be added by [[plugins]]. For example it also supports traditional [[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]] or [[Textile|plugins/textile]]. -ikiwiki also supports files of any other type, including plain text, +Ikiwiki also supports files of any other type, including plain text, images, etc. These are not converted to wiki pages, they are just copied unchanged by ikiwiki as it builds your wiki. So you can check in an image, program, or other special file and link to it from your wiki pages. @@ -70,8 +70,8 @@ you would care to syndicate. ## Valid html and [[css]] -ikiwiki aims to produce -[valid XHTML 1.0](http://validator.w3.org/check?url=referer). ikiwiki +Ikiwiki aims to produce +[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki generates html using [[templates|wikitemplates]], and uses [[css]], so you can change the look and layout of all pages in any way you would like. @@ -163,7 +163,7 @@ Well, sorta. Rather than implementing YA history browser, it can link to ### Full text search -ikiwiki can use the xapian search engine to add powerful +Ikiwiki can use the xapian search engine to add powerful full text [[plugins/search]] capabilities to your wiki. ### Translation via po files diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn index 6ce576db1..6b7739fd0 100644 --- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn +++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn @@ -20,15 +20,17 @@ Do I have it right? > Some VCS, like git, set the file mtimes to the current time > when making a new checkout, so they will be lost if you do that. > The creation times can be retrived using the `--getctime` option. -> I suppose it might be nice if there were a `--getmtime` that pulled -> true modification times out of the VCS, but I haven't found it a big -> deal in practice for the last modification times to be updated to the -> current time when rebuilding a wiki like this. --[[Joey]] +> --[[Joey]] > > > Thanks for the clarification. I ran some tests of my own to make sure I understand it right, and I'm satisfied > > that the order of posts in my blog can be retrieved from the VCS using the `--getctime` option, at least if I > > choose to order my posts by creation time rather than modification time. But I now know that I can't rely on > > page modification times in ikiwiki as these can be lost permanently. +> +> > > Update: It's now renamed to `--gettime`, and pulls both the creation +> > > and modification times. Also, per [[todo/auto_getctime_on_fresh_build]], +> > > this is now done automatically the first time ikiwiki builds a +> > > srcdir. So, no need to worry about this any more! --[[Joey]] > > > > I would suggest that there should at least be a `--getmtime` option like you describe, and perhaps that > > `--getctime` and `--getmtime` be _on by default_. In my opinion the creation times and modification times of @@ -91,19 +93,6 @@ Do I have it right? > A quick workaround for me to get modification times right is the following > little zsh script, which unfortunately only works for git: - #!/usr/bin/env zsh - - set +x - - for FILE in **/*(.); do - TIMES="`git log --pretty=format:%ai $FILE`" - MTIME="`echo $TIMES | head -n1`" - - if [ ! -z $MTIME ]; then - echo touch -m -d "$MTIME" $FILE - touch -m -d "$MTIME" $FILE - fi - - done +>> Elided; no longer needed since --gettime does that, and much faster! --[[Joey]] > --[[David_Riebenbauer]] diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn index fe67e6aba..d7a33b526 100644 --- a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn +++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn @@ -20,10 +20,6 @@ How do I set up an ikiwiki system using a pre-existing repository (instead of cr > recreate the ikiwiki srcdir > 3. `git clone` from the bare git repository a second time, > to create a checkout you can manually edit (optional) -> 4. run `ikiwiki --getctime --setup your.setup` -> The getctime will ensure page creation times are accurate -> by putting the info out of the git history, -> and only needs to be done once. > > If you preserved your repository, but not the setup file, > the easiest way to make one is probably to run diff --git a/doc/forum/an_alternative_approach_to_structured_data.mdwn b/doc/forum/an_alternative_approach_to_structured_data.mdwn index eb6ee4445..6e6af8adb 100644 --- a/doc/forum/an_alternative_approach_to_structured_data.mdwn +++ b/doc/forum/an_alternative_approach_to_structured_data.mdwn @@ -18,6 +18,12 @@ I think it could be really powerful and useful, especially if it becomes part of > It looks like an interesting idea. I don't have time right now to look at it in depth, but it looks interesting. -- [[Will]] +> I agree such a separation makes some sense. But note that the discussion on [[todo/structured_page_data]] +> talks about associating data types with fields for a good reason: It's hard to later develop a good UI for +> querying or modifying a page's data if all the data has an implicit type "string". --[[Joey]] + +>> I'm not sure that having an implicit type of "string" is really such a bad thing. After all, Perl itself manages with just string and number, and easily converts from one to the other. Strong typing is generally used to (a) restrict what can be done with the data and/or (b) restrict how the data is input. The latter could be done with some sort of validated form, but that, too, could be decoupled from looking up and returning the value of a field. --[[KathrynAndersen]] + ## Second Pass I have written additional plugins which integrate with the [[plugins/contrib/field]] plugin to both set and get structured page data. @@ -27,3 +33,31 @@ I have written additional plugins which integrate with the [[plugins/contrib/fie * [[plugins/contrib/ymlfront]] - looks for YAML-format data at the front of a page; this is just one possible back-end for the structured data --[[KathrynAndersen]] + +> I'm not an IkiWiki committer ([[Joey]] is the only one I think) +> but I really like the look of this scheme. In particular, +> having `getfield` interop with `field` without being *part of* +> `field` makes me happy, since I'm not very keen on `getfield`'s +> syntax (i.e. "ugh, yet another mini-markup-language without a +> proper escaping mechanism"), but this way people can experiment +> with different syntaxes while keeping `field` for the +> behind-the-scenes bits. +> +>> I've started using `field` on a private site and it's working +>> well for me; I'll try to do some code review on its +>> [[plugins/contrib/field/discussion]] page. --s +> +> My [[plugins/contrib/album]] plugin could benefit from +> integration with `field` for photos' captions and so on, +> probably... I'll try to work on that at some point. +> +> [[plugins/contrib/report]] may be doing too much, though: +> it seems to be an variation on `\[[inline archive="yes"]]`, +> with an enhanced version of sorting, a mini version of +> [[todo/wikitrails]], and some other misc. I suspect it could +> usefully be divided up into discrete features? One good way +> to do that might be to shuffle bits of its functionality into +> the IkiWiki distribution and/or separate plugins, until there's +> nothing left in `report` itself and it can just go away. +> +> --[[smcv]] diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn index 68b44f2c1..96ba2d791 100644 --- a/doc/forum/google_openid_broken__63__.mdwn +++ b/doc/forum/google_openid_broken__63__.mdwn @@ -50,3 +50,30 @@ The openid is <https://www.google.com/accounts/o8/id?id=AItOawltlTwUCL_Fr1siQn94GV65-XwQH5XSku4> (what a mouthfull!), and I don't know who that is or how to use it since it points to a fairly useless xml document, rather than a web page. --[[Joey]] + +> That string is what's received via the discovery protocol. The user logging in with a Google account is not supposed to write that when logging in, but rather <https://www.google.com/accounts/o8/id>. The OpenID client library will accept that and redirect the user to a sign in page, which will return that string as the OpenID. It's not really usable as an identifier for edits and whatnots, but an alternative would be to use the attribute exchange extension to get the email address and display that. See <http://code.google.com/apis/accounts/docs/OpenID.html#Parameters>. + +> Yahoo's OpenID implementation works alike, but I haven't looked at it as much. It uses <https://me.yahoo.com/> to receive the endpoint. + +> I've added buttons that submit the two above URLs for logging in with a Google and Yahoo OpenID, respectively, to my locally changed OpenID login plugin. + +> Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]] + +>> First, I don't accept that the openid google returns from their +>> generic signin url *has* to be so freaking ugly. For contrast, +>> look at the openid you log in as if you use the yahoo url. +>> <https://me.yahoo.com/joeyhess#35f22>. Nice and clean, now +>> munged by ikiwiki to "joeyhess [me.yahoo.com]". +>> +>> Displaying email addresses is not really an option, because ikiwiki +>> can't leak user email addresses like that. Displaying nicknames or +>> usernames is, see [[todo/Separate_OpenIDs_and_usernames]]. +>> +>> It would probably be good if the openid plugin could be configured with +>> a list of generic openid urls, so it can add quick login buttons using +>> those urls. +>> +>> The ugly google url will still be exposed here and there where +>> a unique user id is needed. That can be avoided by not using the generic +>> <https://www.google.com/accounts/o8/id>, but instead your own profile +>> like <http://www.google.com/profiles/joeyhess>. --[[Joey]] diff --git a/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn new file mode 100644 index 000000000..1c0f8f561 --- /dev/null +++ b/doc/forum/how_to_setup_ikiwiki_on_a_remote_host.mdwn @@ -0,0 +1,35 @@ +Hi all! +I really like ikiwiki and i tested it on my local machine but i have one question that i can't answer reading documentation (my fault of course)... +I have an account and some space on a free hosting service. +Now, i want to put my ikiwiki on this remote web space so that i can browse it from wherever i want. +I have my source dir and my git dir on my local machine. +How can i upload my ikiwiki on the remote host and manage it via git as i can do when i test it locally? +Where is specified? Where can i find documentation about it? + +Thanks in advance! + +Pab + +> There are several ways to accomplish this, depending on what you really +> want to do. +> +> If your goal is to continue generating the site locally, but then +> transfer it to the remote host for serving, you could use the +> [[plugins/rsync]] plugin. +> +> If your goal is to install and run the ikiwiki software on the remote host, +> then you would follow a similar path to the ones described in these tips: +> [[tips/nearlyfreespeech]] [[tips/DreamHost]]. Or even [[install]] ikiwiki +> from a regular package if you have that kind of access. Then you could +> push changes from your local git to git on the remote host to update the +> wiki. [[tips/Laptop_wiki_with_git]] explains one way to do that. +> --[[Joey]] + +Thanks a lot for your answer. +rsync plugin would be perfect but... how would i manage blog post? +I mean... is it possible to manage ikiwiki blog too with rsync plugin in the way you told me? --Pab + +> If you want to allow people to make comments on your blog, no, the rsync plugin will not help, since it will upload a completely static site where nobody can make comments. Comments require a full IkiWiki setup with CGI enabled, so that people add content (comments) from the web. --[[KathrynAndersen]] + +Ok, i understand, thanks. +Is there any hosting service that permits to have a full installation of iwkiwiki or i am forced to get a vps or to mantain a personal server for that? --Pab diff --git a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn index 1cb5ed27e..7bc032949 100644 --- a/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn +++ b/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn @@ -1,3 +1,7 @@ +**UPDATE** I have created a [[page|tips/follow_wikilinks_from_inside_vim]] in +the tips section about the plugin, how to get it, install it and use it. Check +that out. --[[jerojasro]] + I wrote a vim function to help me navigate the wiki when I'm editing it. It extends the 'gf' (goto file) functionality. Once installed, you place the cursor on a wiki page name and press 'gf' (without the quotes); if the file exists, it gets loaded. This function takes into account the ikiwiki linking rules when deciding which file to go to. @@ -64,7 +68,27 @@ the plugin has, as of now, two problems: > Seems about ready for me to think about pulling it into ikiwiki > alongside [[tips/vim_syntax_highlighting/ikiwiki.vim]]. If you'll > please slap a license on it. :) --[[Joey]] -> +> +>> GPL version 2 or later (if that doesn't cause any problems here). I'll add it +>> to the file --[[jerojasro]] +>> +>>> I see you've put the plugin on vim.org. Do you think it makes sense to +>>> also include a copy in ikiwiki? --[[Joey]] +>>> +>>>> mmm, no. There would be two copies of it, and the git repo. I'd rather have +>>>> a unique place for the "official" version (vim.org), and another for the dev +>>>> version (its git repo). +>>>> +>>>> actually, I would also suggest to upload the [[`ikiwiki.vim`|tips/vim_syntax_highlighting]] file to vim.org --[[jerojasro]] +>>>>> +>>>>> If you have any interest in maintaining the syntax highlighting +>>>>> plugin and putting it there, I'd be fine with that. I think it needs +>>>>> some slight work to catch up with changes to ikiwiki's directives +>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] +>>>>> +>>>>>> I don't really know too much about syntax definitions in vim. But I'll give it a stab. I know it fails when there are 2 \[[my text|link]] wikilinks in the same page. +>>>>>> I'm not promising anything, though ;) --[[jerojasro]] +> > Also, I have a possible other approach for finding ikiwiki's root. One > could consider that any subdirectory of an ikiwiki wiki is itself > a standalone wiki, though probably one missing a toplevel index page. @@ -80,6 +104,10 @@ the plugin has, as of now, two problems: > > And if that's the case, you can resolve an absolute link by looking for > the page closest to the root that matches the link. +> +>> I like your idea; it doesn't alter the matching of the relative links, and +>> should work fine with absolute links too. I'll implement it, though I see +>> some potential (but small) issues with it --[[jerojasro]] > > It may even make sense to change ikiwiki's own handling of "absolute" > links to work that way. But even without changing ikiwiki, I think it @@ -93,3 +121,7 @@ the plugin has, as of now, two problems: > and vim would go to that file. > > --[[Joey]] +> +>> your approach will add more noise when the plugin grows the page-creation +>> feature, since there will be no real root to limit the possible locations for +>> the new page. But it is far better than demanding for a `.ikiwiki` dir --[[jerojasro]] diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn index 2c2ac240e..799186cf8 100644 --- a/doc/forum/speeding_up_ikiwiki.mdwn +++ b/doc/forum/speeding_up_ikiwiki.mdwn @@ -56,7 +56,7 @@ number is still too large to really visualize: the graphviz PNG and PDF output engines segfault for me, the PS one works but I can't get any PS software to render it without exploding. -Now, the relations in the links hash are not the same thing as IkiWiki's notion of dependencies. Can anyone point me at that data structure / where I might be able to add some debugging foo to generate a graph of it? +Now, the relations in the links hash are not the same thing as Ikiwiki's notion of dependencies. Can anyone point me at that data structure / where I might be able to add some debugging foo to generate a graph of it? Once I've figured out that I might be able to optimize some pagespecs. I understand pagespecs are essentially translated into sequential perl code. I diff --git a/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn b/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn new file mode 100644 index 000000000..72f2d38e0 --- /dev/null +++ b/doc/forum/utf8_warnings_for___34____92__xAB__34__.mdwn @@ -0,0 +1,47 @@ +# getting Warnings about UTF8-Chars. + +I'm getting multiple warnings: + + utf8 "\xAB" does not map to Unicode at /usr/share/perl5/IkiWiki.pm line 774, <$in> chunk 1. + + +I'm assuming this is once per File, but even in verbose mode, it doesn't tell me which file is a problem. +It first reads all the files, and afterwards when parsing/compiling them, it outputs the warning, so I can't +deduce the offending files. + +Is there a way to have ikiwiki output the position, where it encounters the character? + +Probably all this has to do with locale-settings, and usage of mixed locales in a distributed setup ... +I'd rather cleanup some of the file(name)s of unexpected characters. --[[jwalzer]] + +-------- + +**Update** : So I took the chance to insert debug into ikiwiki.pm: + + root@novalis:/usr/share/perl5# diff -p /tmp/IkiWiki.orig.pm IkiWiki.pm + *** /tmp/IkiWiki.orig.pm Sun Feb 14 15:16:08 2010 + --- IkiWiki.pm Sun Feb 14 15:16:28 2010 + *************** sub readfile ($;$$) { + *** 768,773 **** + --- 768,774 ---- + } + + local $/=undef; + + debug("opening File: $file:"); + open (my $in, "<", $file) || error("failed to read $file: $!"); + binmode($in) if ($binary); + return \*$in if $wantfd; + + +But what I see now is not quite helpful, as it seems, STDERR and DEBUG are asyncronous, so they mix up in a way, that I can't really see, whats the problem ... Maybe I'm better off for troubleshooting, to insert an printf to strerr to have it in the same stream.. --[[jwalzer]] + + +---- + +**Update:** The "print STDERR $file;"-Trick did it .. I was able to find a mdwn-file, that (was generated by a script of me) had \0xAB in it. + +Nevertheless I still wonder if this should be a problem. This character happend to be in an *\[\[meta title='$CHAR'\]\]-tag* and an *\[$CHAR\]http://foo)-Link* + +Should this throw an warning? Maybe this warning could be catched an reported inclusively the containing filename? maybe even with an override, if one knows that it is correct that way? --[[jwalzer]] + +[[!tag solved]] diff --git a/doc/forum/where_are_the_tags.mdwn b/doc/forum/where_are_the_tags.mdwn new file mode 100644 index 000000000..ecb49fe43 --- /dev/null +++ b/doc/forum/where_are_the_tags.mdwn @@ -0,0 +1,9 @@ +Where is the tag cloud/tag listing of all the tags used in this wiki? I know we +have tags enabled. --[[jerojasro]] + +> This wiki does not use one global toplevel set of tags (`tagbase` is not +> set). +> +> There are tags used for the [[plugins]], and a tag cloud of those +> there. [[wishlist]] and [[patch]] are tags too, but I don't see the point +> of a tag cloud for such tags. --[[Joey]] diff --git a/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn new file mode 100644 index 000000000..49c55e20e --- /dev/null +++ b/doc/forum/wishlist-discussion:_Editformular_showing_existing_tags.mdwn @@ -0,0 +1,15 @@ +# How about: + +having a list of all existing tags in the Edit-Formular as a selectionbox? + +Assume I have tagbase=/tags/ and for every tag I have given to articles an existing page there. + +Would it be possible to list all these tags together with the Formular, as selectionbox. +Maybe even with parsing of the content and preselecting the tags, that are given in the article and vice-versa when selecting the fields then also generating the \[\[\!tag\]\]-sourcecode ? + +this would need a bit JS-work and somehow on compiletime we need to put the list of tags somewhere, where the cgi could read them from. +This way, even a pagespec would suffice to determine the usable list of tags and not only the tagbase-variable. + +> I think this would be very hard to achieve with the current tag plugin, due to the nature of its implementation. +> +> I've had a "tag2" plugin on the go for a while which supports this. It's in a very rough stage but I'll try to find it and upload it somewhere. -- [[Jon]] diff --git a/doc/git.mdwn b/doc/git.mdwn index 30fed6afc..55967e543 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -26,7 +26,8 @@ be browsed, subscribed to etc on its You are of course free to set up your own ikiwiki git repository with your own [[patches|patch]]. If you list it here, the `gitremotes` script will automatically add it to git remotes. Your repo will automatically be pulled -into [[Joey]]'s working tree. This is recommended. :-) +into [[Joey]]'s working repository where he can see your branches and +think about merging them. This is recommended. :-) <!-- Machine-parsed format: * wikilink <git:url> --> @@ -56,7 +57,11 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[ktf]] `git://github.com/ktf/ikiwiki.git` * [[tove]] `git://github.com/tove/ikiwiki.git` * [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki` -* [[roktas]] `git://github.com/roktas/ikiwiki.git`` +* [[roktas]] `git://github.com/roktas/ikiwiki.git` +* [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki` + ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary)) +* [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git` +* [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git` ## branches diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn index 982892fca..c1f4d7267 100644 --- a/doc/ikiwiki-calendar.mdwn +++ b/doc/ikiwiki-calendar.mdwn @@ -16,9 +16,11 @@ You must specify the setup file for your wiki. The pages will be created inside its `srcdir`, beneath the `archivebase` directory used by the calendar plugin (default "archives"). -You will probably want to specify a [[ikiwiki/PageSpec]] -to control which pages are included on the calendars. The -default is all pages. To limit it to only posts in a blog, +To control which pages are included on the calendars, +a [[ikiwiki/PageSpec]] can be specified. The default is +all pages, or the pages specified by the `comments_pagespec` +setting in the config file. A pagespec can also be specified +on the command line. To limit it to only posts in a blog, use something like "posts/* and !*/Discussion". It defaults to creating calendar pages for the current diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn index b2ac75b11..198da9d51 100644 --- a/doc/ikiwiki/directive/calendar.mdwn +++ b/doc/ikiwiki/directive/calendar.mdwn @@ -40,9 +40,12 @@ An example crontab: "month" or "year". The default is a month view calendar. * `pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the month calendar. Defaults to "*". -* `archivebase` - Configures the base of the archives hierarchy. The - default is "archives". Note that this default can also be overridden +* `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. + Calendars link to pages under here, with names like "2010/04" and + "2010". These pages can be automatically created using the + `ikiwiki-calendar` program. * `year` - The year for which the calendar is requested. Defaults to the current year. * `month` - The numeric month for which the calendar is requested, in the diff --git a/doc/ikiwiki/directive/date.mdwn b/doc/ikiwiki/directive/date.mdwn index df45fa840..b89241e4c 100644 --- a/doc/ikiwiki/directive/date.mdwn +++ b/doc/ikiwiki/directive/date.mdwn @@ -12,3 +12,5 @@ For example, an update to a page with an embedded date stamp could look like: Updated \[[!date "Wed, 25 Nov 2009 01:11:55 -0500"]]: mumble mumble + +[[!meta robots="noindex, follow"]] diff --git a/doc/ikiwiki/directive/format.mdwn b/doc/ikiwiki/directive/format.mdwn index 23830e9cd..7d11d225f 100644 --- a/doc/ikiwiki/directive/format.mdwn +++ b/doc/ikiwiki/directive/format.mdwn @@ -22,7 +22,7 @@ Note that if the highlight plugin is enabled, this directive can also be used to display syntax highlighted code. Many languages and formats are supported. For example: - \[[format perl """ + \[[!format perl """ print "hello, world\n"; """]] diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index 998ba642b..6a186cd93 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -1,3 +1,10 @@ +## Combine inline and toggle + +Is it possible to combine the behaviour of toggle and inline? ie, have it present of list of 'headlines' which are created from seperate subpages which can be clicked to expand to the body of the inlined page. Thanks. + +-- Thiana + +--- ## How do you provide the per post discussion links in your own blog? > That's configured by the "actions" parameter to the inline directive. See diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn index 062b4267a..f6eaa6b80 100644 --- a/doc/ikiwiki/directive/map/discussion.mdwn +++ b/doc/ikiwiki/directive/map/discussion.mdwn @@ -1,3 +1,14 @@ +### Sorting + +Is there a way to have the generated maps sorted by *title* instead of *filename* when show=title is used? +Thanks + +-- Thiana + +> [[bugs/map_sorts_by_pagename_and_not_title_when_show__61__title_is_used]] --[[Joey]] + +---- + Question: Is there a way to generate a listing that shows *both* title and description meta information? Currently, a \[\[!map ...]] shows only one of the two, but I'd like to generate a navigation that looks like a description list. For example: * This is the title meta information. diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index 557441c0b..5a3919dea 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -23,6 +23,13 @@ Supported fields: be set to a true value in the template; this can be used to format things differently in this case. + An optional `sortas` parameter will be used preferentially when + [[ikiwiki/pagespec/sorting]] by `meta(title)`: + + \[[!meta title="The Beatles" sortas="Beatles, The"]] + + \[[!meta title="David Bowie" sortas="Bowie, David"]] + * license Specifies a license for the page, for example, "GPL". Can contain @@ -37,6 +44,11 @@ Supported fields: Specifies the author of a page. + An optional `sortas` parameter will be used preferentially when + [[ikiwiki/pagespec/sorting]] by `meta(author)`: + + \[[!meta author="Joey Hess" sortas="Hess, Joey"]] + * authorurl Specifies an url for the author of a page. diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn index 68f4d2734..d0e0e7be7 100644 --- a/doc/ikiwiki/directive/pagestats.mdwn +++ b/doc/ikiwiki/directive/pagestats.mdwn @@ -4,10 +4,16 @@ 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. -Here's how to use it to create a [[tag]] cloud: +Here's how to use it to create a [[tag]] cloud, with tags sized based +on frequency of use: \[[!pagestats pages="tags/*"]] +Here's how to create a list of tags, sized by use as they would be in a +cloud. + + \[[!pagestats style="list" pages="tags/*"]] + And here's how to create a table of all the pages on the wiki: \[[!pagestats style="table"]] @@ -28,4 +34,7 @@ links: \[[!pagestats style="table" show="10"]] +The optional `class` parameter can be used to control the class +of the generated tag cloud `div` or page stats `table`. + [[!meta robots="noindex, follow"]] diff --git a/doc/ikiwiki/directive/sidebar.mdwn b/doc/ikiwiki/directive/sidebar.mdwn new file mode 100644 index 000000000..599695d22 --- /dev/null +++ b/doc/ikiwiki/directive/sidebar.mdwn @@ -0,0 +1,20 @@ +The `sidebar` directive is supplied by the [[!iki plugins/sidebar desc=sidebar]] plugin. + +This directive can specify a custom sidebar to display on the page, +overriding any sidebar that is displayed globally. + +If no custom sidebar content is specified, it forces the sidebar page to +be used as the sidebar, even if the `global_sidebars` setting has been +used to disable use of the sidebar page by default. + +## examples + + \[[!sidebar content=""" + This is my custom sidebar for this page. + + \[[!calendar pages="posts/*"]] + """]] + + \[[!sidebar]] + +[[!meta robots="noindex, follow"]] diff --git a/doc/ikiwiki/directive/table.mdwn b/doc/ikiwiki/directive/table.mdwn index e27a94b7c..a6692f92c 100644 --- a/doc/ikiwiki/directive/table.mdwn +++ b/doc/ikiwiki/directive/table.mdwn @@ -6,8 +6,8 @@ or DSV (delimiter-separated values) format. ## examples \[[!table data=""" - Customer|Amount - Fulanito|134,34 + Customer |Amount + Fulanito |134,34 Menganito|234,56 Menganito|234,56 """]] @@ -42,4 +42,9 @@ cells. For example: as the table header. Set it to "no" to make a table without a header, or "column" to make the first column be the header. +For tab-delimited tables (often obtained by copying and pasting from HTML +or a spreadsheet), `delimiter` must be set to a literal tab character. These +are difficult to type in most web browsers - copying and pasting one from +the table data is likely to be the easiest way. + [[!meta robots="noindex, follow"]] diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 5f0f44e2e..5c191f23f 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -44,7 +44,8 @@ Some more elaborate limits can be added to what matches using these functions: metadata, matching the specified glob. * "`user(username)`" - tests whether a modification is being made by a user with the specified username. If openid is enabled, an openid can also - be put here. + be put here. Glob patterns can be used in the username. For example, + to match all openid users, use `user(*://*)` * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn index e0264dd50..40ed9efb6 100644 --- a/doc/ikiwiki/pagespec/po.mdwn +++ b/doc/ikiwiki/pagespec/po.mdwn @@ -14,3 +14,5 @@ wiki: Note that every non-po page is considered to be written in `po_master_language`, as specified in `ikiwiki.setup`. + +[[!meta robots="noindex, follow"]] diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn index 41aa58151..ccd7f7eaa 100644 --- a/doc/ikiwiki/pagespec/sorting.mdwn +++ b/doc/ikiwiki/pagespec/sorting.mdwn @@ -4,8 +4,23 @@ specifying the order that matching pages are shown in. The following sort orders can be specified. * `age` - List pages from the most recently created to the oldest. + * `mtime` - List pages with the most recently modified first. -* `title` - Order by title. -* `title_natural` - Only available if [[!cpan Sort::Naturally]] is - installed. Orders by title, but numbers in the title are treated + +* `title` - Order by title (page name). +[[!if test="enabled(sortnaturally)" then=""" +* `title_natural` - Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") +"""]] +[[!if test="enabled(meta)" then=""" +* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]` + or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no + full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc. + also work. +"""]] + +In addition, you can combine several sort orders and/or reverse the order of +sorting, with a string like `age -title` (which would sort by age, then by +title in reverse order if two pages have the same age). + +[[!meta robots="noindex, follow"]] diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index f750fb4b0..4a3e41e83 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -40,9 +40,7 @@ Projects & Organizations * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de) * [monkeysphere](http://web.monkeysphere.info/) * [The Walden Effect](http://www.waldeneffect.org/) -* The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/) * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/) -* [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.) * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) * [MIT Student Information Processing Board](http://sipb.mit.edu/) @@ -51,6 +49,11 @@ Projects & Organizations * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/) * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/) * [Wetknee Books](http://www.wetknee.com/) +* [IPOL Image Processing On Line](http://www.ipol.im) +* [Debian Costa Rica](http://cr.debian.net/) +* [Fvwm Wiki](http://fvwmwiki.xteddy.org) +* [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template. +* [Banu](https://www.banu.com/) Personal sites and blogs ======================== @@ -134,6 +137,12 @@ Personal sites and blogs * [Walden Effect](http://waldeneffect.org) * [Avian Aqua Miser](http://www.avianaquamiser.com/) * [Cosmic Cookout](http://www.cosmiccookout.com/) +* [Backyard Deer](http://www.backyarddeer.com/) +* [Alex Ghitza homepage and blog](http://aghitza.org/) +* [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template +* [Chris Dombroski's boring bliki](https://www.icanttype.org/) +* [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki. +* [Gustaf Thorslund's blog](http://blog.thorslund.org) Please feel free to add your own ikiwiki site! diff --git a/doc/index.mdwn b/doc/index.mdwn index 732cf7a89..06acc9cec 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -24,5 +24,5 @@ The [[forum]] is open for discussions. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] can be submitted and tracked using this wiki. -ikiwiki is developed by [[Joey]] and many contributors, +Ikiwiki is developed by [[Joey]] and many contributors, and is [[FreeSoftware]]. diff --git a/doc/news/version_3.20091113.mdwn b/doc/news/version_3.20091113.mdwn deleted file mode 100644 index 579174011..000000000 --- a/doc/news/version_3.20091113.mdwn +++ /dev/null @@ -1,18 +0,0 @@ -ikiwiki 3.20091113 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * underlay: Fix example values put in setup file to be array - references. - * underlay: Avoid crashing if lists of underlays (or template - directories) are not configured. - * Moved the postscan hook to run on the raw html of a page, before - the template is filled out. This improves the search plugin's indexing, - since it will not include navigational elements from the page template - or sidebar. - * localstyle: New plugin, allows overrding the toplevel local.css - with one that is closer to a page. - * httpauth: Add cgiauthurl setting that can be used to do http basic auth - only when ikiwiki needs authentication, rather than for any access to - the cgi/wiki. - * inline: Do not generate feeds for nested inlines. - * inline: Allow direct inclusion of non-page files in raw mode. - * inline: Fix display of all pages when archive=yes or show=0 are used."""]] diff --git a/doc/news/version_3.20091202.mdwn b/doc/news/version_3.20091202.mdwn deleted file mode 100644 index 60f17fe63..000000000 --- a/doc/news/version_3.20091202.mdwn +++ /dev/null @@ -1,17 +0,0 @@ -ikiwiki 3.20091202 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * meta: Generate meta description tags even when the html scrubber is - enabled. - * meta: Allow use of DESCRIPTION in templates to get at the meta description - value. (Thanks, NicolasLimare) - * inline: Use caching of inlined pages to speed up builds of inlines that - include feeds. Speedup of about 25% for small inlines; could be much - larger for inlines of many, or complex pages. - * Added (incomplete) Turkish po file. Closes: #[556744](http://bugs.debian.org/556744) - Thanks, Recai Oktaş - * date: New plugin that allows inserting date directives that expand to - pretty-printed dates, using the same formatting as used for page - modification date display, etc. - * htmllink: Allow a title attribute to be specified. - * calendar: Add title attributes for all links in the calendars. - * calendar: Fix month wraparound error that broke in December."""]] \ No newline at end of file diff --git a/doc/news/version_3.20091218.mdwn b/doc/news/version_3.20091218.mdwn deleted file mode 100644 index 224e81c4e..000000000 --- a/doc/news/version_3.20091218.mdwn +++ /dev/null @@ -1,11 +0,0 @@ -ikiwiki 3.20091218 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Add complete Spanish basewiki translation done by Fernando Gonzalez de - Requena. - * Improve javascript onload handling. - * monotone: Deal with format change in version 0.45. - (Thanks, Richard Levitte) - * cvs: Add missing bit to Automator. - * attachment: Fix reversion in attachment sorting by age. - * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and - goto."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100102.3.mdwn b/doc/news/version_3.20100102.3.mdwn deleted file mode 100644 index b8f61978c..000000000 --- a/doc/news/version_3.20100102.3.mdwn +++ /dev/null @@ -1,21 +0,0 @@ -ikiwiki 3.20100102.3 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - Happy palindrome day! - - * pagestats: Add show parameter. Closes: #[562129](http://bugs.debian.org/562129) (David Paleino) - * toc: Add startlevel parameter. (kerravonsen) - * Remove example ikiwiki setup file from the Debian package. This - re-enables linking to /usr/share/ikiwiki/examples which has the - example sites also used by auto-blog.setup. The example setup file - can be generated at any time using ikiwiki --dumpsetup so I do - not see a reason to ship it. Closes: #[562183](http://bugs.debian.org/562183) - * Use env hack in python scripts. - * comments: Add a checksum to the name of comment pages, to - avoid merge conflicts when comments are posted to two branches of a - site. - * linkmap: Add option to omit disconnected pages from the map. - * inline: Fix bug that limited displayed pages when feedshow was - specified w/o show. - * Fix several places that did not properly handle capitalization of - the discussionpage setting. Specifically, fixes discussion actions - on discussion pages, and unbreaks the opendiscussion plugin."""]] diff --git a/doc/news/version_3.20100212.mdwn b/doc/news/version_3.20100212.mdwn new file mode 100644 index 000000000..3dcfe5f84 --- /dev/null +++ b/doc/news/version_3.20100212.mdwn @@ -0,0 +1,26 @@ +ikiwiki 3.20100212 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * template: Preprocess parameters before htmlizing. + * img: Fix a bug that could taint @links with undef values. + * setup automator: Configure Term::Readline to use bold for prompt, rather + than default underline. Closes: #[517656](http://bugs.debian.org/517656) + * Allow jumping directly into account registration process by going to + ikiwiki.cgi?do=register + * Improve display of openid in preferences page. + * Add link to userpage (or creation link) to top of preferences page. + * opendiscussion: This plugin will also now allow posting comments + to otherwise locked-down sites. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default, and enable opendiscussion so others can comment. + * Fix color and format plugins to appear in the websetup interface. + * amazon\_s3: Fix to support the EU S3 datacenter, which is more picky + about attempts to create already existing buckets. + * httpauth: When cgiauthurl is configured, httpauth can now be used + alongside other authentication methods (like openid or anonok). Rather + than always redirect to the cgiauthurl for authentication, there is now + a button on the login form to use it. + * httpauth: Add httpauth\_pagespec setting that can be used to limit + pages to only being edited via users authed with httpauth. + * Allow globs to be used in user() pagespecs. + * Group related plugins into sections in the setup file, and drop + unused rcs plugins from the setup file."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100302.mdwn b/doc/news/version_3.20100302.mdwn new file mode 100644 index 000000000..f439b1b23 --- /dev/null +++ b/doc/news/version_3.20100302.mdwn @@ -0,0 +1,12 @@ +ikiwiki 3.20100302 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * comments: Display number of comments in comment action link. + * Rebuild wikis on upgrade to this version to get the comment counts + added to existing pages. + * Loosen regexp, to allow empty quoted parameters in directives. + * Add force\_overwrite setting to make setup automator overwrite existing + files/directories. + * Fix admin openid detection in setup automator, and avoid prompting + for a password. + * Add new --clean option; this makes ikiwiki remove all built + files in the destdir, as well as wrappers and the .ikiwiki directory."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100312.mdwn b/doc/news/version_3.20100312.mdwn new file mode 100644 index 000000000..10c34425d --- /dev/null +++ b/doc/news/version_3.20100312.mdwn @@ -0,0 +1,16 @@ +ikiwiki 3.20100312 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix utf8 issues in calls to md5\_hex. + * moderatedcomments: Added moderate\_pagespec that can be used + to control which users or comment locations are moderated. + This can be used, just for example, to moderate "user(http://myopenid.com/*)" + if you're getting a lot of spammers from one particular openid + provider (who should perhaps answer your emails about them), + while not moderating other users. + * moderatedcomments: The moderate\_users setting is deprecated. Instead, + set moderate\_pagespec to "!admin()" or "user(*)". + * Fix missing span on recentchanges page template. + * search: Avoid '$' in the wikiname appearing unescaped on omega's + query template, where it might crash omega. + * htmlscrubber: Security fix: In data:image/* uris, only allow a few + whitelisted image types. No svg."""]] \ No newline at end of file diff --git a/doc/news/version_3.20100403.mdwn b/doc/news/version_3.20100403.mdwn new file mode 100644 index 000000000..3e9063028 --- /dev/null +++ b/doc/news/version_3.20100403.mdwn @@ -0,0 +1,30 @@ +ikiwiki 3.20100403 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * websetup: Add websetup\_unsafe to allow marking other settings + as unsafe. + * Improve openid url munging; do not display anchors and cgi parameters, + as used by yahoo and google urls. + * Add complete German basewiki and directives translation done by + Sebastian Kuhnert. + * Add a include setting, which can be used to make ikiwiki process + wiki source files, such as .htaccess, that would normally be skipped + for security or other reasons. Closes: #[447267](http://bugs.debian.org/447267) + (Thanks to Aaron Wilson for the original patch.) + * Add support for setup files written in YAML. + * Add --set-yaml switch for setting more complex config file options. + * filecheck: Fix bugs that prevented the pagespecs from matching when + not called by attachment plugin. + * Fix incorrect influence info returned by a failing link() pagespec, + that could lead to bad dependency handling in certain situations. + * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar + if necessary for unusual install. + * auto-blog.setup: Set tagbase by default, since most bloggers will want it. + * Allow wrappers to be built using tcc. (Workaround #452876) + * openid: Use Openid Simple Registration or OpenID Attribute Exchange + to get the user's email address and username. (Neither is yet + used, but they are available in the session object now.) + * page.tmpl: Add Cache-Control must-revalidate to ensure that users + (especially of Firefox) see fresh page content. + * htmlscrubber: Allow colons in urls after '?' + * template: Search for templates in the templatedir, if they are not + found as pages in the wiki."""]] diff --git a/doc/plugins/404.mdwn b/doc/plugins/404.mdwn index ad332ee04..53dace3c9 100644 --- a/doc/plugins/404.mdwn +++ b/doc/plugins/404.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin lets you use the IkiWiki CGI script as an Apache 404 handler, to give the behaviour of various other wiki engines where visiting a diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn index e2efcd83f..bb828b05c 100644 --- a/doc/plugins/aggregate.mdwn +++ b/doc/plugins/aggregate.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=aggregate author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin allows content from other feeds to be aggregated into the wiki. To specify feeds to aggregate, use the diff --git a/doc/plugins/autoindex.mdwn b/doc/plugins/autoindex.mdwn index 03e2d12f3..d1133e4f5 100644 --- a/doc/plugins/autoindex.mdwn +++ b/doc/plugins/autoindex.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=autoindex core=0 author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin searches for [[SubPages|ikiwiki/subpage]] with a missing parent page, and generates the parent pages. The generated page content is diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn index bc1bc6c71..76e718a3b 100644 --- a/doc/plugins/calendar.mdwn +++ b/doc/plugins/calendar.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=calendar author="[[ManojSrivastava]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]]. The directive displays a calendar, similar to the typical calendars shown on @@ -14,6 +14,7 @@ customization. * `month-calendar` - The month calendar as a whole. * `month-calendar-head` - The head of the month calendar (ie,"March"). +* `month-calendar-arrow` - Arrow pointing to previous/next month. * `month-calendar-day-head` - A column head in the month calendar (ie, a day-of-week abbreviation). * `month-calendar-day-noday`, `month-calendar-day-link`, @@ -27,6 +28,7 @@ customization. weekends. * `year-calendar` - The year calendar as a whole. * `year-calendar-head` - The head of the year calendar (ie, "2007"). +* `year-calendar-arrow` - Arrow pointing to previous/next year. * `year-calendar-subhead` - For example, "Months". * `year-calendar-month-link`, `year-calendar-month-nolink`, `year-calendar-month-future`, `year-calendar-this-month` - The month diff --git a/doc/plugins/color.mdwn b/doc/plugins/color.mdwn index dbb8b870c..d639bf563 100644 --- a/doc/plugins/color.mdwn +++ b/doc/plugins/color.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=color core=0 author="[[ptecza]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides a [[ikiwiki/directive/color]] [[ikiwiki/directive]]. The directive can be used to color a piece of text on a page. diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn index b6d4d252b..775ef75a0 100644 --- a/doc/plugins/comments.mdwn +++ b/doc/plugins/comments.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=comments author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin adds "blog-style" comments. Unlike the wiki-style freeform Discussion pages, these comments are posted by a simple form, cannot later @@ -14,8 +14,8 @@ authorship should hopefully be unforgeable by CGI users. The intention is that on a non-wiki site (like a blog) you can lock all pages for admin-only access, then allow otherwise unprivileged (or perhaps even anonymous) users to comment on posts. See the documentation of the -[[lockedit]] and [[anonok]] pages for details on locking down a wiki so -users can only post comments. +[[opendiscussion]], [[lockedit]] and [[anonok]] pages for details on locking +down a wiki so readers can only post comments. Individual comments are stored as internal-use pages named something like `page/comment_1`, `page/comment_2`, etc. These pages internally use a diff --git a/doc/plugins/conditional.mdwn b/doc/plugins/conditional.mdwn index 95ffb2764..27a99bb7c 100644 --- a/doc/plugins/conditional.mdwn +++ b/doc/plugins/conditional.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=conditional core=1 author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/special-purpose]] This plugin provides the [[ikiwiki/directive/if]] [[ikiwiki/directive]]. With this directive, you can make text be conditionally displayed on a page. diff --git a/doc/plugins/conditional/discussion.mdwn b/doc/plugins/conditional/discussion.mdwn index 629d05940..6e84fdfc1 100644 --- a/doc/plugins/conditional/discussion.mdwn +++ b/doc/plugins/conditional/discussion.mdwn @@ -1,3 +1,28 @@ +## Conditional broken? + +Using \[\[!if test="tagged(plugin)" then="= Tagged as plugin =" else="*No plugins found*"]] on this wiki *should* present the 'Tagged as plugin' heading, instead it emits 'no plugins found'. Is the conditional plugin currently broken for tags or am I misusing it? Thanks. + +-- Thiana + +> This wiki has no page named "plugin", so nothing links to it; tags are a species of link +> so tagging a large number of pages with a tag that doesn't exist (which change has +> been reverted) doesn't make the pagespec match. It would if the tag's page existed. --[[Joey]] + +>> So if I understand this correctly... Assuming the tags Tag_A and Tag_B, the existence of +>> @wiki-home@/tags/Tag_A.creole, and a number of files with a \[\[!tag Tag_A Tag_B]] the +>> following is correct? +>> +>> * \[\[!if test="tagged(Tag_A)" then="OK" else="Fail"]] => OK +>> * \[\[!if test="tagged(Tag_B)" then="OK" else="Fail"]] => Fail +>> * \[\[!if test="tagged(Tag_A) and tagged(Tag_B)" then="OK" else="Fail"]] => Fail +>> +>> Is that the expected behaviour? If so, that's not what I'm seeing here since they all result +>> in a Fail. If not, what exactly is wrong with those conditionals? Thanks. +>> +>> -- Thiana + +---- + Would there be a way for this plugin to emit fewer blank lines (i.e. *none at all*)? For example, having a look at [this page](http://www.bddebian.com/~wiki/Hurd/)'s sidebar. diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn new file mode 100644 index 000000000..103e061e5 --- /dev/null +++ b/doc/plugins/contrib/field/discussion.mdwn @@ -0,0 +1,326 @@ +Having tried out `field`, some comments (from [[smcv]]): + +The general concept looks great. + +The `pagetemplate` hook seems quite namespace-polluting: on a site containing +a list of books, I'd like to have an `author` field, but that would collide +with IkiWiki's use of `<TMPL_VAR AUTHOR>` for the author of the *page* +(i.e. me). Perhaps it'd be better if the pagetemplate hook was only active for +`<TMPL_VAR FIELD_AUTHOR>` or something? (For those who want the current +behaviour, an auxiliary plugin would be easy.) + +> No, please. The idea is to be *able* to override field names if one wishes to, and choose, for yourself, non-colliding field names if one wishes not to. I don't wish to lose the power of being able to, say, define a page title with YAML format if I want to, or to write a site-specific plugin which calculates a page title, or other nifty things. +>It's not like one is going to lose the fields defined by the meta plugin; if "author" is defined by \[[!meta author=...]] then that's what will be found by "field" (provided the "meta" plugin is registered; that's what the "field_register" option is for). +>--[[KathrynAndersen]] + +>> Hmm. I suppose if you put the title (or whatever) in the YAML, then +>> "almost" all the places in IkiWiki that respect titles will do the +>> right thing due to the pagetemplate hook, with the exception being +>> anything that has special side-effects inside `meta` (like `date`), +>> or anything that looks in `$pagestate{foo}{meta}` directly +>> (like `map`). Is your plan that `meta` should register itself by +>> default, and `map` and friends should be adapted to +>> work based on `getfield()` instead of `$pagestate{foo}{meta}`, then? + +>>> Based on `field_get_value()`, yes. That would be my ideal. Do you think I should implement that as an ikiwiki branch? --[[KathrynAndersen]] + +>>>> This doesn't solve cases where certain fields are treated specially; for +>>>> instance, putting a `\[[!meta permalink]]` on a page is not the same as +>>>> putting it in `ymlfront` (in the latter case you won't get your +>>>> `<link>` header), and putting `\[[!meta date]]` is not the same as putting +>>>> `date` in `ymlfront` (in the latter case, `%pagectime` won't be changed). +>>>> +>>>> One way to resolve that would be to have `ymlfront`, or similar, be a +>>>> front-end for `meta` rather than for `field`, and call +>>>> `IkiWiki::Plugin::meta::preprocess` (or a refactored-out function that's +>>>> similar). +>>>> +>>>> There are also some cross-site scripting issues (see below)... --[[smcv]] + +>> (On the site I mentioned, I'm using an unmodified version of `field`, +>> and currently working around the collision by tagging books' pages +>> with `bookauthor` instead of `author` in the YAML.) --s + +>> Revisiting this after more thought, the problem here is similar to the +>> possibility that a wiki user adds a `meta` shortcut +>> to [[shortcuts]], or conversely, that a plugin adds a `cpan` directive +>> that conflicts with the `cpan` shortcut that pages already use. (In the +>> case of shortcuts, this is resolved by having plugin-defined directives +>> always win.) For plugin-defined meta keywords this is the plugin +>> author's/wiki admin's problem - just don't enable conflicting plugins! - +>> but it gets scary when you start introducing things like `ymlfront`, which +>> allow arbitrary, wiki-user-defined fields, even ones that subvert +>> other plugins' assumptions. +>> +>> The `pagetemplate` hook is particularly alarming because page templates are +>> evaluated in many contexts, not all of which are subject to the +>> htmlscrubber or escaping; because the output from `field` isn't filtered, +>> prefixed or delimited, when combined with an arbitrary-key-setting plugin +>> like `ymlfront` it can interfere with other plugins' expectations +>> and potentially cause cross-site scripting exploits. For instance, `inline` +>> has a `pagetemplate` hook which defines the `FEEDLINKS` template variable +>> to be a blob of HTML to put in the `<head>` of the page. As a result, this +>> YAML would be bad: +>> +>> --- +>> FEEDLINKS: <script>alert('code injection detected')</script> +>> --- +>> +>> (It might require a different case combination due to implementation +>> details, I'm not sure.) +>> +>> It's difficult for `field` to do anything about this, because it doesn't +>> know whether a field is meant to be plain text, HTML, a URL, or something +>> else. +>> +>> If `field`'s `pagetemplate` hook did something more limiting - like +>> only emitting template variables starting with `field_`, or from some +>> finite set, or something - then this would cease to be a problem, I think? +>> +>> `ftemplate` and `getfield` don't have this problem, as far as I can see, +>> because their output is in contexts where the user could equally well have +>> written raw HTML directly; the user can cause themselves confusion, but +>> can't cause harmful output. --[[smcv]] + +From a coding style point of view, the `$CamelCase` variable names aren't +IkiWiki style, and the `match_foo` functions look as though they could benefit +from being thin wrappers around a common `&IkiWiki::Plugin::field::match` +function (see `meta` for a similar approach). + +I think the documentation would probably be clearer in a less manpage-like +and more ikiwiki-like style? + +> I don't think ikiwiki *has* a "style" for docs, does it? So I followed the Perl Module style. And I'm rather baffled as to why having the docs laid out in clear sections... make them less clear. --[[KathrynAndersen]] + +>> I keep getting distracted by the big shouty headings :-) +>> I suppose what I was really getting at was that when this plugin +>> is merged, its docs will end up split between its plugin +>> page, [[plugins/write]] and [[ikiwiki/PageSpec]]; on some of the +>> contrib plugins I've added I've tried to separate the docs +>> according to how they'll hopefully be laid out after merge. --s + +If one of my branches from [[todo/allow_plugins_to_add_sorting_methods]] is +accepted, a `field()` cmp type would mean that [[plugins/contrib/report]] can +stop reimplementing sorting. Here's the implementation I'm using, with +your "sortspec" concept (a sort-hook would be very similar): if merged, +I think it should just be part of `field` rather than a separate plugin. + + # Copyright © 2010 Simon McVittie, released under GNU GPL >= 2 + package IkiWiki::Plugin::fieldsort; + use warnings; + use strict; + use IkiWiki 3.00; + use IkiWiki::Plugin::field; + + sub import { + hook(type => "getsetup", id => "fieldsort", call => \&getsetup); + } + + sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, + } + + package IkiWiki::SortSpec; + + sub cmp_field { + if (!length $_[0]) { + error("sort=field requires a parameter"); + } + + my $left = IkiWiki::Plugin::field::field_get_value($_[0], $a); + my $right = IkiWiki::Plugin::field::field_get_value($_[0], $b); + + $left = "" unless defined $left; + $right = "" unless defined $right; + return $left cmp $right; + } + + 1; + +---- + +Disclaimer: I've only looked at this plugin and ymlfront, not other related +stuff yet. (I quite like ymlfront, so I looked at this as its dependency. :) +I also don't want to annoy you with a lot of design discussion +if your main goal was to write a plugin that did exactly what you wanted. + +My first question is: Why we need another plugin storing metadata +about the page, when we already have the meta plugin? Much of the +complication around the field plugin has to do with it accessing info +belonging to the meta plugin, and generalizing that to be able to access +info stored by other plugins too. (But I don't see any other plugins that +currently store such info). Then too, it raises points of confusion like +smcv's discuission of field author vs meta author above. --[[Joey]] + +> The point is exactly in the generalization, to provide a uniform interface for accessing structured data, no matter what the source of it, whether that be the meta plugin or some other plugin. + +> There were a few reasons for this: + +>1. In converting my site over from PmWiki, I needed something that was equivalent to PmWiki's Page-Text-Variables (which is how PmWiki implements structured data). +>2. I also wanted an equivalent of PmWiki's Page-Variables, which, rather than being simple variables, are the return-value of a function. This gives one a lot of power, because one can do calculations, derive one thing from another. Heck, just being able to have a "basename" variable is useful. +>3. I noticed that in the discussion about structured data, it was mired down in disagreements about what form the structured data should take; I wanted to overcome that hurdle by decoupling the form from the content. +>4. I actually use this to solve (1), because, while I do use ymlfront, initially my pages were in PmWiki format (I wrote (another) unreleased plugin which parses PmWiki format) including PmWiki's Page-Text-Variables for structured data. So I needed something that could deal with multiple formats. + +> So, yes, it does cater to mostly my personal needs, but I think it is more generally useful, also. +> --[[KathrynAndersen]] + +>> Is it fair to say, then, that `field`'s purpose is to take other +>> plugins' arbitrary per-page data, and present it as a single +>> merged/flattened string => string map per page? From the plugins +>> here, things you then use that merged map for include: +>> +>> * sorting - stolen by [[todo/allow_plugins_to_add_sorting_methods]] +>> * substitution into pages with Perl-like syntax - `getfield` +>> * substitution into wiki-defined templates - the `pagetemplate` +>> hook +>> * substitution into user-defined templates - `ftemplate` +>> +>> As I mentioned above, the flattening can cause collisions (and in the +>> `pagetemplate` case, even security problems). +>> +>> I wonder whether conflating Page Text Variables with Page Variables +>> causes `field` to be more general than it needs to be? +>> To define a Page Variable (function-like field), you need to write +>> a plugin containing that Perl function; if we assume that `field` +>> or something resembling it gets merged into ikiwiki, then it's +>> reasonable to expect third-party plugins to integrate with whatever +>> scaffolding there is for these (either in an enabled-by-default +>> plugin that most people are expected to leave enabled, like `meta` +>> now, or in the core), and it doesn't seem onerous to expect each +>> plugin that wants to participate in this mechanism to have code to +>> do so. While it's still contrib, `field` could just have a special case +>> for the meta plugin, rather than the converse? +>> +>> If Page Text Variables are limited to being simple strings as you +>> suggest over in [[forum/an_alternative_approach_to_structured_data]], +>> then they're functionally similar to `meta` fields, so one way to +>> get their functionality would be to extend `meta` so that +>> +>> \[[!meta badger="mushroom"]] +>> +>> (for an unrecognised keyword `badger`) would store +>> `$pagestate{$page}{meta}{badger} = "mushroom"`? Getting this to +>> appear in templates might be problematic, because a naive +>> `pagetemplate` hook would have the same problem that `field` combined +>> with `ymlfront` currently does. +>> +>> One disadvantage that would appear if the function-like and +>> meta-like fields weren't in the same namespace would be that it +>> wouldn't be possible to switch a field from being meta-like to being +>> function-like without changing any wiki content that referenced it. +>> +>> Perhaps meta-like fields should just *be* `meta` (with the above +>> enhancement), as a trivial case of function-like fields? That would +>> turn `ymlfront` into an alternative syntax for `meta`, I think? +>> That, in turn, would hopefully solve the special-fields problem, +>> by just delegating it to meta. I've been glad of the ability to define +>> new ad-hoc fields with this plugin without having to write an extra plugin +>> to do so (listing books with a `bookauthor` and sorting them by +>> `"field(bookauthor) title"`), but that'd be just as easy if `meta` +>> accepted ad-hoc fields? +>> +>> --[[smcv]] + +>>> Your point above about cross-site scripting is a valid one, and something I +>>> hadn't thought of (oops). + +>>> I still want to be able to populate pagetemplate templates with field, because I +>>> use it for a number of things, such as setting which CSS files to use for a +>>> given page, and, as I said, for titles. But apart from the titles, I +>>> realize I've been setting them in places other than the page data itself. +>>> (Another unreleased plugin, `concon`, uses Config::Context to be able to +>>> set variables on a per-site, per-directory and a per-page basis). + +>>> The first possible solution is what you suggested above: for field to only +>>> set values in pagetemplate which are prefixed with *field_*. I don't think +>>> this is quite satisfactory, since that would still mean that people could +>>> put un-scrubbed values into a pagetemplate, albeit they would be values +>>> named field_foo, etc. --[[KathrynAndersen]] + +>>>> They can already do similar; `PERMALINK` is pre-sanitized to +>>>> ensure that it's a "safe" URL, but if an extremely confused wiki admin was +>>>> to put `COPYRIGHT` in their RSS/Atom feed's `<link>`, a malicious user +>>>> could put an unsafe (e.g. Javascript) URL in there (`COPYRIGHT` *is* +>>>> HTML-scrubbed, but "javascript:alert('pwned!')" is just text as far as a +>>>> HTML sanitizer is concerned, so it passes straight through). The solution +>>>> is to not use variables in situations where that variable would be +>>>> inappropriate. Because `field` is so generic, the definition of what's +>>>> appropriate is difficult. --[[smcv]] + +>>> An alternative solution would be to classify field registration as "secure" +>>> and "insecure". Sources such as ymlfront would be insecure, sources such +>>> as concon (or the $config hash) would be secure, since they can't be edited +>>> as pages. Then, when doing pagetemplate substitution (but not ftemplate +>>> substitution) the insecure sources could be HTML-escaped. +>>> --[[KathrynAndersen]] + +>>>> Whether you trust the supplier of data seems orthogonal to whether its value +>>>> is (meant to be) interpreted as plain text, HTML, a URL or what? +>>>> +>>>> Even in cases where you trust the supplier, you need to escape things +>>>> suitably for the context, not for security but for correctness. The +>>>> definition of the value, and the context it's being used in, changes the +>>>> processing you need to do. An incomplete list: +>>>> +>>>> * HTML used as HTML needs to be html-scrubbed if and only if untrusted +>>>> * URLs used as URLs need to be put through `safeurl()` if and only if +>>>> untrusted +>>>> * HTML used as plain text needs tags removed regardless +>>>> * URLs used as plain text are safe +>>>> * URLs or plain text used in HTML need HTML-escaping (and URLs also need +>>>> `safeurl()` if untrusted) +>>>> * HTML or plain text used in URLs need URL-escaping (and the resulting +>>>> URL might need sanitizing too?) +>>>> +>>>> I can't immediately think of other data types we'd be interested in beyond +>>>> text, HTML and URL, but I'm sure there are plenty. + +>>>>> But isn't this a problem with anything that uses pagetemplates? Or is +>>>>> the point that, with plugins other than `field`, they all know, +>>>>> beforehand, the names of all the fields that they are dealing with, and +>>>>> thus the writer of the plugin knows which treatment each particular field +>>>>> needs? For example, that `meta` knows that `title` needs to be +>>>>> HTML-escaped, and that `baseurl` doesn't. In that case, yes, I see the problem. +>>>>> It's a tricky one. It isn't as if there's only ever going to be a fixed set of fields that need different treatment, either. Because the site admin is free to add whatever fields they like to the page template (if they aren't using the default one, that is. I'm not using the default one myself). +>>>>> Mind you, for trusted sources, since the person writing the page template and the person providing the variable are the same, they themselves would know whether the value will be treated as HTML, plain text, or a URL, and thus could do the needed escaping themselves when writing down the value. + +>>>>> Looking at the content of the default `page.tmpl` let's see what variables fall into which categories: + +>>>>> * **Used as URL:** BASEURL, EDITURL, PARENTLINKS->URL, RECENTCHANGESURL, HISTORYURL, GETSOURCEURL, PREFSURL, OTHERLANGUAGES->URL, ADDCOMMENTURL, BACKLINKS->URL, MORE_BACKLINKS->URL +>>>>> * **Used as part of a URL:** FAVICON, LOCAL_CSS +>>>>> * **Needs to be HTML-escaped:** TITLE +>>>>> * **Used as-is (as HTML):** FEEDLINKS, RELVCS, META, PERCENTTRANSLATED, SEARCHFORM, COMMENTSLINK, DISCUSSIONLINK, OTHERLANGUAGES->PERCENT, SIDEBAR, CONTENT, COMMENTS, TAGS->LINK, COPYRIGHT, LICENSE, MTIME, EXTRAFOOTER + +>>>>> This looks as if only TITLE needs HTML-escaping all the time, and that the URLS all end with "URL" in their name. Unfortunately the FAVICON and LOCAL_CSS which are part of URLS don't have "URL" in their name, though that's fair enough, since they aren't full URLs. + +>>>>> --K.A. + +>>>> One reasonable option would be to declare that `field` takes text-valued +>>>> fields, in which case either consumers need to escape +>>>> it with `<TMPL_VAR FIELD_FOO ESCAPE=HTML>`, and not interpret it as a URL +>>>> without first checking `safeurl`), or the pagetemplate hook needs to +>>>> pre-escape. + +>>>>> Since HTML::Template does have the ability to do ESCAPE=HTML/URL/JS, why not take advantage of that? Some things, like TITLE, probably should have ESCAPE=HTML all the time; that would solve the "to escape or not to escape" problem that `meta` has with titles. After all, when one *sorts* by title, one doesn't really want HTML-escaping in it; only when one uses it in a template. -- K.A. + +>>>> Another reasonable option would be to declare that `field` takes raw HTML, +>>>> in which case consumers need to only use it in contexts that will be +>>>> HTML-scrubbed (but it becomes unsuitable for using as text - problematic +>>>> for text-based things like sorting or URLs, and not ideal for searching). +>>>> +>>>> You could even let each consumer choose how it's going to use the field, +>>>> by having the `foo` field generate `TEXT_FOO` and `HTML_FOO` variables? +>>>> --[[smcv]] + +>>>>> Something similar is already done in `template` and `ftemplate` with the `raw_` prefix, which determines whether the variable should have `htmlize` run over it first before the value is applied to the template. Of course, that isn't scrubbing or escaping, because with those templates, the scrubbing is done afterwards as part of the normal processing. + +>>> Another problem, as you point out, is special-case fields, such as a number of +>>> those defined by `meta`, which have side-effects associated with them, more +>>> than just providing a value to pagetemplate. Perhaps `meta` should deal with +>>> the side-effects, but use `field` as an interface to get the values of those special fields. + +>>> --[[KathrynAndersen]] diff --git a/doc/plugins/contrib/ftemplate/discussion.mdwn b/doc/plugins/contrib/ftemplate/discussion.mdwn new file mode 100644 index 000000000..1e0bca5d8 --- /dev/null +++ b/doc/plugins/contrib/ftemplate/discussion.mdwn @@ -0,0 +1,33 @@ +I initially thought this wasn't actually necessary - the combination +of [[plugins/template]] with [[plugins/contrib/field]]'s `pagetemplate` +hook ought to provide the same functionality. However, `template` +doesn't run `pagetemplate` hooks; a more general version of this +plugin would be to have a variant of `template` that runs `pagetemplate` +hooks (probably easiest to just patch `template` to implement a +second directive, or have a special parameter `run_hooks="yes"`, +or something). + +> I got the impression that `pagetemplate` hooks are intended to be completely independent of `template` variables; page-template is for the actual `page.tmpl` template, while `template` is for other templates which are used inside the page content. So I don't understand why one would need a run_hooks option. --[[KathrynAndersen]] + +>> `Render`, `inline`, `comments` and `recentchanges` run `pagetemplate` +>> hooks, as does anything that uses `IkiWiki::misctemplate`. From that +>> quick survey, it seems as though `template` is the only thing that +>> uses `HTML::Template` but *doesn't* run `pagetemplate` hooks? +>> +>> It just seems strange to me that `field` needs to have its own +>> variant of `template` (this), its own variant of `inline` (`report`), +>> and so on - I'd tend to lean more towards having `field` +>> enhance the existing plugins. I'm not an ikiwiki committer, +>> mind... Joey, your opinion would be appreciated! --[[smcv]] + +>>> I did it that way basically because I needed the functionality ASAP, and I didn't want to step on anyone's toes, so I made them as separate plugins. If Joey wants to integrate the functionality into IkiWiki proper, I would be very happy, but I don't want to put pressure on him. --[[KathrynAndersen]] + +Another missing thing is that `ftemplate` looks in +the "system" templates directories, not just in the wiki, but that +seems orthogonal (and might be a good enhancement to `template` anyway). +--[[smcv]] + +> Yes, I added that because I wanted the option of not having to make all my templates work as wiki pages also. --[[KathrynAndersen]] + +>> Joey has added support for +>> [[todo/user-defined_templates_outside_the_wiki]] now. --s diff --git a/doc/plugins/contrib/highlightcode.mdwn b/doc/plugins/contrib/highlightcode.mdwn index 8abb76583..f1df204bb 100644 --- a/doc/plugins/contrib/highlightcode.mdwn +++ b/doc/plugins/contrib/highlightcode.mdwn @@ -1,6 +1,8 @@ [[!template id=plugin name=highlightcode author="[[sabr]]"]] [[!tag type/format]] +(An alternative to this plugin, [[plugins/highlight]], is now provided with IkiWiki. --[[smcv]]) + A small plugin to allow Ikiwiki to display source files complete with syntax highlighting. Files with recognized extensions (i.e. my-file.cpp) are be rendered just like any other Ikiwiki page. You can even edit your source files with Ikiwiki's editor. It uses the Syntax::Highlight::Engine::Kate Perl module to do the highlighting. diff --git a/doc/plugins/contrib/pod/discussion.mdwn b/doc/plugins/contrib/pod/discussion.mdwn new file mode 100644 index 000000000..9187b1350 --- /dev/null +++ b/doc/plugins/contrib/pod/discussion.mdwn @@ -0,0 +1,14 @@ +My one concern about this plugin is the `=for` markup in POD. + +> Some format names that formatters currently are known to +> accept include "roff", "man", "latex", "tex", "text", and "html". + +I don't know which of these [[!cpan Pod::Xhtml]] supports. If it currently +supports, or later support latex, that could be problimatic since that +could maybe be used to include files or run code. --[[Joey]] + +> I don't know, either; the documentation for [[!cpan Pod:Xhtml]] is silent on this subject. --[[KathrynAndersen]] + +>> I'm afraid the only approach is to audit the existing code in the perl +>> module(s), and then hope nothing is added to them later that opens a +>> security hole. --[[Joey]] diff --git a/doc/plugins/contrib/postal.mdwn b/doc/plugins/contrib/postal.mdwn index b2f875393..c522f8bcb 100644 --- a/doc/plugins/contrib/postal.mdwn +++ b/doc/plugins/contrib/postal.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=postal author="[[DavidBremner]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] The `postal` plugin allows users to send mail to a special address to comment on a page. It uses the [[mailbox]] diff --git a/doc/plugins/contrib/report.mdwn b/doc/plugins/contrib/report.mdwn index 7130bcb5f..c364d4a3a 100644 --- a/doc/plugins/contrib/report.mdwn +++ b/doc/plugins/contrib/report.mdwn @@ -18,7 +18,7 @@ IkiWiki::Plugin::report - Produce templated reports from page field data. This plugin provides the **report** directive. This enables one to report on the structured data ("field" values) of multiple pages; the output is formatted -via a template. This depends on the "field" plugin. +via a template. This depends on the [[plugins/contrib/field]] plugin. The pages to report on are selected by a PageSpec given by the "pages" parameter. The template is given by the "template" parameter. @@ -89,7 +89,7 @@ The "mood_summary" template might be like this: ## <TMPL_VAR NAME="HEADER1"> </TMPL_IF> ### <TMPL_VAR NAME="TITLE"> - (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE"]] + (<TMPL_VAR NAME="DATE">) \[[<TMPL_VAR NAME="PAGE">]] <TMPL_VAR NAME="DESCRIPTION"> ### Advanced Options diff --git a/doc/plugins/contrib/report/discussion.mdwn b/doc/plugins/contrib/report/discussion.mdwn new file mode 100644 index 000000000..e23a4ced4 --- /dev/null +++ b/doc/plugins/contrib/report/discussion.mdwn @@ -0,0 +1,75 @@ +Wow, this plugin does a lot... it seems to be `inline` (but without the feeds +or the ability to not have `archive="yes"`), plus part of +[[plugins/contrib/trail]], plus some sorting, plus an ingenious workaround +for template evaluation being relatively stateless. + +A large part of this plugin would just fall off if one of the versions of +"[[todo/allow_plugins_to_add_sorting_methods]]" was merged, which was a +large part of the idea of that feature request :-) To make use of that +you'd have to use `pagespec_match_list` in the trail case too, but that's +easy enough - just add `list => [@the_trail_pages]` to the arguments. + +Another large part would fall off if this plugin required, and internally +invoked, `inline` (like my `comments` plugin does) - `inline` runs +`pagetemplate` hooks, and in particular, it'll run the `field` hook. +Alternatively, this plugin could invoke `pagetemplate` hooks itself, +removing the special case for `field`. + +Perhaps the `headers` thing could migrate into inline somehow? That might +lead to making inline too big, though. + +> I think inline is *already* too big, honestly. --[[KathrynAndersen]] + +>> A fair point; perhaps my complaint should be that *inline* does +>> too many orthogonal things. I suppose the headers feature wouldn't +>> really make sense in an inline that didn't have `archive="yes"`, +>> so it'd make sense to recommend this plugin as a replacement +>> for inlining with archive=yes (for which I now realise "inline" +>> is the wrong verb anyway :-) ) --s + +>>> I think *inline* would be a bit less unwieldy if there was some way of factoring out the feed stuff into a separate plugin, but I don't know if that's possible. --K.A. + +Is the intention that the `trail` part is a performance hack, or a way +to select pages? How does it relate to [[todo/wikitrails]] or +[[plugins/contrib/trail]]? --[[smcv]] + +> The `trail` part is *both* a performance hack, and a way to select pages. I have over 5000 pages on my site, I need all the performance hacks I can get. +> For the performance hack, it is a way of reducing the need to iterate through every single page in the wiki in order to find matching pages. +> For the way-to-select-pages, yes, it is intended to be similar to [[todo/wikitrails]] and [[plugins/contrib/trail]] (and will be more similar with the new release which will be happening soon; it will add prev_* and next_* variables). +> The idea is that, rather than having to add special "trail" links on PageA to indicate that a page is part of the trail, +> it takes advantage of the `%links` hash, which already contains, for each page, an array of the links from that page to other pages. No need for special markup, just use what's there; a trail is defined as "all the pages linked to from page X", and since it's an array, it has an order already. +> But to avoid that being too limiting, one can use a `pages=...` pagespec to filter that list to a subset; only the pages one is interested in. +> And one can also sort it, if one so desires. +> --[[KathrynAndersen]] + +>> That's an interesting approach to trails; I'd missed the fact that +>> links are already ordered. +>> +>> This does have the same problems as tags, though: see +>> [[bugs/tagged()_matching_wikilinks]] and +>> [[todo/matching_different_kinds_of_links]]. I suppose the question +>> now is whether new code should be consistent with `tag` (and +>> potentially be fixed at the same time as tag itself), or try to +>> avoid those problems? +>> +>> The combination of `trail` with another pagespec in this plugin +>> does provide a neat way for it to work around having unwanted +>> pages in the report, by limiting by a suitable tag or subdirectory +>> or something. --s + +>>> Either that, or somehow combine tagging with fields, such that one could declare a tag, and it would create both a link and a field with a given value. (I've been working on something like that, but it still has bugs). +>>> That way, the test for whether something is tagged would be something like "link(tag/foo) and field(tag foo)". +>>> --K.A. + +>>>> I can see that this'd work well for 1:1 relationships like next +>>>> and previous, but I don't think that'd work for pages with more than +>>>> one tag - as far as I can see, `field`'s data model is that each +>>>> page has no more than one value for each field? +>>>> [[todo/Matching_different_kinds_of_links]] has some thoughts about +>>>> how it could be implemented, though. --s + +>>>>> You have a point there. I'm not sure what would be better: to add the concept of arrays/sets to `field`, or to think of tags as a special case. Problem is, I find tags as they currently exist to be too limiting. I prefer something that can be used for Faceted Tagging <http://en.wikipedia.org/wiki/Faceted_classification>; that is, things like Author:Fred Nurk, Genre:Historical, Rating:Good, and so on. Of course, that doesn't mean that each tag is limited to only one value, either; just to take the above examples, something might have more than one author, or have multiple genres (such as Historical + Romance). + +>>>>> It might be that adding arrays to the `field` plugin is a good way to go: after all, even though field=value is the most common, with the flexibility of things like YAML, one could define all sorts of things. What I'm not so sure about is how to return the values when queried, since some things would be expecting scalars all the time. Ah, perhaps I could use wantarray? +>>>>> Is there a way of checking a HTML::Template template to see if it expecting an array for a particular value? +>>>>> --[[KathrynAndersen]] diff --git a/doc/plugins/contrib/xslt/discussion.mdwn b/doc/plugins/contrib/xslt/discussion.mdwn index 9cda02f88..72cce083c 100644 --- a/doc/plugins/contrib/xslt/discussion.mdwn +++ b/doc/plugins/contrib/xslt/discussion.mdwn @@ -20,3 +20,30 @@ possible. Can it also read other arbitrary files, run other programs, etc? > For the second point, I think the main concern would be resource usage. XSLT is a pretty limited language; it can read other XML files, but it can't run other programs so far as I know. > -- [[KathrynAndersen]] + +>> XSLT is, indeed, a Turing-complete programming language. + However, [XML::LibXSLT][] provides a set of functions to help + to minimize the damage that may be caused by running a random + program. + +>> In particular, `max_depth ()` allows for the maximum + recursion depth to be set, while + `read_file ()`, `write_file ()`, `create_dir ()`, + `read_net ()` and `write_net ()` + are the callbacks that allow any of the possible file + operations to be denied. + +>> To be honest, I'd prefer for the `read_file ()` callback to + only grant access to the files below the Ikiwiki source + directory, and for all the `write_`… and + …`_net` callbacks to deny the access unconditionally. + +>> One more wishlist item: allow the set of locations to take + `.xsl` files from to be preconfigured, so that, e. g., + one could allow (preasumably trusted) system stylesheets, + while disallowing any stylesheets that are placed on the Wiki + itself. + +>> — Ivan Shmakov, 2010-03-28Z. + +[XML::LibXSLT]: http://search.cpan.org/~PAJAS/XML-LibXSLT/LibXSLT.pm diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn new file mode 100644 index 000000000..3ad02af29 --- /dev/null +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -0,0 +1,11 @@ +My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb: +<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>) +has some fixes for compatibility with old YAML modules, mostly done by imitating +Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]] + +> I would if I could *find* it. I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what? +> --[[KathrynAndersen]] + +>> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a +>> different checkout. I've put it back; it's a branch from your `ikiplugins.git`, +>> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]] diff --git a/doc/plugins/creole/discussion.mdwn b/doc/plugins/creole/discussion.mdwn index 38ee2bd78..7f47c2c97 100644 --- a/doc/plugins/creole/discussion.mdwn +++ b/doc/plugins/creole/discussion.mdwn @@ -12,4 +12,11 @@ I've installed Text::WikiCreole 0.05 and enabled the plugin, but I get an error >>> forgot, done now --[[Joey]] +--- +## External Links + I'm moving over a really stinkingly old UseMod and creole seems the nearest match. I've worked out that Bare /Subpage links need to become \[\[Subpage\]\], and Top/Sub links need to be \[\[Top/Sub\]\] (or \[\[Top/Sub|Top/Sub\]\], to display in exactly the same way), but I'm stuck on generic hyperlinks. The creole cheat sheet says I should be able to do \[\[http://url.path/foo|LinkText\]\], but that comes out as a link to create the "linktext" page, and Markdown-style \[Link Text\](http://url.path/foo) just gets rendered as is. Any suggestions? --[[schmonz]] + +> Was this problem ever solved? -- Thiana + +>> Not by me. If I were looking at the problem now, with fresh eyes, I'd probably bite the bullet and just convert everything to Markdown. --[[schmonz]] diff --git a/doc/plugins/cutpaste.mdwn b/doc/plugins/cutpaste.mdwn index f74f8a269..ea3665c44 100644 --- a/doc/plugins/cutpaste.mdwn +++ b/doc/plugins/cutpaste.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=cutpaste author="[[Enrico]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/cut]], [[ikiwiki/directive/copy]] and [[ikiwiki/directive/paste]] diff --git a/doc/plugins/date.mdwn b/doc/plugins/date.mdwn index b8dbdfee5..2a33f014c 100644 --- a/doc/plugins/date.mdwn +++ b/doc/plugins/date.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=date author="[[Joey]]"]] -[[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/date]] [[ikiwiki/directive]], which provides a way to display an arbitrary date diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn index 741606a6e..17bb16cff 100644 --- a/doc/plugins/ddate.mdwn +++ b/doc/plugins/ddate.mdwn @@ -1,6 +1,7 @@ [[!template id=plugin name=ddate author="[[Joey]]"]] [[!tag type/fun]] [[!tag type/date]] +[[!tag type/chrome]] Enables use of Discordian dates. `--timeformat` can be used to change the date format; see `ddate(1)`. diff --git a/doc/plugins/editpage.mdwn b/doc/plugins/editpage.mdwn index b830e51aa..346ee7c78 100644 --- a/doc/plugins/editpage.mdwn +++ b/doc/plugins/editpage.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=editpage core=1 author="[[Joey]]"]] +[[!tag type/web]] This plugin allows editing wiki pages in the web interface. It's enabled by default if [[cgi]] is enabled; disable it if you want cgi for other things diff --git a/doc/plugins/filecheck.mdwn b/doc/plugins/filecheck.mdwn index f4563d58e..e5f68b29c 100644 --- a/doc/plugins/filecheck.mdwn +++ b/doc/plugins/filecheck.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=filecheck core=0 author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin enhances the regular [[ikiwiki/PageSpec]] syntax with some additional tests, for things like file size, mime type, and virus diff --git a/doc/plugins/format.mdwn b/doc/plugins/format.mdwn index 91e707fcf..b41d365aa 100644 --- a/doc/plugins/format.mdwn +++ b/doc/plugins/format.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=format core=0 author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin allows mixing different page formats together, by embedding text formatted one way inside a page formatted another way. This is done diff --git a/doc/plugins/fortune.mdwn b/doc/plugins/fortune.mdwn index 9966f456d..3cb125ac1 100644 --- a/doc/plugins/fortune.mdwn +++ b/doc/plugins/fortune.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=fortune author="[[Joey]]"]] [[!tag type/fun]] +[[!tag type/widget]] This plugin implements the [[ikiwiki/directive/fortune]] [[ikiwiki/directive]]. This directive uses the `fortune` program to insert a fortune into the page. diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn index 20040ccee..d5404a628 100644 --- a/doc/plugins/getsource.mdwn +++ b/doc/plugins/getsource.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]] +[[!tag type/web]] This plugin adds a "Source" link to the top of each page that uses the CGI to display the page's source. diff --git a/doc/plugins/getsource/discussion.mdwn b/doc/plugins/getsource/discussion.mdwn new file mode 100644 index 000000000..45a1d62b5 --- /dev/null +++ b/doc/plugins/getsource/discussion.mdwn @@ -0,0 +1 @@ +It would be very cool if this plugin was enabled by default. One of the best ways to learn how to do various advanced things is to be able to "view source" on other wiki's which do things you like. -- [[AdamShand]] diff --git a/doc/plugins/goto.mdwn b/doc/plugins/goto.mdwn index 9c401c5d2..8e1de7a10 100644 --- a/doc/plugins/goto.mdwn +++ b/doc/plugins/goto.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=goto author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly for internal use by the [[404]], [[comments]] and [[recentchanges]] diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn index b89f16b59..65130ae8c 100644 --- a/doc/plugins/graphviz.mdwn +++ b/doc/plugins/graphviz.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=graphviz author="[[JoshTriplett]]"]] -[[!tag type/chrome type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/graph]] [[ikiwiki/directive]]. This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a diff --git a/doc/plugins/haiku.mdwn b/doc/plugins/haiku.mdwn index 74eac1c29..448733d95 100644 --- a/doc/plugins/haiku.mdwn +++ b/doc/plugins/haiku.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=haiku author="[[Joey]]"]] [[!tag type/fun]] +[[!tag type/widget]] This plugin provides a [[ikiwiki/directive/haiku]] [[ikiwiki/directive]]. The directive allows inserting a randomly generated haiku into a wiki page. diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn index 77796a3d7..0eda5554f 100644 --- a/doc/plugins/httpauth.mdwn +++ b/doc/plugins/httpauth.mdwn @@ -14,12 +14,22 @@ signed into the wiki. This method is suitable only for private wikis. ## separate cgiauthurl To use httpauth for a wiki where the content is public, and where -the `ikiwiki.cgi` needs to be usable without authentication (for searching -and so on), you can configure a separate url that is used for -authentication, via the `cgiauthurl` option in the setup file. This -url will then be redirected to whenever authentication is needed. +the `ikiwiki.cgi` needs to be usable without authentication (for searching, +or logging in using other methods, and so on), you can configure a separate +url that is used for authentication, via the `cgiauthurl` option in the setup +file. This url will then be redirected to when a user chooses to log in using +httpauth. A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` into it. Then configure the web server to require authentication only for access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this symlink. + +## using only httpauth for some pages + +If you want to only use httpauth for editing some pages, while allowing +other authentication methods to be used for other pages, you can +configure `httpauth_pagespec` in the setup file. This makes Edit +links on pages that match the [[ikiwiki/PageSpec]] automatically use +the `cgiauthurl`, and prevents matching pages from being edited by +users authentication via other methods. diff --git a/doc/plugins/img.mdwn b/doc/plugins/img.mdwn index 114438765..a6cd90f28 100644 --- a/doc/plugins/img.mdwn +++ b/doc/plugins/img.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=img author="Christian Mock"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/img]] [[ikiwiki/directive]]. While ikiwiki supports inlining full-size images by making a diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn index 6c3282576..3eb849fdb 100644 --- a/doc/plugins/inline.mdwn +++ b/doc/plugins/inline.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=inline core=1 author="[[Joey]]"]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/inline]] [[ikiwiki/directive]], which allows including one wiki page diff --git a/doc/plugins/linkmap.mdwn b/doc/plugins/linkmap.mdwn index 89cb9d8ae..7e51cd935 100644 --- a/doc/plugins/linkmap.mdwn +++ b/doc/plugins/linkmap.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=linkmap author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] [[!tag type/slow]] This plugin provides the [[ikiwiki/directive/linkmap]] [[ikiwiki/directive]]. diff --git a/doc/plugins/listdirectives.mdwn b/doc/plugins/listdirectives.mdwn index 2d9bce01d..df854de52 100644 --- a/doc/plugins/listdirectives.mdwn +++ b/doc/plugins/listdirectives.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=listdirectives author="Will"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/listdirectives]] [[ikiwiki/directive]], which inserts a list of currently available diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn index c8f64ea47..681163203 100644 --- a/doc/plugins/lockedit.mdwn +++ b/doc/plugins/lockedit.mdwn @@ -12,14 +12,9 @@ to lock. For example, you could choose to lock all pages created before 2006, or all pages that are linked to from the page named "locked". More usually though, you'll just list some names of pages to lock. -One handy thing to do if you're using ikiwiki for your blog is to lock -"* and !*/Discussion". This prevents others from adding to or modifying -posts in your blog, while still letting them comment via the Discussion -pages. - -Alternatively, if you're using the [[comments]] plugin, you can lock -"!postcomment(*)" to allow users to comment on pages, but not edit anything -else. +If you want to lock down a blog so only you can post to it, you can just +lock "*", and enable the [[opendiscussion]] plugin, so readers can still post +[[comments]]. Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]] can specify that some pages are not locked for some users. For example, diff --git a/doc/plugins/map.mdwn b/doc/plugins/map.mdwn index 8f5a9f15e..b164d5ca8 100644 --- a/doc/plugins/map.mdwn +++ b/doc/plugins/map.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=map author="Alessandro Dotti Contra"]] -[[!tag type/meta]] +[[!tag type/meta type/widget]] This plugin provides the [[ikiwiki/directive/map]] [[ikiwiki/directive]], which generates a hierarchical page map for the wiki. diff --git a/doc/plugins/mirrorlist.mdwn b/doc/plugins/mirrorlist.mdwn index b371e8eb7..aedc1f4a0 100644 --- a/doc/plugins/mirrorlist.mdwn +++ b/doc/plugins/mirrorlist.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=mirror author="[[Joey]]"]] -[[!tag type/special-purpose]] +[[!tag type/web]] This plugin allows adding links a list of mirrors to each page in the wiki. For each mirror, a name and an url should be specified. Pages are diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn index 97924d742..f9466e833 100644 --- a/doc/plugins/moderatedcomments.mdwn +++ b/doc/plugins/moderatedcomments.mdwn @@ -5,6 +5,8 @@ This plugin causes [[comments]] to be held for manual moderation. Admins can access the comment moderation queue via their preferences page. By default, all comments made by anyone who is not an admin will be held -for moderation. The `moderate_users` setting can be set to false to avoid -moderating comments of logged-in users, while still moderating anonymous -comments. +for moderation. The `moderate_pagespec` setting can be used to specify a +[[ikiwiki/PageSpec]] to match comments and users who should be moderated. +For example, to avoid moderating comments from logged-in users, set +`moderate_pagespec` to "`!user(*)`". Or to moderate everyone except for +admins, set it to "`!admin(*)`". diff --git a/doc/plugins/more.mdwn b/doc/plugins/more.mdwn index e9a971289..a0664e843 100644 --- a/doc/plugins/more.mdwn +++ b/doc/plugins/more.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=more author="Ben"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/more]] [[ikiwiki/directive]], which is a way to have a "more" link on a post in a blog, that leads to the diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn index b2ba68bf7..3b5ab4858 100644 --- a/doc/plugins/opendiscussion.mdwn +++ b/doc/plugins/opendiscussion.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=opendiscussion author="[[Joey]]"]] [[!tag type/auth]] -This plugin allows editing of Discussion pages by anonymous users who have -not logged into the wiki. +This plugin allows editing of Discussion pages, and posting of comments, +even when the [[lockedit]] plugin has been configured to otherwise prevent +editing. diff --git a/doc/plugins/orphans.mdwn b/doc/plugins/orphans.mdwn index e403c2d18..09ad0a51d 100644 --- a/doc/plugins/orphans.mdwn +++ b/doc/plugins/orphans.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=orphans author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/orphans]] [[ikiwiki/directive]], which generates a list of possibly orphaned pages -- diff --git a/doc/plugins/pagecount.mdwn b/doc/plugins/pagecount.mdwn index a56027e60..71872fae8 100644 --- a/doc/plugins/pagecount.mdwn +++ b/doc/plugins/pagecount.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=pagecount author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/pagecount]] [[ikiwiki/directive]], which displays the number of pages diff --git a/doc/plugins/pagestats.mdwn b/doc/plugins/pagestats.mdwn index c3eba6363..347e39a89 100644 --- a/doc/plugins/pagestats.mdwn +++ b/doc/plugins/pagestats.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=pagestats author="Enrico Zini"]] -[[!tag type/meta type/tags]] +[[!tag type/meta type/tags type/widget]] This plugin provides the [[ikiwiki/directive/pagestats]] [[ikiwiki/directive]], which can generate stats about how pages link to diff --git a/doc/plugins/parentlinks.mdwn b/doc/plugins/parentlinks.mdwn index ef262a30c..c2d364bef 100644 --- a/doc/plugins/parentlinks.mdwn +++ b/doc/plugins/parentlinks.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=parentlinks core=1 author="[[intrigeri]]"]] -[[!tag type/link]] +[[!tag type/link type/chrome]] This plugin generates the links to a page's parents that typically appear at the top of a wiki page. diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn index 510f67798..099cb399c 100644 --- a/doc/plugins/poll.mdwn +++ b/doc/plugins/poll.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=poll author="[[Joey]]"]] -[[!tag type/web]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/poll]] [[ikiwiki/directive]], which allows inserting an online poll into a page. diff --git a/doc/plugins/polygen.mdwn b/doc/plugins/polygen.mdwn index 6045c1ec9..f9cea1f4d 100644 --- a/doc/plugins/polygen.mdwn +++ b/doc/plugins/polygen.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=polygen author="Enrico Zini"]] [[!tag type/fun]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/polygen]] [[ikiwiki/directive]], which allows inserting text generated by polygen into a wiki page. diff --git a/doc/plugins/postsparkline.mdwn b/doc/plugins/postsparkline.mdwn index c81f91bdc..b0733e343 100644 --- a/doc/plugins/postsparkline.mdwn +++ b/doc/plugins/postsparkline.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=postsparkline author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/postsparkline]] [[ikiwiki/directive]]. It uses the [[sparkline]] plugin to create a sparkline of diff --git a/doc/plugins/prettydate.mdwn b/doc/plugins/prettydate.mdwn index 11ad4252f..149b7c29c 100644 --- a/doc/plugins/prettydate.mdwn +++ b/doc/plugins/prettydate.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=prettydate author="[[Joey]]"]] [[!tag type/date]] +[[!tag type/chrome]] Enabling this plugin changes the dates displayed on pages in the wiki to a format that is nice and easy to read. Examples: "late Wednesday evening, diff --git a/doc/plugins/progress.mdwn b/doc/plugins/progress.mdwn index e1b560cc8..20736d18c 100644 --- a/doc/plugins/progress.mdwn +++ b/doc/plugins/progress.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=progress author="[[Will]]"]] -[[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/progress]] [[ikiwiki/directive]], which generates a progress bar. diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index 9375296a4..823f68502 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=recentchanges core=1 author="[[Joey]]"]] +[[!tag type/meta]] This plugin examines the [[revision_control_system|rcs]] history and generates a page describing each recent change made to the wiki. These diff --git a/doc/plugins/recentchangesdiff.mdwn b/doc/plugins/recentchangesdiff.mdwn index a7b113ade..57299f92d 100644 --- a/doc/plugins/recentchangesdiff.mdwn +++ b/doc/plugins/recentchangesdiff.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=recentchangesdiff core=0 author="[[Joey]]"]] +[[!tag type/meta]] This plugin extends the [[recentchanges]] plugin, adding a diff for each change. The diffs are by default hidden from display on the recentchanges diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn index 50c96c5d7..d6e8eb08b 100644 --- a/doc/plugins/relativedate.mdwn +++ b/doc/plugins/relativedate.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=relativedate author="[[Joey]]"]] [[!tag type/date]] +[[!tag type/chrome]] This plugin lets dates be displayed in relative form. Examples: "2 days ago", "1 month and 3 days ago", "30 minutes ago". Hovering over the date will diff --git a/doc/plugins/rename.mdwn b/doc/plugins/rename.mdwn index ddaede8b0..abb361329 100644 --- a/doc/plugins/rename.mdwn +++ b/doc/plugins/rename.mdwn @@ -2,7 +2,8 @@ [[!tag type/web]] This plugin allows pages or other files to be renamed using the web -interface. +interface. Following Unix tradition, renaming also allows moving to a +different directory. Users can only rename things that they are allowed to edit or upload. diff --git a/doc/plugins/repolist.mdwn b/doc/plugins/repolist.mdwn index 9b3a7575e..efd9c9352 100644 --- a/doc/plugins/repolist.mdwn +++ b/doc/plugins/repolist.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=repolist author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin allows you to configure ikiwiki with the location of [[rcs]] repositories for your wiki's source. This is done via the diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn index 315b663c0..e48886168 100644 --- a/doc/plugins/rsync.mdwn +++ b/doc/plugins/rsync.mdwn @@ -1,4 +1,5 @@ [[!template id=plugin name=rsync author="[[schmonz]]"]] +[[!tag type/special-purpose]] This plugin allows ikiwiki to push generated pages to another host by running a command such as `rsync`. diff --git a/doc/plugins/shortcut.mdwn b/doc/plugins/shortcut.mdwn index cca1f4bdd..1e8e85ed8 100644 --- a/doc/plugins/shortcut.mdwn +++ b/doc/plugins/shortcut.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=shortcut author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/shortcut]] [[ikiwiki/directive]]. It allows external links to commonly linked to sites to be made diff --git a/doc/plugins/sidebar.mdwn b/doc/plugins/sidebar.mdwn index 4e356d65a..012733456 100644 --- a/doc/plugins/sidebar.mdwn +++ b/doc/plugins/sidebar.mdwn @@ -1,24 +1,27 @@ [[!template id=plugin name=sidebar author="Tuomo Valkonen"]] [[!tag type/chrome]] -If this plugin is enabled, then a sidebar is added to pages in the wiki. -The content of the sidebar is simply the content of a page named -"sidebar" (ie, create a "sidebar.mdwn"). +This plugin allows adding a sidebar to pages in the wiki. + +By default, and unless the `global_sidebars` setting is turned off, +a sidebar is added to all pages in the wiki. The content of the sidebar +is simply the content of a page named "sidebar" (ie, create a "sidebar.mdwn"). Typically this will be a page in the root of the wiki, but it can also be a [[ikiwiki/SubPage]]. In fact, this page, [[plugins/sidebar|plugins/sidebar]], will be treated as a sidebar for the [[plugins]] page, and of all of its SubPages, if the plugin is enabled. -Note that to disable a sidebar for a [[ikiwiki/SubPage]] of a page that has -a sidebar, you can create a sidebar page that is completely empty. This -will turn off the sidebar altogether. +There is also a [[ikiwiki/directive/sidebar]] directive that can be used +to provide a custom sidebar content for a page. + +---- -Warning: Any change to the sidebar will cause a rebuild of the whole wiki, -since every page includes a copy that has to be updated. This can -especially be a problem if the sidebar includes an [[ikiwiki/directive/inline]] -directive, since any changes to pages inlined into the sidebar -will change the sidebar and cause a full wiki rebuild. +Warning: Any change to the sidebar page will cause a rebuild of the whole +wiki, since every page includes a copy that has to be updated. This can +especially be a problem if the sidebar includes an +[[ikiwiki/directive/inline]] directive, since any changes to pages inlined +into the sidebar will change the sidebar and cause a full wiki rebuild. Instead, if you include a [[ikiwiki/directive/map]] directive on the sidebar, and it does not use the `show` parameter, only adding or removing pages diff --git a/doc/plugins/sortnaturally.mdwn b/doc/plugins/sortnaturally.mdwn new file mode 100644 index 000000000..a16381946 --- /dev/null +++ b/doc/plugins/sortnaturally.mdwn @@ -0,0 +1,6 @@ +[[!template id=plugin name=sortnaturally core=1 author="[[chrysn]], [[smcv]]"]] +[[!tag type/meta]] + +This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]] +order, which uses [[!cpan Sort::Naturally]] to sort numbered pages in a +more natural order. diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn index bcc5daec6..ee3928d7e 100644 --- a/doc/plugins/sparkline.mdwn +++ b/doc/plugins/sparkline.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=sparkline author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/sparkline]] [[ikiwiki/directive]], which allows for easily embedding sparklines into diff --git a/doc/plugins/table.mdwn b/doc/plugins/table.mdwn index 10a85bb2c..fe66f90a8 100644 --- a/doc/plugins/table.mdwn +++ b/doc/plugins/table.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=table author="[[VictorMoral]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]]. It can build HTML tables from data in CSV (comma-separated values) diff --git a/doc/plugins/template.mdwn b/doc/plugins/template.mdwn index 3485fe64c..da775f232 100644 --- a/doc/plugins/template.mdwn +++ b/doc/plugins/template.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=template author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]]. With this plugin, you can set up templates, and cause them to be filled out diff --git a/doc/plugins/testpagespec.mdwn b/doc/plugins/testpagespec.mdwn index dabcb0bec..8180d5d4b 100644 --- a/doc/plugins/testpagespec.mdwn +++ b/doc/plugins/testpagespec.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=testpagespec author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin provides a [[ikiwiki/directive/testpagespec]] [[ikiwiki/directive]]. The directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a diff --git a/doc/plugins/teximg.mdwn b/doc/plugins/teximg.mdwn index ae052837f..f3cade85f 100644 --- a/doc/plugins/teximg.mdwn +++ b/doc/plugins/teximg.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=teximg author="[[PatrickWinnertz]]"]] -[[!tag type/chrome type/slow]] +[[!tag type/widget type/slow]] This plugin provides a [[ikiwiki/directive/teximg]] [[ikiwiki/directive]], that renders LaTeX formulas into images. diff --git a/doc/plugins/toc.mdwn b/doc/plugins/toc.mdwn index 2b7686681..a0ad3a5d0 100644 --- a/doc/plugins/toc.mdwn +++ b/doc/plugins/toc.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=toc author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/toc]] [[ikiwiki/directive]], which adds a table of contents to a page. diff --git a/doc/plugins/toggle.mdwn b/doc/plugins/toggle.mdwn index 69ac613e0..d1500eba0 100644 --- a/doc/plugins/toggle.mdwn +++ b/doc/plugins/toggle.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=toggle author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/toggle]] and [[ikiwiki/directive/toggleable]] [[directives|ikiwiki/directive]]. diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn index 420898d09..a3087c9e0 100644 --- a/doc/plugins/txt.mdwn +++ b/doc/plugins/txt.mdwn @@ -12,3 +12,8 @@ The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and [[directives|ikiwiki/directive]] are still expanded by ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs in the txt file are converted to hyperlinks. + +---- + +As a special case, a file `robots.txt` will be copied intact into the +`destdir`, as well as creating a wiki page named "robots". diff --git a/doc/plugins/type/chrome.mdwn b/doc/plugins/type/chrome.mdwn index d3f0eb3d3..a1c6d0728 100644 --- a/doc/plugins/type/chrome.mdwn +++ b/doc/plugins/type/chrome.mdwn @@ -1 +1 @@ -These plugins affect the look and feel of the wiki. +These plugins affect the look and feel of the overall wiki. diff --git a/doc/plugins/type/useful.mdwn b/doc/plugins/type/useful.mdwn deleted file mode 100644 index 92fcf5af1..000000000 --- a/doc/plugins/type/useful.mdwn +++ /dev/null @@ -1 +0,0 @@ -These plugins perform various miscellaneous useful functions. diff --git a/doc/plugins/type/widget.mdwn b/doc/plugins/type/widget.mdwn new file mode 100644 index 000000000..875829d0b --- /dev/null +++ b/doc/plugins/type/widget.mdwn @@ -0,0 +1,2 @@ +These plugins allow inserting various things into pages via a +[[ikiwiki/directive]]. diff --git a/doc/plugins/typography.mdwn b/doc/plugins/typography.mdwn index 030ef8052..9ff6c4ffd 100644 --- a/doc/plugins/typography.mdwn +++ b/doc/plugins/typography.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=typography author="[[Roktas]]"]] -[[!tag type/format]] +[[!tag type/chrome]] This plugin, also known as [SmartyPants](http://daringfireball.net/projects/smartypants/), translates diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn index f7eafee7c..8836a394c 100644 --- a/doc/plugins/underlay.mdwn +++ b/doc/plugins/underlay.mdwn @@ -1,17 +1,17 @@ [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] -This plugin adds an `add_underlays` option to the setup file. -Its value is a list of underlay directories whose content is added to the wiki. +This plugin adds an `add_underlays` option to the setup file. Its value is +a list of underlay directories whose content is added to the wiki. Multiple underlays are normally set up automatically by other plugins (for -instance, the images used by the [[plugins/smiley]] plugin), but they can also be -used as a way to pull in external files that you don't want in revision control, -like photos or software releases. +instance, the images used by the [[plugins/smiley]] plugin), but they can +also be used as a way to pull in external files that you don't want in +revision control, like photos or software releases. -Directories in `add_underlays` should usually be absolute. If relative, they're -interpreted as relative to the parent directory of the basewiki underlay, which -is probably not particularly useful in this context. +Directories in `add_underlays` should usually be absolute. If relative, +they're interpreted as relative to the parent directory of the basewiki +underlay, which is probably not particularly useful in this context. -- diff --git a/doc/plugins/version.mdwn b/doc/plugins/version.mdwn index 43027bdd7..326a2e7ce 100644 --- a/doc/plugins/version.mdwn +++ b/doc/plugins/version.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=version author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/version]] [[ikiwiki/directive]], which inserts the current version diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn index f1756ba8f..b4d23ba9c 100644 --- a/doc/plugins/websetup.mdwn +++ b/doc/plugins/websetup.mdwn @@ -16,7 +16,8 @@ enabled and disabled using it too. Some settings are not considered safe enough to be manipulated over the web; these are still shown, by default, but cannot be modified. To hide them, set `websetup_show_unsafe` to false in the setup file. A few settings have too complex a data type to be -configured via the web. +configured via the web. To mark additional settings as unsafe, you can +list them in `websetup_unsafe`. Plugins that should not be enabled/disabled via the web interface can be listed in `websetup_force_plugins` in the setup file. diff --git a/doc/plugins/wmd.mdwn b/doc/plugins/wmd.mdwn index dc9a30703..96c6e2e6c 100644 --- a/doc/plugins/wmd.mdwn +++ b/doc/plugins/wmd.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=wmd author="[[Will]]"]] -[[!tag type/chrome]] +[[!tag type/web]] [WMD](http://wmd-editor.com/) is a What You See Is What You Mean editor for [[mdwn]]. This plugin makes WMD be used for editing pages in the wiki. diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 082f0e38f..0bf6fcf48 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -3,8 +3,84 @@ written to extend ikiwiki in many ways. Despite the length of this page, it's not really hard. This page is a complete reference to everything a plugin might want to do. There is also a quick [[tutorial]]. +[[!template id="note" text=""" +Ikiwiki is a compiler + +One thing to keep in mind when writing a plugin is that ikiwiki is a wiki +*compiler*. So plugins influence pages when they are built, not when they +are loaded. A plugin that inserts the current time into a page, for +example, will insert the build time. + +Also, as a compiler, ikiwiki avoids rebuilding pages unless they have +changed, so a plugin that prints some random or changing thing on a page +will generate a static page that won't change until ikiwiki rebuilds the +page for some other reason, like the page being edited. + +The [[tutorial]] has some other examples of ways that ikiwiki being a +compiler may trip up the unwary. +"""]] + [[!toc levels=2]] +## Highlevel view of ikiwiki + +Ikiwiki mostly has two modes of operation. It can either be running +as a compiler, building or updating a wiki; or as a cgi program, providing +user interface for editing pages, etc. Almost everything ikiwiki does +is accomplished by calling various hooks provided by plugins. + +### compiler + +As a compiler, ikiwiki starts by calling the `refresh` hook. Then it checks +the wiki's source to find new or changed pages. The `needsbuild` hook is +then called to allow manipulation of the list of pages that need to be +built. + +Now that it knows what pages it needs to build, ikiwiki runs two +compile passes. First, it runs `scan` hooks, which collect metadata about +the pages. Then it runs a page rendering pipeline, by calling in turn these +hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`, +`pagetemplate`, `sanitize`, `format`. + +After all necessary pages are built, it calls the `change` hook. Finally, +if a page is was deleted, the `delete` hook is called, and the files that +page had previously produced are removed. + +### cgi + +The flow between hooks when ikiwiki is run as a cgi is best illustrated by +an example. + +Alice browses to a page and clicks Edit. + +* Ikiwiki is run as a cgi. It assigns Alice a session cookie, and, + by calling the `auth` hooks, sees that she is not yet logged in. +* The `sessioncgi` hooks are then called, and one of them, + from the [[editpage]] plugin, notices that the cgi has been told "do=edit". +* The [[editpage]] plugin calls the `canedit` hook to check if this + page edit is allowed. The [[signinedit]] plugin has a hook that says not: + Alice is not signed in. +* The [[signinedit]] plugin then launches the signin process. A signin + page is built by calling the `formbuilder_setup` hook. + +Alice signs in with her openid. + +* The [[openid]] plugin's `formbuilder` hook sees that an openid was + entered in the signin form, and redirects to Alice's openid provider. +* Alice's openid provider calls back to ikiwiki. The [[openid]] plugin + has an `auth` hook that finishes the openid signin process. +* Signin complete, ikiwiki returns to what Alice was doing before; editing + a page. +* Now all the `canedit` hooks are happy. The [[editpage]] plugin calls + `formbuilder_setup` to display the page editing form. + +Alice saves her change to the page. + +* The [[editpage]] plugin's `formbuilder` hook sees that the Save button + was pressed, and calls the `checkcontent` and `editcontent` hooks. + Then it saves the page to disk, and branches into the compiler part + of ikiwiki to refresh the wiki. + ## Types of plugins Most ikiwiki [[plugins]] are written in perl, like ikiwiki. This gives the @@ -31,16 +107,20 @@ they're the same as far as how they hook into ikiwiki. This document will explain how to write both sorts of plugins, albeit with an emphasis on perl plugins. -## Considerations +## Plugin interface -One thing to keep in mind when writing a plugin is that ikiwiki is a wiki -*compiler*. So plugins influence pages when they are built, not when they -are loaded. A plugin that inserts the current time into a page, for -example, will insert the build time. Also, as a compiler, ikiwiki avoids -rebuilding pages unless they have changed, so a plugin that prints some -random or changing thing on a page will generate a static page that won't -change until ikiwiki rebuilds the page for some other reason, like the page -being edited. +To import the ikiwiki plugin interface: + + use IkiWiki '3.00'; + +This will import several variables and functions into your plugin's +namespace. These variables and functions are the ones most plugins need, +and a special effort will be made to avoid changing them in incompatible +ways, and to document any changes that have to be made in the future. + +Note that IkiWiki also provides other variables and functions that are not +exported by default. No guarantee is made about these in the future, so if +it's not exported, the wise choice is to not use it. ## Registering plugins @@ -456,7 +536,13 @@ The data returned is a list of `%config` options, followed by a hash describing the option. There can also be an item named "plugin", which describes the plugin as a whole. For example: - return + return + plugin => { + description => "description of this plugin", + safe => 1, + rebuild => 1, + section => "misc", + }, option_foo => { type => "boolean", description => "enable foo?", @@ -471,11 +557,6 @@ describes the plugin as a whole. For example: safe => 1, rebuild => 0, }, - plugin => { - description => "description of this plugin", - safe => 1, - rebuild => 1, - }, * `type` can be "boolean", "string", "integer", "pagespec", or "internal" (used for values that are not user-visible). The type is @@ -496,6 +577,9 @@ describes the plugin as a whole. For example: the plugin) will require a wiki rebuild, false if no rebuild is needed, and undef if a rebuild could be needed in some circumstances, but is not strictly required. +* `section` can optionally specify which section in the config file + the plugin fits in. The convention is to name the sections the + same as the tags used for [[plugins|plugin]] on this wiki. ### genwrapper @@ -504,28 +588,17 @@ describes the plugin as a whole. For example: This hook is used to inject C code (which it returns) into the `main` function of the ikiwiki wrapper when it is being generated. -## Plugin interface - -To import the ikiwiki plugin interface: - - use IkiWiki '3.00'; - -This will import several variables and functions into your plugin's -namespace. These variables and functions are the ones most plugins need, -and a special effort will be made to avoid changing them in incompatible -ways, and to document any changes that have to be made in the future. +## Exported variables -Note that IkiWiki also provides other variables and functions that are not -exported by default. No guarantee is made about these in the future, so if -it's not exported, the wise choice is to not use it. +Several variables are exported to your plugin when you `use IkiWiki;` -### %config +### `%config` A plugin can access the wiki's configuration via the `%config` hash. The best way to understand the contents of the hash is to look at your ikiwiki setup file, which sets the hash content to configure the wiki. -### %pagestate +### `%pagestate` The `%pagestate` hash can be used by plugins to save state that they will need next time ikiwiki is run. The hash holds per-page state, so to set a value, @@ -543,7 +616,7 @@ When pages are deleted, ikiwiki automatically deletes their pagestate too. Note that page state does not persist across wiki rebuilds, only across wiki updates. -### %wikistate +### `%wikistate` The `%wikistate` hash can be used by a plugin to store persistant state that is not bound to any one page. To set a value, use @@ -552,23 +625,53 @@ serialize, `$key` is any string you like, and `$id` must be the same as the "id" parameter passed to `hook()` when registering the plugin, so that the state can be dropped if the plugin is no longer used. -### Other variables +### `%links` + +The `%links` hash can be used to look up the names of each page that +a page links to. The name of the page is the key; the value is an array +reference. Do not modify this hash directly; call `add_link()`. + + $links{"foo"} = ["bar", "baz"]; + +### `%typedlinks` + +The `%typedlinks` hash records links of specific types. Do not modify this +hash directly; call `add_link()`. The keys are page names, and the values +are hash references. In each page's hash reference, the keys are link types +defined by plugins, and the values are hash references with link targets +as keys, and 1 as a dummy value, something like this: + + $typedlinks{"foo"} = { + tag => { short_word => 1, metasyntactic_variable => 1 }, + next_page => { bar => 1 }, + }; -If your plugin needs to access data about other pages in the wiki. It can -use the following hashes, using a page name as the key: +Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in +`%typedlinks`. -* `%links` lists the names of each page that a page links to, in an array - reference. -* `%destsources` contains the name of the source file used to create each - destination file. -* `%pagesources` contains the name of the source file for each page. +### `%pagesources` -Also, the `%IkiWiki::version` variable contains the version number for the -ikiwiki program. +The `%pagesources` has can be used to look up the source filename +of a page. So the key is the page name, and the value is the source +filename. Do not modify this hash. -### Library functions + $pagesources{"foo"} = "foo.mdwn"; -#### `hook(@)` +### `%destsources` + +The `%destsources` hash records the name of the source file used to +create each destination file. The key is the output filename (ie, +"foo/index.html"), and the value is the source filename that it was built +from (eg, "foo.mdwn"). Note that a single source file may create multiple +destination files. Do not modify this hash directly; call `will_render()`. + + $destsources{"foo/index.html"} = "foo.mdwn"; + +## Library functions + +Several functions are exported to your plugin when you `use IkiWiki;` + +### `hook(@)` Hook into ikiwiki's processing. See the discussion of hooks above. @@ -577,12 +680,12 @@ named `no_override` is supported, If it's set to a true value, then this hook will not override any existing hook with the same id. This is useful if the id can be controled by the user. -#### `debug($)` +### `debug($)` Logs a debugging message. These are supressed unless verbose mode is turned on. -#### `error($;$)` +### `error($;$)` Aborts with an error message. If the second parameter is passed, it is a function that is called after the error message is printed, to do any final @@ -596,13 +699,13 @@ In other hooks, error() is a fatal error, so use with care. Try to avoid dying on bad input when building a page, as that will halt the entire wiki build and make the wiki unusable. -#### `template($;@)` +### `template($;@)` Creates and returns a [[!cpan HTML::Template]] object. The first parameter is the name of the file in the template directory. The optional remaining parameters are passed to `HTML::Template->new`. -#### `htmlpage($)` +### `htmlpage($)` Passed a page name, returns the base name that will be used for a the html page created from it. (Ie, it appends ".html".) @@ -610,23 +713,7 @@ page created from it. (Ie, it appends ".html".) Use this when constructing the filename of a html file. Use `urlto` when generating a link to a page. -### `deptype(@)` - -Use this function to generate ikiwiki's internal representation of a -dependency type from one or more of these keywords: - -* `content` is the default. Any change to the content - of a page triggers the dependency. -* `presence` is only triggered by a change to the presence - of a page. -* `links` is only triggered by a change to the links of a page. - This includes when a link is added, removed, or changes what - it points to due to other changes. It does not include the - addition or removal of a duplicate link. - -If multiple types are specified, they are combined. - -#### `pagespec_match_list($$;@)` +### `pagespec_match_list($$;@)` Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages in the wiki that match the [[ikiwiki/PageSpec]]. @@ -647,7 +734,10 @@ Additional named parameters can be specified: * `filter` is a reference to a function, that is called and passed a page, and returns true if the page should be filtered out of the list. * `sort` specifies a sort order for the list. See - [[ikiwiki/PageSpec/sorting]] for the avilable sort methods. + [[ikiwiki/PageSpec/sorting]] for the avilable sort methods. Note that + if a sort method is specified that depends on the + page content (such as 'meta(foo)'), the deptype needs to be set to + a content dependency. * `reverse` if true, sorts in reverse. * `num` if nonzero, specifies the maximum number of matching pages that will be returned. @@ -657,7 +747,7 @@ Additional named parameters can be specified: Any other named parameters are passed on to `pagespec_match`, to further limit the match. -#### `add_depends($$;$)` +### `add_depends($$;$)` Makes the specified page depend on the specified [[ikiwiki/PageSpec]]. @@ -665,7 +755,7 @@ By default, dependencies are full content dependencies, meaning that the page will be updated whenever anything matching the PageSpec is modified. This can be overridden by passing a `deptype` value as the third parameter. -#### `pagespec_match($$;@)` +### `pagespec_match($$;@)` Passed a page name, and [[ikiwiki/PageSpec]], returns a true value if the [[ikiwiki/PageSpec]] matches the page. @@ -679,7 +769,23 @@ The most often used is "location", which specifies the location the PageSpec should match against. If not passed, relative PageSpecs will match relative to the top of the wiki. -#### `bestlink($$)` +### `deptype(@)` + +Use this function to generate ikiwiki's internal representation of a +dependency type from one or more of these keywords: + +* `content` is the default. Any change to the content + of a page triggers the dependency. +* `presence` is only triggered by a change to the presence + of a page. +* `links` is only triggered by a change to the links of a page. + This includes when a link is added, removed, or changes what + it points to due to other changes. It does not include the + addition or removal of a duplicate link. + +If multiple types are specified, they are combined. + +### `bestlink($$)` Given a page and the text of a link on the page, determine which existing page that link best points to. Prefers pages under a @@ -687,7 +793,7 @@ subdirectory with the same name as the source page, failing that goes down the directory tree to the base looking for matching pages, as described in [[ikiwiki/SubPage/LinkingRules]]. -#### `htmllink($$$;@)` +### `htmllink($$$;@)` Many plugins need to generate html links and add them to a page. This is done by using the `htmllink` function. The usual way to call @@ -715,7 +821,7 @@ control some options. These are: * class - set to add a css class to the link * title - set to add a title attribute to the link -#### `readfile($;$)` +### `readfile($;$)` Given a filename, reads and returns the entire file. @@ -724,7 +830,7 @@ in binary mode. A failure to read the file will result in it dying with an error. -#### `writefile($$$;$$)` +### `writefile($$$;$$)` Given a filename, a directory to put it in, and the file's content, writes a file. @@ -752,7 +858,7 @@ generally the directory parameter is a trusted toplevel directory like the srcdir or destdir, and any subdirectories of this are included in the filename parameter. -#### `will_render($$)` +### `will_render($$)` Given a page name and a destination file name (not including the base destination directory), register that the page will result in that file @@ -768,34 +874,34 @@ Ikiwiki uses this information to automatically clean up rendered files when the page that rendered them goes away or is changed to no longer render them. will_render also does a few important security checks. -#### `pagetype($)` +### `pagetype($)` Given the name of a source file, returns the type of page it is, if it's a type that ikiwiki knowns how to htmlize. Otherwise, returns undef. -#### `pagename($)` +### `pagename($)` Given the name of a source file, returns the name of the wiki page that corresponds to that file. -#### `pagetitle($)` +### `pagetitle($)` Give the name of a wiki page, returns a version suitable to be displayed as the page's title. This is accomplished by de-escaping escaped characters in the page name. "_" is replaced with a space, and '__NN__' is replaced by the UTF character with code NN. -#### `titlepage($)` +### `titlepage($)` This performs the inverse of `pagetitle`, ie, it converts a page title into a wiki page name. -#### `linkpage($)` +### `linkpage($)` This converts text that could have been entered by the user as a [[ikiwiki/WikiLink]] into a wiki page name. -#### `srcfile($;$)` +### `srcfile($;$)` Given the name of a source file in the wiki, searches for the file in the source directory and the underlay directories (most recently added @@ -805,7 +911,7 @@ Normally srcfile will fail with an error message if the source file cannot be found. The second parameter can be set to a true value to make it return undef instead. -#### `add_underlay($)` +### `add_underlay($)` Adds a directory to the set of underlay directories that ikiwiki will search for files. @@ -813,18 +919,22 @@ search for files. If the directory name is not absolute, ikiwiki will assume it is in the parent directory of the configured underlaydir. -#### `displaytime($;$)` +### `displaytime($;$)` Given a time, formats it for display. The optional second parameter is a strftime format to use to format the time. -#### `gettext` +### `gettext` This is the standard gettext function, although slightly optimised. -#### `urlto($$;$)` +### `ngettext` + +This is the standard ngettext function, although slightly optimised. + +### `urlto($$;$)` Construct a relative url to the first parameter from the page named by the second. The first parameter can be either a page name, or some other @@ -833,13 +943,13 @@ destination file, as registered by `will_render`. If the third parameter is passed and is true, an absolute url will be constructed instead of the default relative url. -#### `newpagefile($$)` +### `newpagefile($$)` This can be called when creating a new page, to determine what filename to save the page to. It's passed a page name, and its type, and returns the name of the file to create, relative to the srcdir. -#### `targetpage($$;$)` +### `targetpage($$;$)` Passed a page and an extension, returns the filename that page will be rendered to. @@ -848,11 +958,14 @@ Optionally, a third parameter can be passed, to specify the preferred filename of the page. For example, `targetpage("foo", "rss", "feed")` will yield something like `foo/feed.rss`. -#### `add_link($$)` +### `add_link($$;$)` This adds a link to `%links`, ensuring that duplicate links are not added. Pass it the page that contains the link, and the link text. +An optional third parameter sets the link type. If not specified, +it is an ordinary [[ikiwiki/WikiLink]]. + ## Miscellaneous ### Internal use pages @@ -972,6 +1085,17 @@ it up in the history. It's ok if this is not implemented, and throws an error. +If the RCS cannot determine a ctime for the file, return 0. + +#### `rcs_getmtime($)` + +This is used to get the page modification time for a file from the RCS, by +looking it up in the history. + +It's ok if this is not implemented, and throws an error. + +If the RCS cannot determine a mtime for the file, return 0. + #### `rcs_receive()` This is called when ikiwiki is running as a pre-receive hook (or @@ -1019,6 +1143,24 @@ For example, "backlink(foo)" is influenced by the contents of page foo; they match; "created_before(foo)" is influenced by the metadata of foo; while "glob(*)" is not influenced by the contents of any page. +### Sorting plugins + +Similarly, it's possible to write plugins that add new functions as +[[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to +the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting +by `foo` or `foo(...)` is requested. + +The names of pages to be compared are in the global variables `$a` and `$b` +in the IkiWiki::SortSpec package. The function should return the same thing +as Perl's `cmp` and `<=>` operators: negative if `$a` is less than `$b`, +positive if `$a` is greater, or zero if they are considered equal. It may +also raise an error using `error`, for instance if it needs a parameter but +one isn't provided. + +The function will also be passed one or more parameters. The first is +`undef` if invoked as `foo`, or the parameter `"bar"` if invoked as `foo(bar)`; +it may also be passed additional, named parameters. + ### Setup plugins The ikiwiki setup file is loaded using a pluggable mechanism. If you look diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index f66b85495..450d16800 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -7,10 +7,31 @@ Ikiwiki started out supporting only [[Subversion|svn]], but the interface ikiwiki uses to a revision control system is sufficiently simple and generic that it can be adapted to work with many systems by writing a [[plugin|plugins/write]]. [[Subversion|svn]] is still a recommended choice; -[[git]] is another well-tested option. +[[git]] is another well-tested option. -These are all the supported revision control systems: -[[!inline pages="rcs/* and !*/Discussion and !rcs/details" archive=yes]] +While all supported revision control systems work well enough for basic +use, some advanced or special features are not supported in all of them. +Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to +set up a wiki using that revision control system. The `rcs_commit_staged` +hook is needed to use [[attachments|plugins/attachment]] or +[[plugins/comments]]. `rcs_getctime` may be implemented in a fast way +(ie, one log lookup for all files), or very slowly (one lookup per file). +And so on. The table below summarises this for each revision control +system and links to more information about each. + +[[!table data=""" +feature |[[git]]|[[svn]]|[[bzr]] |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]] |[[cvs]] +[[ikiwiki-makerepo]]|yes |yes |yes |yes |yes |yes |no |yes +auto.setup |yes |yes |incomplete|yes |incomplete |yes |incomplete|yes +`rcs_commit_staged` |yes |yes |yes |yes |no |yes |no |yes +`rcs_rename` |yes |yes |yes |yes |no |yes |no |yes +`rcs_remove` |yes |yes |yes |yes |no |yes |no |yes +`rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes +`rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow +`rcs_getmtime` |fast |slow |no |no |no |no |no |no +anonymous push |yes |no |no |no |no |no |no |no +conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes +"""]] There is a page with [[details]] about how the different systems work with ikiwiki, for the curious. diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index a701a2685..0c7bf2fa8 100644 --- a/doc/roadmap.mdwn +++ b/doc/roadmap.mdwn @@ -69,6 +69,20 @@ backwards compatability. ---- +# compatability breaking changes + +Probably incomplete list: + +* Drop old `--getctime` option. +* Remove compatability code in `loadindex` to handle old index data layouts. +* Make pagespecs match relative by default? (see [[discussion]]) +* Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]]) +* YADA format setup files per default? + +In general, we try to use [[ikiwiki-transition]] or forced rebuilds on +upgrade to deal with changes that break compatability. Some things that +can't help with. + # future goals * Conversion support for existing other wikis. diff --git a/doc/roadmap/discussion.mdwn b/doc/roadmap/discussion.mdwn index 0b69867bf..8233b1990 100644 --- a/doc/roadmap/discussion.mdwn +++ b/doc/roadmap/discussion.mdwn @@ -3,6 +3,7 @@ backwards compatibility problems. Should this be marked as a future plan, perhap major version number like 2.0? --Ethan Yes, I'm looking at making this kind of change at 2.0, added to the list. +(Update: Didn't make it in 2.0 or 3.0...) However, I have doubts that it makes good sense to go relative by default. While it's not consitent with links, it seems to work better overall to have pagespecs be absolute by default, IMHO. --[[Joey]] diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index afd7dbeab..c323153c8 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,9 +1,9 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). - +[[Testing 1 2 3| test]] # Header -## Subheader +## Subheader2 > This is a blockquote. > @@ -77,3 +77,5 @@ bar Hmm, can I dig it? Test +test2 + diff --git a/doc/sandbox/danc.mdwn b/doc/sandbox/danc.mdwn new file mode 100644 index 000000000..9766475a4 --- /dev/null +++ b/doc/sandbox/danc.mdwn @@ -0,0 +1 @@ +ok diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html new file mode 100644 index 000000000..d69937ea8 --- /dev/null +++ b/doc/sandbox/prova_blog.html @@ -0,0 +1,8 @@ +Questa è una prova. +Vediamo se funziona + +<pre> +#!/bin/bash + +echo "ciao" +</pre> diff --git a/doc/security.mdwn b/doc/security.mdwn index 3924186c2..21aef316b 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -427,3 +427,15 @@ enabling TeX configuration options that disallow unsafe TeX commands. The fix was released on 30 Aug 2009 in version 3.1415926, and was backported to stable in version 2.53.4. If you use the teximg plugin, I recommend upgrading. ([[!cve CVE-2009-2944]]) + +## javascript insertion via svg uris + +Ivan Shmakov pointed out that the htmlscrubber allowed `data:image/*` urls, +including `data:image/svg+xml`. But svg can contain javascript, so that is +unsafe. + +This hole was discovered on 12 March 2010 and fixed the same day +with the release of ikiwiki 3.20100312. +A fix was also backported to Debian etch, as version 2.53.5. I recommend +upgrading to one of these versions if your wiki can be edited by third +parties. diff --git a/doc/style.css b/doc/style.css index 317d4c7aa..7ffcf9fe2 100644 --- a/doc/style.css +++ b/doc/style.css @@ -228,14 +228,15 @@ div.recentchanges { .bigPC { font-size: 115%; } .biggestPC { font-size: 130%; } -#sidebar { - line-height: 3ex; - width: 20ex; +.sidebar { + width: 30ex; float: right; - margin-left: 40px; - margin-bottom: 40px; - padding: 2ex 2ex; + margin-left: 4px; + margin-bottom: 4px; + margin-top: -1px; + padding: 0ex 2ex; background: white; + border: 1px solid black; color: black !important; } @@ -430,3 +431,11 @@ pre.hl { color:#000000; background-color:#ffffff; } /* For the calendar plugin. */ .month-calendar-day-this-day { background-color: #eee; } .year-calendar-this-month { background-color: #eee; } +.month-calendar-arrow A:link, +.year-calendar-arrow A:link, +.month-calendar-arrow A:visited, +.year-calendar-arrow A:visited { + text-decoration: none; + font-weight: normal; + font-size: 150%; +} diff --git a/doc/templates.mdwn b/doc/templates.mdwn index eff0e15e9..07531ae98 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -43,6 +43,12 @@ 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. +(Alternatively, templates can be stored in a directory outside the wiki, +as files with the extension ".tmpl". +By default, these are searched for in `/usr/share/ikiwiki/templates`; +the `templatedir` setting can be used to make another directory be searched +first.) + 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 diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn index 59330caa4..ecc6ae505 100644 --- a/doc/tips/Importing_posts_from_Wordpress.mdwn +++ b/doc/tips/Importing_posts_from_Wordpress.mdwn @@ -1,6 +1,6 @@ Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts. -[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's <tt>--getctime</tt> to get the preserve creation times on checkout. +[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned. diff --git a/doc/tips/follow_wikilinks_from_inside_vim.mdwn b/doc/tips/follow_wikilinks_from_inside_vim.mdwn new file mode 100644 index 000000000..015a4ecee --- /dev/null +++ b/doc/tips/follow_wikilinks_from_inside_vim.mdwn @@ -0,0 +1,47 @@ +The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) plugin +for vim eases the editing of IkiWiki wikis, by letting you "follow" the +wikilinks on your file (page), by loading the file associated with a given +wikilink in vim. The plugin takes care of following the ikiwiki linking rules +to figure out which file a wikilink points to + +The plugin also includes commands (and mappings) to make the cursor jump to the +previous/next wikilink in the current file + +## Jumping to pages + +To open the file associated to a wikilink, place the cursor over its text, and +hit Enter (`<CR>`). This functionality is also available through the +`:IkiJumpToPage` command + +## Moving to next/previous wikilink in current file + +`Ctrl-j` will move the cursor to the next wikilink. `Ctrl-k` will move it to the +previous wikilink. This functionality is also available through the +`:IkiNextWikiLink` command. This command takes one argument, the direction to +move into + + * `:IkiNextWikiLink 0` will look forward for the wikilink + * `:IkiNextWikiLink 1` will look backwards for the wikilink + +## Installation + +Copy the `ikiwiki_nav.vim` file to your `.vim/ftplugin` directory. + +## Current issues: + + * The plugin only works for wikilinks contained in a single text line; + multiline wikilinks are not (yet) seen as such + +## Notes + +The official releases of the plugin are in the +[vim.org script page](http://www.vim.org/scripts/script.php?script_id=2968) + +The latest version of this script can be found in the following location + +<http://git.devnull.li/cgi-bin/gitweb.cgi?p=ikiwiki-nav.git;a=blob;f=ftplugin/ikiwiki_nav.vim;hb=HEAD> + +Any feedback you can provide is appreciated; the contact details can be found +inside the plugin + +[[!tag vim]] diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn new file mode 100644 index 000000000..6964cf24e --- /dev/null +++ b/doc/tips/htaccess_file.mdwn @@ -0,0 +1,27 @@ +If you try to include a `.htaccess` file in your wiki's source, in order to +configure the web server, you'll find that ikiwiki excludes it from +processing. In fact, ikiwiki excludes any file starting with a dot, as well +as a lot of other files, for good security reasons. + +You can tell ikiwiki not to exclude the .htaccess file by adding this to +your setup file: + + include => '^\.htaccess$', + +Caution! Before you do that, please think for a minute about who can edit +your wiki. Are attachment uploads enabled? Can users commit changes +directly to the version control system? Do you trust everyone who can +make a change to not do Bad Things with the htaccess file? Do you trust +everyone who *might* be able to make a change in the future? Note that a +determined attacker who can write to the htaccess file can probably get a +shell on your web server. + +If any of these questions have given you pause, I suggest you find a +different way to configure the web server. One way is to not put the +`.htaccess` file under ikiwiki's control, and just manually install it +in the destdir. --[[Joey]] + +[Apache's documentation](http://httpd.apache.org/docs/2.2/howto/htaccess.html) +says: +> In general, you should never use .htaccess files unless you don't have +> access to the main server configuration file. diff --git a/doc/tips/inside_dot_ikiwiki/discussion.mdwn b/doc/tips/inside_dot_ikiwiki/discussion.mdwn index 34d5b9252..69df369ec 100644 --- a/doc/tips/inside_dot_ikiwiki/discussion.mdwn +++ b/doc/tips/inside_dot_ikiwiki/discussion.mdwn @@ -6,14 +6,15 @@ My database appears corrupted: No idea how this happened. I've blown it away and recreated it but, for future reference, is there any less violent way to recover from this situation? I miss having the correct created and last edited times. --[[sabr]] > update: fixed ctimes and mtimes using [these instructions](http://u32.net/Mediawiki_Conversion/Git_Import/#Correct%20Creation%20and%20Last%20Edited%20time) --[[sabr]] -> That's overly complex. Just run `ikiwiki -setup your.setup -getctime`. +> That's overly complex. Just run `ikiwiki -setup your.setup -gettime`. > BTW, I'd be interested in examining such a corrupt storable file to try > to see what happened to it. --[[Joey]] ->> --getctime appears to only set the last edited date. It's not supposed to set the creation date, is it? The only place that info is stored is in the git repo. +>> --gettime appears to only set the last edited date. It's not supposed to set the creation date, is it? The only place that info is stored is in the git repo. >>> Pulling the page creation date out of the git history is exactly what ->>> --getctime does. --[[Joey]] +>>> --gettime does. (It used to be called --getctime, and only do that; now +>>> it also pulls out the last modified date). --[[Joey]] >> Alas, I seem to have lost the bad index file to periodic /tmp wiping; I'll send it to you if it happens again. --[[sabr]] diff --git a/doc/tips/laptop_wiki_with_git.mdwn b/doc/tips/laptop_wiki_with_git.mdwn index 85e26c729..cfa565d1a 100644 --- a/doc/tips/laptop_wiki_with_git.mdwn +++ b/doc/tips/laptop_wiki_with_git.mdwn @@ -67,6 +67,5 @@ as many times as you want (thus being able to have a repository which is used by the ikiwiki CGI, and another which you can use for updating via git). -When you want to update the server from the laptop, do a `git push` from -within the laptop's bare repository, and likewise do a `git pull` to update -the laptop from the server. +Use standard git commands, run in the laptop's bare git repository +to handle pulling from and pushing to the server. diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn new file mode 100644 index 000000000..a07889e6b --- /dev/null +++ b/doc/tips/spam_and_softwaresites.mdwn @@ -0,0 +1,87 @@ +Any wiki with a form of web-editing enabled will have to deal with +spam. (See the [[plugins/blogspam]] plugin for one defensive tool you +can deploy). + +If: + + * you are using ikiwiki to manage the website for a [[examples/softwaresite]] + * you allow web-based commits, to let people correct documentation, or report + bugs, etc. + * the documentation is stored in the same revision control repository as your + software + +It is undesirable to have your software's VCS history tainted by spam and spam +clean-up commits. Here is one approach you can use to prevent this. This +example is for the [[git]] version control system, but the principles should +apply to others. + +## Isolate web commits to a specific branch + +Create a separate branch to contain web-originated edits (named `doc` in this +example): + + $ git checkout -b doc + +Adjust your setup file accordingly: + + gitmaster_branch => 'doc', + +## merging good web commits into the master branch + +You will want to periodically merge legitimate web-based commits back into +your master branch. Ensure that there is no spam in the documentation +branch. If there is, see 'erase spam from the commit history', below, first. + +Once you are confident it's clean: + + # ensure you are on the master branch + $ git branch + doc + * master + $ git merge --ff doc + +## removing spam + +### short term + +In the short term, just revert the spammy commit. + +If the spammy commit was the top-most: + + $ git revert HEAD + +This will clean the spam out of the files, but it will leave both the spam +commit and the revert commit in the history. + +### erase spam from the commit history + +Git allows you to rewrite your commit history. We will take advantage of this +to eradicate spam from the history of the doc branch. + +This is a useful tool, but it is considered bad practise to rewrite the +history of public repositories. If your software's repository is public, you +should make it clear that the history of the `doc` branch in your repository +is unstable. + +Once you have been spammed, use `git rebase` to remove the spam commits from +the history. Assuming that your `doc` branch was split off from a branch +called `master`: + + # ensure you are on the doc branch + $ git branch + * doc + master + $ git rebase --interactive master + +In your editor session, you will see a series of lines for each commit made to +the `doc` branch since it was branched from `master` (or since the last merge +back into `master`). Delete the lines corresponding to spammy commits, then +save and exit your editor. + +Caveat: if there are no commits you want to keep (i.e. all the commits since +the last merge into master are either spam or spam reverts) then `git rebase` +will abort. Therefore, this approach only works if you have at least one +non-spam commit to the documentation since the last merge into `master`. For +this reason, it's best to wait until you have at least one +commit you want merged back into the main history before doing a rebase, +and until then, tackle spam with reverts. diff --git a/doc/tips/vim_syntax_highlighting.mdwn b/doc/tips/vim_syntax_highlighting.mdwn index 172b763c3..18b2f1c92 100644 --- a/doc/tips/vim_syntax_highlighting.mdwn +++ b/doc/tips/vim_syntax_highlighting.mdwn @@ -1,4 +1,7 @@ [[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki -[[ikiwiki/markdown]] files. +[[ikiwiki/markdown]] files. Installation instructions are at the top of the file. + +See also: [[follow_wikilinks_from_inside_vim]] +[[!tag vim]] diff --git a/doc/tips/yaml_setup_files.mdwn b/doc/tips/yaml_setup_files.mdwn new file mode 100644 index 000000000..4ae0de4aa --- /dev/null +++ b/doc/tips/yaml_setup_files.mdwn @@ -0,0 +1,10 @@ +Here's how to convert your existing standard format ikiwiki setup file into +the new YAML format recently added to ikiwiki. + +1. First, make sure you have the [[!cpan YAML]] perl module installed. + (Run: `apt-get install libyaml-perl`) +2. Run: `ikiwiki -setup my.setup -dumpsetup my.setup --set setuptype=Yaml` + +The format of the YAML setup file should be fairly self-explanatory. + +--[[Joey]] diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn index d40701d60..dd9793233 100644 --- a/doc/todo/ACL.mdwn +++ b/doc/todo/ACL.mdwn @@ -21,6 +21,11 @@ something, that I think is very valuable. >>>> Which would rule out openid, or other fun forms of auth. And routing all access >>>> through the CGI sort of defeats the purpose of ikiwiki. --[[Ethan]] +>>>>> I think what Joey is suggesting is to use apache ACLs in conjunction +>>>>> with basic HTTP auth to control read access, and ikiwiki can use the +>>>>> information via the httpauth plugin for other ACLs (write, admin). But +>>>>> yes, that would rule out non-httpauth mechanisms. -- [[Jon]] + Also see [[!debbug 443346]]. > Just a few quick thoughts about this: @@ -76,3 +81,18 @@ Any idea when this is going to be finished? If you want, I am happy to beta tes > Example of use to only allow two users to edit the tipjar page: > locked_pages => 'tipjar and !(user(joey) or user(bob))', > --[[Joey]] + +> > Thank you for the hint but I am being still confused (read: dense)... What I am trying to do is this: + +> > * No anonymous access. +> > * Logged in users can edit and create pages. +> > * Users can set who can edit their pages. +> > * Some pages are only viewable by admins. + +> > Is it possible? If so how?... + +>>> I don't believe this is currently possible. What is missing is the concept +>>> of page 'ownership'. -- [[Jon]] + +>>>> GAH! That is really a shame... Any chance of adding that? No, I do not really expect it to be added, after all my requirements are pushing the boundary of what a wikiwiki + should be. Nonetheless, thanks for your help! diff --git a/doc/todo/More_flexible_po-plugin_for_translation.mdwn b/doc/todo/More_flexible_po-plugin_for_translation.mdwn new file mode 100644 index 000000000..3399f7834 --- /dev/null +++ b/doc/todo/More_flexible_po-plugin_for_translation.mdwn @@ -0,0 +1,5 @@ +I have a website with multi-language content, where some content is only in English, some in German, and some is available in both languages. + +The po-module currently has only one master-language, with slave languages, and a PageSpec should be considered. + +It would be nice to flag the content which should have a translation on a file-by-file basis (with some inline directive?) which could contain the information of the master-language for that file and the desired target-languages. diff --git a/doc/todo/Multiple_categorization_namespaces.mdwn b/doc/todo/Multiple_categorization_namespaces.mdwn new file mode 100644 index 000000000..ee3bbd88d --- /dev/null +++ b/doc/todo/Multiple_categorization_namespaces.mdwn @@ -0,0 +1,72 @@ +I came across this when working on converting my old blog into an ikiwiki, but I think it could be of more general use. + +The background: I have a (currently suspended, waiting to be converted) blog on the [il Cannocchiale](http://www.ilcannocchiale.it) hosting platform. Aside from the usual metatadata (title, author), il Cannocchiale also provides tags and two additional categorization namespaces: a blog-specific user-defind "column" (Rubrica) and a platform-wide "category" (Categoria). The latter is used to group and label a couple of platform-wide lists of latest posts, the former may be used in many different ways (e.g. multi-author blogs could have one column per author or so, or as a form of 'macro-tagging'). Columns are also a little more sophisticated than classical tags because you can assign them a subtitle too. + +When I started working on the conversion, my first idea was to convert Rubriche to subdirectories of an ikiwiki blog. However, this left me with a few annoying things: when rebuilding links from the import, I had to (programmatically) dive into each subdirectory to see where each post was; this would also be problematic for future posting, too. It also meant that moving a post from a Rubrica to the other would break all links (unless ikiwiki has a way to fix this automagically). And I wasn't too keen on the fact that the Rubrica would come up in the URL of the post. And finally, of course, I couldn't use this to preserve the Categoria metadata. + +Another solution I thought about was to use special deeper tags for the Rubrica and Categoria (like: `\[[!tag "Rubrica/Some name"]]`), but this is horrible, clumsy, and makes special treatment of these tags a PITN (for example you wouldn't want the Rubrica to be displayed together with the other tags, and you would want it displayed somewhere else like next to the title of the post). This solution however looks to me as the proper path, as long as tags could support totally separate namespaces. I have a tentative implementation of this `tagtype` feature at [my git clone of ikiwiki](http://git.oblomov.eu/ikiwiki). + +The feature is currently implemented as follows: a `tagtypes` config options takes an array of strings: the tag types to be defined _aside from the usual tags_. Each tag type automatically provides a new directive which sets up tags that different from standard tags by having a different tagbase (the same as the tagtype) and link type (again, the same as the tagtype) (a TODO item for this would to make the directive, tagbase and link type customizable). For example, for my imported blog I would define + + tagtypes => [qw{Categoria Rubrica}] + +and then in the blog posts I would have stuff like + + \[[!Categoria "LAVORO/Vita da impiegato"]] + \[[!Rubrica "Il mio mondo"]] + \[[!meta title="Blah blah"]] + \[[!meta author="oblomov"]] + + The body of the article + + \[[!tag a bunch of tags]] + +and the tags would appear at the bottom of the post, the Rubrica next to the title, etc. All of this information would end up as categories in the feeds (although I would like to rework that code to make use of namespaces, terms and labels in a different way). + +> Note [[plugins/contrib/report/discussion]]. To quote myself from the latter page: +> *I find tags as they currently exist to be too limiting. I prefer something that can be used for Faceted Tagging http://en.wikipedia.org/wiki/Faceted_classification; that is, things like Author:Fred Nurk, Genre:Historical, Rating:Good, and so on. Of course, that doesn't mean that each tag is limited to only one value, either; just to take the above examples, something might have more than one author, or have multiple genres (such as Historical + Romance).* + +> So you aren't the only one who wants to do more with tags, but I don't think that adding a new directive for each tag type is the way to go; I think it would be simpler to just have one directive, and take advantage of the new [[matching different kinds of links]] functionality, and enhance the tag directive. +> Perhaps something like this: + + \[[!tag categorica="LAVORO/Vita da impiegato" rubrica="Il mio mondo"]] + +> Part of my thinking in this is to also combine tags with [[plugins/contrib/field]], so that the tags for a page could be queried and displayed; that way, one could put them wherever you wanted on the page, using any of [[plugins/contrib/getfield]], [[plugins/contrib/ftemplate]], or [[plugins/contrib/report]]. +> --[[KathrynAndersen]] + +>> A very generic metadata framework could cover all possible usages of fields, tags, and related metadata, but keeping its _user interface_ generic would only make it hard to use. Note that this is not an objection to the idea of collapsing the fields and tags functionality (at quick glance, I cannot see a real difference between single-valued custom tagtypes and fields, but see below), but more about the syntax. + +>> I had thought about the `\[[!tag type1=value1 type2=value2]]` syntax myself, but ultimately decided against it for a number of reasons, most importantly the fact that (1) it's harder to type, (2) it's harder to spot errors in the tag types (so for example if one misspelled `categoria` as `categorica`, he might not notice it as quickly as seeing the un-parsed `\[[!categorica ]]` directive in the output html) and (3) it encourages collapsing possibly unrelated metadata together (for example, I would never consider putting the categoria information together with the rubrica one; of course with your syntax it's perfectly possible to keep them separate as well). + +>> Point (2) may be considered a downside as well as an upside, depending on perspective, of course. And it would be possible to have a set of predefined tag types to match against, like in my tagtype directive approach but with your syntax. + +>>> You seem to have answered your own objections already. -- K.A. + +>>Point (3) is of course entirely in the hands of the user, but that's exactly what syntax should be about. There is nothing functionally wrong with e.g. `\[[!meta tag=sometag author=someauthor title=sometitle rubrica=somecolumn]]`, but I honestly find it horrible. + +>>> So, really, point 3 comes down to differing aesthetics. -- K.A. + +>> A solution could be to allow both syntaxes, getting to have for example `\[[!sometagtype "blah"]]` as a shortcut for `\[[!tag sometagtype="blah"]]` (or, in the more general case, `\[[!somefieldname "blah"]]` as a shortcut for `\[[!meta fieldname="blah"]]`). + +>> I would like to point out however that there are some functional differences between categorization metadata vs other metadata that might suggest to keep fields and (my extended) tags separate. For examples, in feeds you'd want all categorization metadata to fall in one place, with some appropriate manipulation (which I still have to implement, by the way), while things like author or title would go to the corresponding feed item properties. Although it all would be possible with appropriate report or template juggling, having such default metadata handled natively looks like a bonus to me. + +>>> Whereas I prefer being able to control such things with templates, because it gives more flexibility AND control. - K.A. + +>>>> Flexibility and control is good for tuning and power-usage, but sensible defaults are a must for a platform to be usable out of the box without much intervention. Moreover, there's a possible problem with what kind of data must be passed over to templates. + +Aside from the name of the plugin (and thus of the main directive), which could be `tag`, `meta`, `field` or whatever (maybe extending `meta` would be the most sensible choice), the features we want are + + 1. allow multiple values per type/attribute/field/whatever (fields currently only allows one) + 2. allow both hidden and visible references (à la tag vs taglink) + 3. allow each type/attribute/field to be exposed under multiple queries (e.g. tags and categories; this is mostly important for backwards compatibility, not sure if it might have other uses too) + 4. allow arbitrary types/attributes/fields/whatever (even 'undefined' ones) + +Each type/attribute/field/whatever (predefined, user-defined, arbitrary) would thus have the following parameters: + + * `directive` : the name of the directive that can be used to set the value as a hidden reference; we can discuss whether, for pre- or user-defined types, it being undef means no directive or a default directive matching the attribute name would be defined. + * `linkdirective` : the name of the directive that can be used for a visible reference; no such directive would be defined by default + * `linktype` : link type for (hidden and visible) references + * `linkbase` : akin to the tagbase parameter + * `queries` : list of template queries this type/attribute/field/whatever is exposed to + +Where this approach is limiting is on the kind of data that is passed to (template) queries. The value of the metadata fields might need some massaging (e.g. compare how tags are passed to tags queries vs cateogires queries). I have problems on picturing an easy way to make this possible user-side (i.e. via templates and not in Perl modules). Suggestions welcome. diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn index 2cd52e8c4..fcdb49f6d 100644 --- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn +++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn @@ -6,6 +6,45 @@ I see this being implemented in one of two possible ways. The easiest seems like A slightly more complex next step would be to request sreg from the provider and, if provided, automatically set the identity's username and email address from the provided persona. If username login to accounts with blank passwords is disabled, then you have the best of both worlds. Passwordless signin, human-friendly attribution, automatic setting of preferences. +> Given that openids are a global user identifier, that can look as pretty +> as the user cares to make it look via delegation, I am not a fan of +> having a site-local identifier that layered on top of that. Perhaps +> partly because every site that I have seen that does that has openid +> implemented as a badly-done wart on the side of their regular login +> system. +> +> The openid plugin now attempts to get an email and a username, and stores +> them in the session database for later use (ie, when the user edits a +> page). +> +> I am considering displaying the userid or fullname, if available, +> instead of the munged openid url in recentchanges and comments. +> It would be nice for those nasty [[google_openids|forum/google_openid_broken?]]. +> But, I first have to find a way to encode the name in the VCS commit log, +> while still keeping the openid of the committer in there too. +> Perhaps something like this (for git): --[[Joey]] +> +> Author: Joey Hess <http://joey.kitenet.net/@web> +> +> Only problem with the above is that the openid will still be displayed +> by CIA. Other option is this, which solves that, but at the expense of +> having to munge the username to fit inside the email address, +> and generally seems backwards: --[[Joey]] +> +> Author: http://joey.kitenet.net/ <Joey_Hess@web> +> +> So, what needs to be done: +> +> * Change `rcs_commit` and `rcs_commit_staged` to take a session object, +> instead of just a userid. (For back-compat, if the parameter is +> not an object, it's a userid.) Bump ikiwiki plugin interface version. +> * Modify all RCS plugins to include the session username somewhere +> in the commit, and parse it back out in `rcs_recentchanges`. +> * Modify recentchanges plugin to display the username instead of the +> `openiduser`. +> * Modify comment plugin to put the session username in the comment +> template instead of the `openiduser`. + Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat. [[!tag wishlist]] diff --git a/doc/todo/abbreviation.mdwn b/doc/todo/abbreviation.mdwn index d24166710..f2880091c 100644 --- a/doc/todo/abbreviation.mdwn +++ b/doc/todo/abbreviation.mdwn @@ -2,4 +2,6 @@ We might want some kind of abbreviation and acronym plugin. --[[JoshTriplett]] * Not sure if this is what you mean, but I'd love a way to make works which match existing page names automatically like (eg. if there is a page called "MySQL" then any time the word MySQL is mentioned it should become a link to that page). -- [[AdamShand]] + * The python-markdown-extras package has support for [abbreviations](http://www.freewisdom.org/projects/python-markdown/Abbreviations), with the syntax that you just use the abbreviation in text (e.g. HTML) and then define the abbreviations at the end (like "footnote-style" links). For consistency, it might be good to use the same syntax, which apparently derives from [PHP-markdown-extra](http://michelf.com/projects/php-markdown/extra/#abbr). + [[wishlist]] diff --git a/doc/todo/allow_plugins_to_add_sorting_methods.mdwn b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn new file mode 100644 index 000000000..b523cd19f --- /dev/null +++ b/doc/todo/allow_plugins_to_add_sorting_methods.mdwn @@ -0,0 +1,304 @@ +[[!tag patch]] + +The available [[ikiwiki/pagespec/sorting]] methods are currently hard-coded in +IkiWiki.pm, making it difficult to add any extra sorting mechanisms. I've +prepared a branch which adds 'sort' as a hook type and uses it to implement a +new `meta_title` sort type. + +Someone could use this hook to make `\[[!inline sort=title]]` prefer the meta +title over the page name, but for compatibility, I'm not going to (I do wonder +whether it would be worth making sort=name an alias for the current sort=title, +and changing the meaning of sort=title in 4.0, though). + +> What compatability concerns, exactly, are there that prevent making that +> change now? --[[Joey]] + +*[sort-hooks branch now withdrawn in favour of sort-package --s]* + +I briefly tried to turn *all* the current sort types into hook functions, and +have some of them pre-registered, but decided that probably wasn't a good idea. +That earlier version of the branch is also available for comparison: + +*[also withdrawn in favour of sort-package --s]* + +>> I wonder if IkiWiki would benefit from the concept of a "sortspec", like a [[ikiwiki/PageSpec]] but dedicated to sorting lists of pages rather than defining lists of pages? Rather than defining a sort-hook, define a SortSpec class, and enable people to add their own sort methods as functions defined inside that class, similarly to the way they can add their own pagespec definitions. --[[KathrynAndersen]] + +>>> [[!template id=gitbranch branch=smcv/ready/sort-package author="[[Simon_McVittie|smcv]]"]] +>>> I'd be inclined to think that's overkill, but it wasn't very hard to +>>> implement, and in a way is more elegant. I set it up so sort mechanisms +>>> share the `IkiWiki::PageSpec` package, but with a `cmp_` prefix. Gitweb: +>>> <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/sort-package> + +>>>> I agree it seems more elegant, so I have focused on it. +>>>> +>>>> I don't know about reusing `IkiWiki::PageSpec` for this. +>>>> --[[Joey]] + +>>>>> Fair enough, `IkiWiki::SortSpec::cmp_foo` would be just +>>>>> as easy, or `IkiWiki::Sorting::cmp_foo` if you don't like +>>>>> introducing "sort spec" in the API. I took a cue from +>>>>> [[ikiwiki/pagespec/sorting]] being a subpage of +>>>>> [[ikiwiki/pagespec]], and decided that yes, sorting is +>>>>> a bit like a pagespec :-) Which name would you prefer? --s + +>>>>>> `SortSpec` --[[Joey]] + +>>>>>>> [[Done]]. --s + +>>>> I would be inclined to drop the `check_` stuff. --[[Joey]] + +>>>>> It basically exists to support `title_natural`, to avoid +>>>>> firing up the whole import mechanism on every `cmp` +>>>>> (although I suppose that could just be a call to a +>>>>> memoized helper function). It also lets sort specs that +>>>>> *must* have a parameter, like +>>>>> [[field|plugins/contrib/field/discussion]], fail early +>>>>> (again, not so valuable). +>>>>> +>>>>>> AFAIK, `use foo` has very low overhead when the module is already +>>>>>> loaded. There could be some evalation overhead in `eval q{use foo}`, +>>>>>> if so it would be worth addressing across the whole codebase. +>>>>>> --[[Joey]] +>>>>>> +>>>>>>> check_cmp_foo now dropped. --s +>>>>> +>>>>> The former function could be achieved at a small +>>>>> compatibility cost by putting `title_natural` in a new +>>>>> `sortnatural` plugin (that fails to load if you don't +>>>>> have `title_natural`), if you'd prefer - that's what would +>>>>> have happened if `title_natural` was written after this +>>>>> code had been merged, I suspect. Would you prefer this? --s + +>>>>>> Yes! (Assuming it does not make sense to support +>>>>>> natural order sort of other keys than the title, at least..) +>>>>>> --[[Joey]] + +>>>>>>> Done. I added some NEWS.Debian for it, too. --s + +>>>> Wouldn't it make sense to have `meta(title)` instead +>>>> of `meta_title`? --[[Joey]] + +>>>>> Yes, you're right. I added parameters to support `field`, +>>>>> and didn't think about making `meta` use them too. +>>>>> However, `title` does need a special case to make it +>>>>> default to the basename instead of the empty string. +>>>>> +>>>>> Another special case for `title` is to use `titlesort` +>>>>> first (the name `titlesort` is derived from Ogg/FLAC +>>>>> tags, which can have `titlesort` and `artistsort`). +>>>>> I could easily extend that to other metas, though; +>>>>> in fact, for e.g. book lists it would be nice for +>>>>> `field(bookauthor)` to behave similarly, so you can +>>>>> display "Douglas Adams" but sort by "Adams, Douglas". +>>>>> +>>>>> `meta_title` is also meant to be a prototype of how +>>>>> `sort=title` could behave in 4.0 or something - sorting +>>>>> by page name (which usually sorts in approximately the +>>>>> same place as the meta-title, but occasionally not), while +>>>>> displaying meta-titles, does look quite odd. --s + +>>>>>> Agreed. --[[Joey]] + +>>>>>>> I've implemented meta(title). meta(author) also has the +>>>>>>> `sortas` special case; meta(updated) and meta(date) +>>>>>>> should also work how you'd expect them to (but they're +>>>>>>> earliest-first, unlike age). --s + +>>>> As I read the regexp in `cmpspec_translate`, the "command" +>>>> is required to have params. They should be optional, +>>>> to match the documentation and because most sort methods +>>>> do not need parameters. --[[Joey]] + +>>>>> No, `$2` is either `\w+\([^\)]*\)` or `[^\s]+` (with the +>>>>> latter causing an error later if it doesn't also match `\w+`). +>>>>> This branch doesn't add any parameterized sort methods, +>>>>> in fact, although I did provide one on +>>>>> [[field's_discussion_page|plugins/contrib/report/discussion]]. --s + +>>>> I wonder if it would make sense to add some combining keywords, so +>>>> a sortspec reads like `sort="age then ascending title"` +>>>> In a way, this reduces the amount of syntax that needs to be learned. +>>>> I like the "then" (and it could allow other operations than +>>>> simple combination, if any others make sense). Not so sure about the +>>>> "ascending", which could be "reverse" instead, but "descending age" and +>>>> "ascending age" both seem useful to be able to explicitly specify. +>>>> --[[Joey]] + +>>>>> Perhaps. I do like the simplicity of [[KathrynAndersen]]'s syntax +>>>>> from [[plugins/contrib/report]] (which I copied verbatim, except for +>>>>> turning sort-by-`field` into a parameterized spec). +>>>>> +>>>>> If we're getting into English-like (or at least SQL-like) queries, +>>>>> it might make sense to change the signature of the hook function +>>>>> so it's a function to return a key, e.g. +>>>>> `sub key_age { return -%pagemtime{$_[0]) }`. Then we could sort like +>>>>> this: +>>>>> +>>>>> field(artistsort) or field(artist) or constant(Various Artists) then meta(titlesort) or meta(title) or title +>>>>> +>>>>> with "or" binding more closely than "then". Does this seem valuable? +>>>>> I think the implementation would be somewhat more difficult. and +>>>>> it's probably getting too complicated to be worthwhile, though? +>>>>> (The keys that actually benefit from this could just +>>>>> have smarter cmp functions, I think.) +>>>>> +>>>>> If the hooks return keys rather than cmp results, then we could even +>>>>> have "lowercase" as an adjective used like "ascending"... maybe. +>>>>> However, there are two types of adjective here: "lowercase" +>>>>> really applies to the keys, whereas "ascending" applies to the "cmp" +>>>>> result. Again, I think this is getting too complex, and could just +>>>>> be solved with smarter cmp functions. +>>>>> +>>>>>> I agree. (Also, I think returning keys may make it harder to write +>>>>>> smarter cmp functions.) --[[Joey]] +>>>>> +>>>>> Unfortunately, `sort="ascending mtime"` actually sorts by *descending* +>>>>> timestamp (but`sort=age` is fine, because `age` could be defined as +>>>>> now minus `ctime`). `sort=freshness` isn't right either, because +>>>>> "sort by freshness" seems as though it ought to mean freshest first, +>>>>> but "sort by ascending freshness" means put the least fresh first. If +>>>>> we have ascending and descending keywords which are optional, I don't +>>>>> think we really want different sort types to have different default +>>>>> directions - it seems clearer to have `ascending` always be a no-op, +>>>>> and `descending` always negate. +>>>>> +>>>>>> I think you've convinced me that ascending/descending impose too +>>>>>> much semantics on it, so "-" is better. --[[Joey]] + +>>>>>>> I've kept the semantics from `report` as-is, then: +>>>>>>> e.g. `sort="age -title"`. --s + +>>>>> Perhaps we could borrow from `meta updated` and use `update_age`? +>>>>> `updateage` would perhaps be a more normal IkiWiki style - but that +>>>>> makes me think that updateage is a quantity analagous to tonnage or +>>>>> voltage, with more or less recently updated pages being said to have +>>>>> more or less updateage. I don't know whether that's good or bad :-) +>>>>> +>>>>> I'm sure there's a much better word, but I can't see it. Do you have +>>>>> a better idea? --s + +[Regarding the `meta title=foo sort=bar` special case] + +> I feel it sould be clearer to call that "sortas", since "sort=" is used +> to specify a sort method in other directives. --[[Joey]] +>> Done. --[[smcv]] + +## speed + +I notice the implementation does not use the magic `$a` and `$b` globals. +That nasty perl optimisation is still worthwhile: + + perl -e 'use warnings; use strict; use Benchmark; sub a { $a <=> $b } sub b ($$) { $_[0] <=> $_[1] }; my @list=reverse(1..9999); timethese(10000, {a => sub {my @f=sort a @list}, b => sub {my @f=sort b @list}, c => => sub {my @f=sort { b($a,$b) } @list}})' + Benchmark: timing 10000 iterations of a, b, c... + a: 80 wallclock secs (76.74 usr + 0.05 sys = 76.79 CPU) @ 130.23/s (n=10000) + b: 112 wallclock secs (106.14 usr + 0.20 sys = 106.34 CPU) @ 94.04/s (n=10000) + c: 330 wallclock secs (320.25 usr + 0.17 sys = 320.42 CPU) @ 31.21/s (n=10000) + +Unfortunatly, I think that c is closest to the new implementation. +--[[Joey]] + +> Unfortunately, `$a` isn't always `$main::a` - it's `$Package::a` where +> `Package` is the call site of the sort call. This was a showstopper when +> `sort` was a hook implemented in many packages, but now that it's a +> `SortSpec`, I may be able to fix this by putting a `sort` wrapper in the +> `SortSpec` namespace, so it's like this: +> +> sub sort ($@) +> { +> my $cmp = shift; +> return sort $cmp @_; +> } +> +> which would mean that the comparison used `$IkiWiki::SortSpec::a`. +> --s + +>> I've now done this. On a wiki with many [[plugins/contrib/album]]s +>> (a full rebuild takes half an hour!), I tested a refresh after +>> `touch tags/*.mdwn` (my tag pages contain inlines of the form +>> `tagged(foo)` sorted by date, so they exercise sorting). +>> I also tried removing sorting from `pagespec_match_list` +>> altogether, as an upper bound for how fast we can possibly make it. +>> +>> * `master` at branch point: 63.72user 0.29system +>> * `master` at branch point: 63.91user 0.37system +>> * my branch, with `@_`: 65.28user 0.29system +>> * my branch, with `@_`: 65.21user 0.28system +>> * my branch, with `$a`: 64.09user 0.28system +>> * my branch, with `$a`: 63.83user 0.36system +>> * not sorted at all: 58.99user 0.29system +>> * not sorted at all: 58.92user 0.29system +>> +>> --s + +> I do notice that `pagespec_match_list` performs the sort before the +> filter by pagespec. Is this a deliberate design choice, or +> coincidence? I can see that when `limit` is used, this could be +> used to only run the pagespec match function until `limit` pages +> have been selected, but the cost is that every page in the wiki +> is sorted. Or, it might be useful to do the filtering first, then +> sort the sub-list thus produced, then finally apply the limit? --s + +>> Yes, it was deliberate, pagespec matching can be expensive enough that +>> needing to sort a lot of pages seems likely to be less work. (I don't +>> remember what benchmarking was done though.) --[[Joey]] + +>>> We discussed this on IRC and Joey pointed out that this also affects +>>> dependency calculation, so I'm not going to get into this now... --s + +Joey pointed out on IRC that the `titlesort` feature duplicates all the +meta titles. I did that in order to sort by the unescaped version, but +I've now changed the branch to only store that if it makes a difference. +--s + +## Documentation from sort-package branch + +### advanced sort orders (conditionally added to [[ikiwiki/pagespec/sorting]]) + +* `title_natural` - Orders by title, but numbers in the title are treated + as such, ("1 2 9 10 20" instead of "1 10 2 20 9") +* `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]` + or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no + full title was set. `meta(author)`, `meta(date)`, `meta(updated)`, etc. + also work. + +### Multiple sort orders (added to [[ikiwiki/pagespec/sorting]]) + +In addition, you can combine several sort orders and/or reverse the order of +sorting, with a string like `age -title` (which would sort by age, then by +title in reverse order if two pages have the same age). + +### meta sortas parameter (added to [[ikiwiki/directive/meta]]) + +[in title] + +An optional `sort` parameter will be used preferentially when +[[ikiwiki/pagespec/sorting]] by `meta(title)`: + + \[[!meta title="The Beatles" sort="Beatles, The"]] + + \[[!meta title="David Bowie" sort="Bowie, David"]] + +[in author] + + An optional `sortas` parameter will be used preferentially when + [[ikiwiki/pagespec/sorting]] by `meta(author)`: + + \[[!meta author="Joey Hess" sortas="Hess, Joey"]] + +### Sorting plugins (added to [[plugins/write]]) + +Similarly, it's possible to write plugins that add new functions as +[[ikiwiki/pagespec/sorting]] methods. To achieve this, add a function to +the IkiWiki::SortSpec package named `cmp_foo`, which will be used when sorting +by `foo` or `foo(...)` is requested. + +The names of pages to be compared are in the global variables `$a` and `$b` +in the IkiWiki::SortSpec package. The function should return the same thing +as Perl's `cmp` and `<=>` operators: negative if `$a` is less than `$b`, +positive if `$a` is greater, or zero if they are considered equal. It may +also raise an error using `error`, for instance if it needs a parameter but +one isn't provided. + +The function will also be passed one or more parameters. The first is +`undef` if invoked as `foo`, or the parameter `"bar"` if invoked as `foo(bar)`; +it may also be passed additional, named parameters. diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 99a9cf1e2..82670250e 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -36,6 +36,30 @@ definitions essentially. >> I've made may not be acceptable, though -- I'd appreciate someone providing >> some feedback on that hunk! +>>> Well, re that hunk, taint checking is currently disabled, but +>>> if the perl bug that disallows it is fixed and it is turned back on, +>>> the hash values will remain tainted, which will probably lead to +>>> problems. +>>> +>>> I'm also leery of using such a complex data structure in config. +>>> The websetup plugin would be hard pressed to provide a UI for such a +>>> data structure. (It lacks even UI for a single hash ref yet, let alone +>>> a list.) +>>> +>>> Also, it seems sorta wrong to have two so very different syntaxes to +>>> represent the same meta data. A user without a lot of experience will +>>> be hard pressed to map from a directive to this in the setup file. +>>> +>>> All of which leads me to think the setup file could just contain +>>> a text that could hold meta directives. Which generalizes really to +>>> a text that contains any directives, and is, perhaps appended to the +>>> top of every page. Which nearly generalizes to the sidebar plugin, +>>> or perhaps something more general than that... +>>> +>>> However, excessive generalization is the root of all evil, so +>>> I'm not necessarily saying that's a good idea. Indeed, my memory +>>> concerns below invalidate this idea pretty well. --[[Joey]] + diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 6fe9cda..2f8c098 100644 --- a/IkiWiki/Plugin/meta.pm @@ -125,6 +149,10 @@ definitions essentially. >> are only relevant to defined fields that you wouldn't want to specify a >> global default for anyway. >> +>>> I generally agree with this. It is *possible* that meta would have a new +>>> field added, that takes parameters and make sense to use globally. +>>> --[[Joey]] +>> >> Due to this, and the added complexity of the second patch (having to adjust >> `IkiWiki/Setup.pm`), I think the first patch makes more sense. I've thus >> reverted to it here. @@ -183,3 +211,36 @@ definitions essentially. >>> ikiwiki for the break, and now I've returned to watching recentchanges. >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have >>> you had a chance to look at this yet? -- [[Jon]] + +>>>> Ping :) Hi. [[Joey]], would you consider this patch for the next +>>>> ikiwiki release? -- [[Jon]] + +>>> For this to work with websetup and --dumpsetup, it needs to define the +>>> `meta_*` settings in the getsetup function. +>>>> +>>>> I think this will be problematic with the current implementation of this +>>>> patch. The datatype here is an array of hash references, with each hash +>>>> having a variable (and arbitrary) number of key/value pairs. I can't +>>>> think of an intuitive way of implementing a way of editing such a +>>>> datatype in the web interface, let alone registering the option in +>>>> getsetup. +>>>> +>>>> Perhaps a limited set of defined meta values could be exposed via +>>>> websetup (the obvious ones: author, copyright, license, etc.) -- [[Jon]] +>>> +>>> I also have some concerns about both these patches, since both throw +>>> a lot of redundant data at meta, which then stores it in a very redundant +>>> way. Specifically, meta populates a per-page `%metaheaders` hash +>>> as well as storing per-page metadata in `%pagestate`. So, if you have +>>> a wiki with 10 thousand pages, and you add a 1k site-wide license text, +>>> that will bloat the memory usage of ikiwiki by in excess of 2 +>>> megabytes. It will also cause ikiwiki to write a similar amount more data +>>> to its state file which has to be loaded back in each +>>> run. +>>> +>>> Seems that this could be managed much more efficiently by having +>>> meta special-case the site-wide settings, not store them in these +>>> per-page data structures, and just make them be used if no per-page +>>> metadata of the given type is present. --[[Joey]] +>>>> +>>>> that should be easy enough to do. I will work on a patch. -- [[Jon]] diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index f1d33114f..def55f3ee 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -4,7 +4,7 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte Also see: <http://madduck.net/blog/2008.01.06:new-blog/> and <http://users.itk.ppke.hu/~cstamas/code/ikiwiki/autocreatetagpage/> -[[!tag wishlist plugins/tag patch]] +[[!tag wishlist plugins/tag patch patch/core]] I would love to see this as well. -- dato @@ -123,3 +123,164 @@ On the second extra pass, it doesn't notice that it has to update the "?"-link. } is not satisfied for the newly created tag page. I shall put debug msgs into Render.pm to find out better how it works. --Ivan Z. + +--- + +I've made another attempt at fixing this + +The current progress can be found at my [git repository][gitweb] on branch +`autotag`: + + git://git.liegesta.at/git/ikiwiki + +[gitweb]: http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag (gitweb for branch autotag) + +It's not entirely finished yet, but already quite usable. Testing and comments +on code quality, implementation details, as well as other patches would be +appreciated. + +Here's what it does right now: + +* enabled by setting `tag_autocreate=1` in the configuration. +* Tag pages will be created in `tagbase` from the template `autotag.tmpl`. +* Will correctly render all links, and dependencies. Well, AFAIK. +* When a tag page is deleted it will automatically recreated from template. (I +consider this a feature, not a bug) +* Requires a rebuild on first use. +* Adds a function `add_autofile()` to the plugin API, to do all this. + +Todo/Bugs: + +* Will still create a page even if there's a page other than `$tag` under +`tagbase` satisfying the tag link. +* Call from `IkiWiki.pm` to `Render.pm`, which adds a module dependency in the +wrong direction. +* Add files to RCS. +* Unit tests. +* Proper documentation. + +--[[David_Riebenbauer]] + +> Starting review of this. Some of your commits are to very delicate, +> optimised, and security-sensitive ground, so I have to look at them very +> carefully. --[[Joey]] + +>> First of, sorry that it took me so damn long to answer. I didn't lose +>> interest but it took a while for me to find the time and motivation +>> to address you suggestions. --[[David_Riebenbauer]] + +> * In the refactoring in [f3abeac919c4736429bd3362af6edf51ede8e7fe][], +> you introduced at least 2 bugs, one a possible security hole. +> Now one part of the code tests `if ($file)` and the other +> caller tests `if ($f)`. These two tests both tested `if (! defined $f)` +> before. Notice that the variable needs to be the untainted variable +> for both. Also notice that `if ($f)` fails if `$f` contains `0`, +> which is a very common perl gotcha. +> * Your refactored code changes `-l $_ || -d _` to `-l $file || -d $file`. +> The latter makes one more stat system call; note the use of a +> bare `_` in the first to make perl reuse the stat buffer. +> * (As a matter of style, could you put a space after the commas in your +> perl?) + +>> The first two points should be addressed in +>> [da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0][]. And sure, I can add the +>> spaces. --[[David_Riebenbauer]] + +> I'd like to cherry-pick the above commit, once it's in shape, before +> looking at the rest in detail. So just a few other things that stood out. +> +> * Commit [4af4d26582f0c2b915d7102fb4a604b176385748][] seems unnecessary. +> `srcfile($file, 1)` already is documented to return undef if the +> file does not exist. (But without the second parameter, it throws +> an error.) + +>> You're right. I must have been some confused by some other promplem I +>> introduced then. Reverted. --[[David_Riebenbauer]] + +> * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] adds a line +> that is intented by a space, not a tab. + +>> Sorry, That one was reverted anyway. --[[David_Riebenbauer]] + +> * Commit [f58f3e1bec41ccf9316f37b014ce0b373c8e49e1][] says that auto-added +> files will be recreated if the user deletes them. That seems bad. +> `autoindex` goes to some trouble to not recreate deleted files. + +>> I reverted the commit and addressed the issue in +>> [a358d74bef51dae31332ff27e897fe04834571e6][] and +>> [981400177d68a279f485727be3f013e68f0bf691][]. + --[[David_Riebenbauer]] + +>>> This doesn't seem to have all the refinements that autoindex has: +>>> +>>> * `autoindex` attaches the record of deletions to the `index` page, which +>>> is (nearly) guaranteed to exist; this one attaches the record of +>>> deletions to the deleted page's page state. Won't that tend to result +>>> in losing the record along with the deleted page? + +>>>> This is probably on of the harder things to do, 'cause there are (most of the +>>>> time) several pages that are responsible for the creation of a single tag page. +>>>> Of course I could attach the info to all of them. + +>>>> With current behaviour I think the information in `%pagestate` is kept around +>>>> regardless whether the corresponding page exists or not. +>>>> --[[David_Riebenbauer]] + +>>>>> Sorry, I'll try to be clearer: `autoindex` hard-codes that the [[index]] page +>>>>> of the entire wiki is the one responsible for storing the page state. That +>>>>> page isn't responsible for the creation of the tag page, it's just an +>>>>> arbitrary page that's (more or less) guaranteed to exist. --[[smcv]] + +>>>>> I don't like that [[plugins/autoindex]] has to do that, +>>>>> but `%pagestate` values are only stored for pages that exist, +>>>>> so it was necessary. (Another way to look at this is that +>>>>> `%pagestate` is not the ideal data structure.) --[[Joey]] + +>>>>>> Aha! Having looked at [[plugins/write]] again, it turns out that what this +>>>>>> feature should really use is `%wikistate`, I think? :-) --[[smcv]] + +>>>>>>> Ah, indeed, that came after I wrote autoindex. I've fixed autoindex to +>>>>>>> use it. --[[Joey]] + +>>>>> Ok, now I know what you mean. --[[David_Riebenbauer]] + +>>> * `autoindex` forgets that a page was deleted when that page is +>>> re-created + +>>>> Yes, I forgot about that and that is a bug. I'll fix that. +>>>> --[[David_Riebenbauer]] + +>>> * `autoindex` forgets that a page was deleted when it's no longer needed +>>> anyway (this may be harder for `autotag`?) + +>>>> I don't think so. AFAIK ikiwiki can detect whether there are taglinks to a page +>>>> anyway, so it should be quite easy. I'll try to implement that too. +>>>> --[[David_Riebenbauer]] + +>>> It'd probably be an interesting test of the core change to port +>>> `autoindex` to use it? (Adding the file to the RCS would be +>>> necessary to get parity with `autoindex`.) --[[smcv]] + +>>>> Good suggestion. Adding the files to RCS is on my todo list anyway. +>>>> --[[David_Riebenbauer]] + +> Regarding the call from `IkiWiki.pm` to `Render.pm`, wouldn't this be +> quite easy to solve by moving `verify_src_file` to IkiWiki.pm? --[[smcv]] + +>> True. I'll do that. --[[David_Riebenbauer]] + +> Seems that `%autofiles` stores plugin names as keys, but never +> really uses them. So it could just as easily be an array. +> +> I'd be happy if the `%del_hash` global were not needed. +> Looks like it could be avoided by moving the checks +> that `add_autofile` does into the autofile handling loop in +> `Render`. (Also, that loop should probably be in its own +> function anyway.) --[[Joey]] + +[f3abeac919c4736429bd3362af6edf51ede8e7fe]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f3abeac919c4736429bd3362af6edf51ede8e7fe (commitdiff for f3abeac919c4736429bd3362af6edf51ede8e7fe) +[4af4d26582f0c2b915d7102fb4a604b176385748]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=4af4d26582f0c2b915d7102fb4a604b176385748 (commitdiff for 4af4d26582f0c2b915d7102fb4a604b176385748) +[f58f3e1bec41ccf9316f37b014ce0b373c8e49e1]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 (commitdiff for f58f3e1bec41ccf9316f37b014ce0b373c8e49e1) +[da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0 (commitdiff for da5d29f95f6e693e8c14be1b896cf25cf4fdb3c0) +[a358d74bef51dae31332ff27e897fe04834571e6]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=a358d74bef51dae31332ff27e897fe04834571e6 (commitdiff for a358d74bef51dae31332ff27e897fe04834571e6) +[981400177d68a279f485727be3f013e68f0bf691]: http://git.liegesta.at/?p=ikiwiki.git;a=commitdiff;h=981400177d68a279f485727be3f013e68f0bf691 (commitdiff for 981400177d68a279f485727be3f013e68f0bf691) diff --git a/doc/todo/auto_getctime_on_fresh_build.mdwn b/doc/todo/auto_getctime_on_fresh_build.mdwn new file mode 100644 index 000000000..760c56fa1 --- /dev/null +++ b/doc/todo/auto_getctime_on_fresh_build.mdwn @@ -0,0 +1,13 @@ +[[!tag wishlist]] + +It might be a good idea to enable --gettime when `.ikiwiki` does not +exist. This way a new checkout of a `srcdir` would automatically get +ctimes right. (Running --gettime whenever a rebuild is done would be too +slow.) --[[Joey]] + +Could this be too annoying in some cases, eg, checking out a large wiki +that needs to get set up right away? --[[Joey]] + +> Not for git with the new, optimised --getctime. For other VCS.. well, +> pity they're not as fast as git ;), but it is a one-time expense... +> [[done]] --[[Joey]] diff --git a/doc/todo/avatar.mdwn b/doc/todo/avatar.mdwn index b8aa2327f..f0599e4ed 100644 --- a/doc/todo/avatar.mdwn +++ b/doc/todo/avatar.mdwn @@ -1,38 +1,19 @@ [[!tag wishlist]] It would be nice if ikiwiki, particularly [[plugins/comments]] -supported user avatar icons. I was considering adding a directive for this, -as designed below. +(but also, ideally, recentchanges) supported user avatar icons. -However, there is no *good* service for mapping openids to avatars -- -openavatar has many issues, including not supporting delegated openids, and -after trying it, I don't trust it to push users toward. -Perhaps instead ikiwiki could get the email address from the openid -provider, though I think the perl openid modules don't support the openid -2.x feature that allows that. - -At the moment, working on this doesn't feel like a good use of my time. ---[[Joey]] - -Hmm.. unless is just always used a single provider (gravatar) and hashed -the openid. Then wavatars could be used to get a unique avatar per openid -at least. --[[Joey]] - ----- - -The directive displays a small avatar image for a user. Pass it the -email address, openid, or wiki username of the user. +Idea is to add a directive that displays a small avatar image for a user. +Pass it a user's the email address, openid, username, or the md5 hash +of their email address: \[[!avatar user@example.com]] \[[!avatar http://joey.kitenet.net/]] \[[!avatar user]] + \[[!avatar hash]] -The avatars are provided by various sites. For email addresses, it uses a -[gravatar](http://gravatar.com/). For openid, -[openavatar](http://www.openvatar.com/) is used. For a wiki username, the -user's email address is looked up and the gravatar for that user is -displayed. (Of course, the user has to have filled in their email address -on their Preferences page for that to work.) +These directives can then be hand-inserted onto pages, or more likely, +included in eg, a comment post via a template. An optional second parameter can be included, containing additional options to pass in the @@ -45,3 +26,35 @@ not have a gravatar, uses a cute auto-generated "wavatar" avatar. The `gravitar_options` setting in the setup file can be used to specify additional options to pass. So for example if you want to use wavatars everywhere, set it to "default=wavatar". + +The avatars are provided by various sites. For email addresses, it uses a +[gravatar](http://gravatar.com/). For a wiki username, the +user's email address is looked up and the gravatar for that user is +displayed. (Of course, the user has to have filled in their email address +on their Preferences page for that to work. Also, when the user changes +their email address in Preferences, the gravatar won't change until the +wiki is rebuilt.) + +For openid, openavatar sucked and is now dead. So we need to use an email +address instead, I guess. Problem is that the email address of a given +openid is only known when that user is logged in and making a change. +And we don't want to leak an openid user's email into a page either. +Hmm. Suppose the gravatar hash could be calculated from the email address +and embedded instead of the openid? That would work for comments, +but not if the directive were used elsewhere. + +Or, for openid, could use <http://paulisageek.com/openidavatar>. Which +works fine, but users are not likely to figure out what they need to do to +get an avatar associated with their openid. + +--- + +Alternative, not overdesigned approach: + +Modify comments plugin to have an option to display avatars. + +When posting a comment, fill in the avatarhash field in the template. +The hash is calculated from the user's email address. If the user's email +is not known, skip it. + +End. :P diff --git a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn index fb942a495..02b83244e 100644 --- a/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn +++ b/doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn @@ -13,5 +13,57 @@ those contents instead. > In mine I just copied sidebar out and made some extra "sidebars", but they go elsewhere. Ugly hack, but it works. --[[simonraven]] +>> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]] + +<pre> +--- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm 2010-02-11 22:53:17.000000000 -0500 ++++ plugins/IkiWiki/Plugin/sidebar.pm 2010-02-27 09:54:12.524412391 -0500 +@@ -19,12 +19,20 @@ + safe => 1, + rebuild => 1, + }, ++ active_sidebars => { ++ type => "string", ++ example => qw(sidebar banner footer), ++ description => "Which sidebars must be activated and processed.", ++ safe => 1, ++ rebuild => 1 ++ }, + } + +-sub sidebar_content ($) { ++sub sidebar_content ($$) { + my $page=shift; ++ my $sidebar=shift; + +- my $sidebar_page=bestlink($page, "sidebar") || return; ++ my $sidebar_page=bestlink($page, $sidebar) || return; + my $sidebar_file=$pagesources{$sidebar_page} || return; + my $sidebar_type=pagetype($sidebar_file); + +@@ -49,11 +57,17 @@ + + my $page=$params{page}; + my $template=$params{template}; +- +- if ($template->query(name => "sidebar")) { +- my $content=sidebar_content($page); +- if (defined $content && length $content) { +- $template->param(sidebar => $content); ++ ++ my @sidebars; ++ if (defined $config{active_sidebars} && length $config{active_sidebars}) { @sidebars = @{$config{active_sidebars}}; } ++ else { @sidebars = qw(sidebar); } ++ ++ foreach my $sidebar (@sidebars) { ++ if ($template->query(name => $sidebar)) { ++ my $content=sidebar_content($page, $sidebar); ++ if (defined $content && length $content) { ++ $template->param($sidebar => $content); ++ } + } + } + } +</pre> [[!tag wishlist]] diff --git a/doc/todo/cdate_and_mdate_available_for_templates.mdwn b/doc/todo/cdate_and_mdate_available_for_templates.mdwn new file mode 100644 index 000000000..70d8fc8c9 --- /dev/null +++ b/doc/todo/cdate_and_mdate_available_for_templates.mdwn @@ -0,0 +1,15 @@ +[[!tag wishlist]] + +`CDATE_3339`, `CDATE_822`, `MDATE_3339` and `MDATE_822` template variables would be useful for evey page, at least for my templates with Dublin Core metadata. + +I tried to pick the relevant lines of the [[inline|plugins/inline]] plugin and hack it into a custom plugin, but it failed miserably because of my obvious lack of perl litteracy... + +Anyway, I'm sure this is almost nothing... + +* `sub date_822 ($) {}` +* `sub date_3339 ($) {}` +* and something like `$template->param('cdate_822' => date_822($IkiWiki::pagectime{$page}));` + +Anyone can fill the missing lines? + +-- [[nil]] diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn index 2cef0ee8c..e84400c17 100644 --- a/doc/todo/conflict_free_comment_merges.mdwn +++ b/doc/todo/conflict_free_comment_merges.mdwn @@ -20,4 +20,4 @@ What do you think [[smcv]]? --[[Joey]] > are quite low since it modifies the input text and adds a date stamp to > it. > -> Anyway, I think it's good, [[[done]] --[[Joey]] +> Anyway, I think it's good, [[done]] --[[Joey]] diff --git a/doc/todo/double-click_protection_for_form_buttons.mdwn b/doc/todo/double-click_protection_for_form_buttons.mdwn new file mode 100644 index 000000000..501be4498 --- /dev/null +++ b/doc/todo/double-click_protection_for_form_buttons.mdwn @@ -0,0 +1,5 @@ +A small piece of JS to prevent double-submitting forms would be quite nice. I seem to have developed a habit of doing this and having to resolve a merge conflict for two initial commits. -- [[Jon]] + +> By the time you see that merge conflict, the first commit has +> already successfully happened, so you can just hit cancel +> and throw away the second submit. --[[Joey]] diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn index 412cb5eba..3b9721d50 100644 --- a/doc/todo/enable-htaccess-files.mdwn +++ b/doc/todo/enable-htaccess-files.mdwn @@ -12,6 +12,13 @@ qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//], wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]#]+)(?:#([^\s\]]+))?\]\]/, +> Note that the above patch is **completely broken**. +> It removes the crucial excludes of all files starting with a dot. +> The negative regexps for htaccess have no effect, so the whole +> thing only "works" because it allows *any* file starting with a dot. +> If you applied this patch to your ikiwiki, you opened a huge security +> hole. --[[Joey]] + [[!tag patch patch/core]] This lets the site administrator have a `.htaccess` file in their underlay @@ -57,7 +64,17 @@ It should be off by default of course. --Max --- +1 I want `.htaccess` so I can rewrite some old Wordpress URLs to make feeds work again. --[[hendry]] +> Unless you cannot modify apache's configuration, you do not need htaccess +> to do that. Apache's documentation recommends against using htaccess +> unless you're a user who cannot modify the main server configuration. +> --[[Joey]] + --- +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]] > I've described a workaround for one use case at the [[plugins/rsync]] [[plugins/rsync/discussion]] page. --[[schmonz]] + +--- + +[[done]], you can use the `include` setting to override the default +excludes now. Please use extreme caution when doing so. --[[Joey]] diff --git a/doc/todo/finer_control_over___60__object___47____62__s.mdwn b/doc/todo/finer_control_over___60__object___47____62__s.mdwn new file mode 100644 index 000000000..50c4d43bf --- /dev/null +++ b/doc/todo/finer_control_over___60__object___47____62__s.mdwn @@ -0,0 +1,98 @@ +IIUC, the current version of [HTML::Scrubber][] allows for the `object` tags to be either enabled or disabled entirely. However, while `object` can be used to add *code* (which is indeed a potential security hole) to a document, reading [Objects, Images, and Applets in HTML documents][objects-html] reveals that the “dangerous” are not all the `object`s, but rather those having the following attributes: + + classid %URI; #IMPLIED -- identifies an implementation -- + codebase %URI; #IMPLIED -- base URI for classid, data, archive-- + codetype %ContentType; #IMPLIED -- content type for code -- + archive CDATA #IMPLIED -- space-separated list of URIs -- + +It seems that the following attributes are, OTOH, safe: + + declare (declare) #IMPLIED -- declare but don't instantiate flag -- + data %URI; #IMPLIED -- reference to object's data -- + type %ContentType; #IMPLIED -- content type for data -- + standby %Text; #IMPLIED -- message to show while loading -- + height %Length; #IMPLIED -- override height -- + width %Length; #IMPLIED -- override width -- + usemap %URI; #IMPLIED -- use client-side image map -- + name CDATA #IMPLIED -- submit as part of form -- + tabindex NUMBER #IMPLIED -- position in tabbing order -- + +Should the former attributes be *scrubbed* while the latter left intact, the use of the `object` tag would seemingly become safe. + +Note also that allowing `object` (either restricted in such a way or not) automatically solves the [[/todo/svg]] issue. + +For Ikiwiki, it may be nice to be able to restrict [URI's][URI] (as required by the `data` and `usemap` attributes) to, say, relative and `data:` (as per [RFC 2397][]) ones as well, though it requires some more consideration. + +— [[Ivan_Shmakov]], 2010-03-12Z. + +[[wishlist]] + +> SVG can contain embedded javascript. + +>> Indeed. + +>> So, a more general tool (`XML::Scrubber`?) will be necessary to +>> refine both [XHTML][] and SVG. + +>> … And to leave [MathML][] as is (?.) + +>> — [[Ivan_Shmakov]], 2010-03-12Z. + +> The spec that you link to contains +> examples of objects that contain python scripts, Microsoft OLE +> objects, and Java. And then there's flash. I don't think ikiwiki can +> assume all the possibilities are handled securely, particularly WRT XSS +> attacks. +> --[[Joey]] + +>> I've scanned over all the `object` examples in the specification and +>> all of those that hold references to code (as opposed to data) have a +>> distinguishing `classid` attribute. + +>> While I won't assert that it's impossible to reference code with +>> `data` (and, thanks to `text/xhtml+xml` and `image/svg+xml`, it is +>> *not* impossible), throwing away any of the “insecure” +>> attributes listed above together with limiting the possible URI's +>> (i. e., only *local* and certain `data:` ones for `data` and +>> `usemap`) should make `object` almost as harmless as, say, `img`. + +>>> But with local data, one could not embed youtube videos, which surely +>>> is the most obvious use case? + +>>>> Allowing a “remote” object to render on one's page is a + security issue by itself. + Though, of course, having an explicit whitelist of URI's may make + this issue more tolerable. + — [[Ivan_Shmakov]], 2010-03-12Z. + +>>> Note that youtube embedding uses an +>>> object element with no classid. The swf file is provided via an +>>> enclosed param element. --[[Joey]] + +>>>> I've just checked a random video on YouTube and I see that the + `.swf` file is provided via an enclosed `embed` element. Whether + to allow those or not is a different issue. + — [[Ivan_Shmakov]], 2010-03-12Z. + +>> (Though it certainly won't solve the [[SVG_problem|/todo/SVG]] being +>> restricted in such a way.) + +>> Of the remaining issues I could only think of recursive +>> `object` — the one that references its container document. + +>> — [[Ivan_Shmakov]], 2010-03-12Z. + +## See also + +* [Objects, Images, and Applets in HTML documents][objects-html] +* [[plugins/htmlscrubber|/plugins/htmlscrubber]] +* [[todo/svg|/todo/svg]] +* [RFC 2397: The “data” URL scheme. L. Masinter. August 1998.][RFC 2397] +* [Uniform Resource Identifier — the free encyclopedia][URI] + +[HTML::Scrubber]: http://search.cpan.org/~podmaster/HTML-Scrubber-0.08/Scrubber.pm +[MathML]: http://en.wikipedia.org/wiki/MathML +[objects-html]: http://www.w3.org/TR/1999/REC-html401-19991224/struct/objects.html +[RFC 2397]: http://tools.ietf.org/html/rfc2397 +[URI]: http://en.wikipedia.org/wiki/Uniform_Resource_Identifier +[XHTML]: http://en.wikipedia.org/wiki/XHTML diff --git a/doc/todo/git_attribution/discussion.mdwn b/doc/todo/git_attribution/discussion.mdwn index dfb490bc2..6905d9b4b 100644 --- a/doc/todo/git_attribution/discussion.mdwn +++ b/doc/todo/git_attribution/discussion.mdwn @@ -72,7 +72,7 @@ no determination of uniqueness) > GIT_AUTHOR_EMAIL can also be set. > > There is one thing yet to be solved, and that is how to tell the -> difference between a web commit by 'Joey Hess <joey@kitenet.net>', +> difference between a web commit by 'Joey Hess <joey\@kitenet.net>', > and a git commit by the same. I think we do want to differentiate these, > and the best way to do it seems to be to add a line to the end of the > commit message. Something like: "\n\nWeb-commit: true" @@ -94,5 +94,5 @@ no determination of uniqueness) > * github pushes to twitter ;-) > > So while I tried that way at first, I'm now leaning toward encoding the -> username in the email address. Like "user <user@web>", or -> "joey <http://joey.kitenet.net/@web>". +> username in the email address. Like "user <user\@web>", or +> "joey <http://joey.kitenet.net/\@web>". diff --git a/doc/todo/http_bl_support.mdwn b/doc/todo/http_bl_support.mdwn new file mode 100644 index 000000000..f7a46ee6c --- /dev/null +++ b/doc/todo/http_bl_support.mdwn @@ -0,0 +1,67 @@ +[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here. + +[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112) + +> The [[plugins/blogspam]] service already checks urls against +> the surbl, and has its own IP blacklist. The best way to +> support the HTTP:BL may be to add a plugin +> [there](http://blogspam.repository.steve.org.uk/file/cc858e497cae/server/plugins/). +> --[[Joey]] + +<pre> +package Honeypot; + +use Socket qw/inet_ntoa/; + +my $dns = 'dnsbl.httpbl.org'; +my %types = ( +0 => 'Search Engine', +1 => 'Suspicious', +2 => 'Harvester', +4 => 'Comment Spammer' +); +sub query { +my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org'; +my $ip = shift || do { +warn 'no IP for request in Honeypot::query().'; +return; +}; + +my @parts = reverse split /\./, $ip; +my $lookup_name = join'.', $key, @parts, $dns; + +my $answer = gethostbyname ($lookup_name); +return unless $answer; +$answer = inet_ntoa($answer); +my(undef, $days, $threat, $type) = split /\./, $answer; +my @types; +while(my($bit, $typename) = each %types) { +push @types, $typename if $bit & $type; +} +return { +days => $days, +threat => $threat, +type => join ',', @types +}; + +} +1; +</pre> + +From the page: + +> The usage is simple: + +> use Honeypot; +> my $key = 'XXXXXXX'; # your key +> my $ip = '....'; the IP you want to check +> my $q = Honeypot::query($key, $ip); + +> use Data::Dumper; +> print Dumper $q; + +Any chance of having this as a plugin? + +I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]] + +[[!tag wishlist]] diff --git a/doc/todo/link_plugin_perhaps_too_general__63__.mdwn b/doc/todo/link_plugin_perhaps_too_general__63__.mdwn new file mode 100644 index 000000000..8a5fd50eb --- /dev/null +++ b/doc/todo/link_plugin_perhaps_too_general__63__.mdwn @@ -0,0 +1,25 @@ +[[!tag wishlist blue-sky]] +(This isn't important to me - I don't use MediaWiki or Creole syntax myself - +but just thinking out loud...) + +The [[ikiwiki/wikilink]] syntax IkiWiki uses sometimes conflicts with page +languages' syntax (notably, [[plugins/contrib/MediaWiki]] and [[plugins/Creole]] +want their wikilinks the other way round, like +`\[[plugins/write|how to write a plugin]]`). It would be nice if there was +some way for page language plugins to opt in/out of the normal wiki link +processing - then MediaWiki and Creole could have their own `linkify` hook +that was only active for *their* page types, and used the appropriate +syntax. + +In [[todo/matching_different_kinds_of_links]] I wondered about adding a +`\[[!typedlink to="foo" type="bar"]]` directive. This made me wonder whether +a core `\[[!link]]` directive would be useful; this could be a fallback for +page types where a normal wikilink can't be done for whatever reason, and +could also provide extension points more easily than WikiLinks' special +syntax with extra punctuation, which doesn't really scale? + +Straw-man: + + \[[!link to="ikiwiki/wikilink" desc="WikiLinks"]] + +--[[smcv]] diff --git a/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn b/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn new file mode 100644 index 000000000..2b2b0242e --- /dev/null +++ b/doc/todo/mark_edit_as_trivial__44___identify__47__filter_on_trivial_changes.mdwn @@ -0,0 +1,11 @@ +One feature of mediawiki which I quite like is the ability to mark a change as 'minor', or 'trivial'. This can then be used to filter the 'recentchanges' page, to only show substantial edits. + +The utility of this depends entirely on whether the editors use it properly. + +I currently use an inline on the front page of my personal homepage to show the most recent pages (by creation date) within a subsection of my site (a blog). Blog posts are rarely modified much after they are 'created' (or published - I bodge the creation time via meta when I publish a post. It might sit in draft form indefinitely), so this effectively shows only non-trivial changes. + +I would like to have a short list of the most recent modifications to the site on the front page. I therefore want to sort by modified time rather than creation time, but exclude edits that I self-identify as minor. I also only want to take a short number of items, the top 5, and display only their titles (which may be derived from filename, or set via meta again). + +I'm still thinking through how this might be achieved in an ikiwiki-suitable fashion, but I think I need a scheme to identify certain edits as trivial. This would have to work via web edits (easier: could add a check box to the edit form) and plain changes in the VCS (harder: scan for keywords in a commit message? in a VCS-agnostic fashion?) + +[[!tag wishlist]] diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn index 26c5a072b..da3ea49f6 100644 --- a/doc/todo/matching_different_kinds_of_links.mdwn +++ b/doc/todo/matching_different_kinds_of_links.mdwn @@ -36,6 +36,11 @@ Besides pagespecs, the `rel=` attribute could be used for styles. --Ivan Z. > normal links.) Might be better to go ahead and add the variable to > core though. --[[Joey]] +>> I've implemented this with the data structure you suggested, except that +>> I called it `%typedlinks` instead of `%linktype` (it seemed to make more +>> sense that way). I also ported `tag` to it, and added a `tagged_is_strict` +>> config option. See below! --[[smcv]] + I saw somewhere else here some suggestions for the wiki-syntax for specifying the relation name of a link. One more suggestion---[the syntax used in Semantic MediaWiki](http://en.wikipedia.org/wiki/Semantic_MediaWiki#Basic_usage), like this: <pre> @@ -45,3 +50,147 @@ I saw somewhere else here some suggestions for the wiki-syntax for specifying th So a part of the effect of [[`\[[!taglink TAG\]\]`|plugins/tag]] could be represented as something like `\[[tag::TAG]]` or (more understandable relation name in what concerns the direction) `\[[tagged::TAG]]`. I don't have any opinion on this syntax (whether it's good or not)...--Ivan Z. + +------- + +>> [[!template id=gitbranch author="[[Simon_McVittie|smcv]]" branch=smcv/ready/link-types]] +>> [[!tag patch]] + +## Documentation for smcv's branch + +### added to [[ikiwiki/pagespec]] + +* "`typedlink(type glob)`" - matches pages that link to a given page (or glob) + with a given link type. Plugins can create links with a specific type: + for instance, the tag plugin creates links of type `tag`. + +### added to [[plugins/tag]] + +If the `tagged_is_strict` config option is set, `tagged()` will only match +tags explicitly set with [[ikiwiki/directive/tag]] or +[[ikiwiki/directive/taglink]]; if not (the default), it will also match +any other [[WikiLinks|ikiwiki/WikiLink]] to the tag page. + +### added to [[plugins/write]] + +#### `%typedlinks` + +The `%typedlinks` hash records links of specific types. Do not modify this +hash directly; call `add_link()`. The keys are page names, and the values +are hash references. In each page's hash reference, the keys are link types +defined by plugins, and the values are hash references with link targets +as keys, and 1 as a dummy value, something like this: + + $typedlinks{"foo"} = { + tag => { short_word => 1, metasyntactic_variable => 1 }, + next_page => { bar => 1 }, + }; + +Ordinary [[WikiLinks|ikiwiki/WikiLink]] appear in `%links`, but not in +`%typedlinks`. + +#### `add_link($$;$)` + + This adds a link to `%links`, ensuring that duplicate links are not + added. Pass it the page that contains the link, and the link text. + +An optional third parameter sets the link type (`undef` produces an ordinary +[[ikiwiki/WikiLink]]). + +## Review + +Some code refers to `oldtypedlinks`, and other to `oldlinktypes`. --[[Joey]] + +> Oops, I'll fix that. That must mean missing test coverage, too :-( +> --s + +>> A test suite for the dependency resolver *would* be nice. --[[Joey]] + +>>> Bug fixed, I think. A test suite for the dependency resolver seems +>>> more ambitious than I want to get into right now, but I added a +>>> unit test for this part of it... --s + +I'm curious what your reasoning was for adding a new variable +rather than using `pagestate`. Was it only because you needed +the `old` version to detect change, or was there other complexity? +--J + +> You seemed to be more in favour of adding it to the core in +> your proposal above, so I assumed that'd be more likely to be +> accepted :-) I don't mind one way or the other - `%typedlinks` +> costs one core variable, but saves one level of hash nesting. If +> you're not sure either, then I think the decision should come down +> to which one is easier to document clearly - I'm still unhappy with +> my docs for `%typedlinks`, so I'll try to write docs for it as +> `pagestate` and see if they work any better. --s + +>> On reflection, I don't think it's any better as a pagestate, and +>> the contents of pagestates (so far) aren't documented for other +>> plugins' consumption, so I'm inclined to leave it as-is, unless +>> you want to veto that. Loose rationale: it needs special handling +>> in the core to be a dependency type (I re-used the existing link +>> type), it's API beyond a single plugin, and it's really part of +>> the core parallel to pagestate rather than being tied to a +>> specific plugin. Also, I'd need to special-case it to have +>> ikiwiki not delete it from the index, unless I introduced a +>> dummy typedlinks plugin (or just hook) that did nothing... --s + +I have not convinced myself this is a real problem, but.. +If a page has a typed link, there seems to be no way to tell +if it also has a separate, regular link. `add_link` will add +to `@links` when adding a typed, or untyped link. If only untyped +links were recorded there, one could tell the difference. But then +typed links would not show up at all in eg, a linkmap, +unless it was changed to check for typed links too. +(Or, regular links could be recorded in typedlinks too, +with a empty type. (Bloaty.)) --J + +> I think I like the semantics as-is - I can't think of any +> reason why you'd want to ask the question "does A link to B, +> not counting tags and other typed links?". A typed link is +> still a link, in my mind at least. --s + +>> Me neither, let's not worry about it. --[[Joey]] + +I suspect we could get away without having `tagged_is_strict` +without too much transitional trouble. --[[Joey]] + +> If you think so, I can delete about 5 LoC. I don't particularly +> care either way; [[Jon]] expressed concern about people relying +> on the current semantics, on one of the pages requesting this +> change. --s + +>> Removed in a newer version of the branch. --s + +I might have been wrong to introduce `typedlink(tag foo)`. It's not +very user-friendly, and is more useful as a backend for other plugins +that as a feature in its own right - any plugin introducing a link +type will probably also want to have its own preprocessor directive +to set that link type, and its own pagespec function to match it. +I wonder whether to make a `typedlink` plugin that has the typedlink +pagespec match function and a new `\[[!typedlink to="foo" type="bar"]]` +though... --[[smcv]] + +> I agree, per-type matchers are more friendly and I'm not enamored of the +> multi-parameter pagespec syntax. --[[Joey]] + +>> Removed in a newer version of the branch. I re-introduced it as a +>> plugin in `smcv/typedlink`, but I don't think we really need it. --s + +---- + +I am ready to merge this, but I noticed one problem -- since `match_tagged` +now only matches pages with the tag linktype, a wiki will need to be +rebuilt on upgrade in order to get the linktype of existing tags in it +recorded. So there needs to be a NEWS item about this and +the postinst modified to force the rebuild. + +> Done, although you'll need to plug in an appropriate version number when +> you release it. Is there a distinctive reminder string you grep for +> during releases? I've used `UNRELEASED` for now. --[[smcv]] + +Also, the ready branch adds `typedlink()` to [[ikiwiki/pagespec]], +but you removed that feature as documented above. +--[[Joey]] + +> [[Done]]. --s diff --git a/doc/todo/mercurial.mdwn b/doc/todo/mercurial.mdwn index e71c8106a..de1f148e5 100644 --- a/doc/todo/mercurial.mdwn +++ b/doc/todo/mercurial.mdwn @@ -119,3 +119,11 @@ I have a few notes on mercurial usage after trying it out for a while: >> I think the ideal solution would be to build `$destdir/recentchanges/*` directly from the output of `hg log`. --[[buo]] >>>> That would be 100 times as slow, so I chose not to do that. --[[Joey]] + +>>>> Since this is confusing people, allow me to clarify: Ikiwiki's +>>>> recentchanges generation pulls log information directly out of the VCS as +>>>> needed. It caches it in recentchanges/* in the `scrdir`. These cache +>>>> files need not be preserved, should never be checked into VCS, and if +>>>> you want to you can configure your VCSignore file to ignore them, +>>>> just as you can configure it to ignore the `.ikiwiki` directory in the +>>>> `scrdir`. --[[Joey]] diff --git a/doc/todo/more_flexible_inline_postform.mdwn b/doc/todo/more_flexible_inline_postform.mdwn index bc8bc0809..414476bd7 100644 --- a/doc/todo/more_flexible_inline_postform.mdwn +++ b/doc/todo/more_flexible_inline_postform.mdwn @@ -16,3 +16,8 @@ logical first step towards doing comment-like things with inlined pages). > Perhaps what we need is a `postform` plugin/directive that inline depends > on (automatically enables); its preprocess method could automatically be > invoked from preprocess_inline when needed. --[[smcv]] + +>> I've been looking at this stuff again. I think you are right, this would +>> be the right approach. The comments plugin could use it similarly, allowing +>> sites which desire it to have an inline comment submission form on all +>> pages with comments enabled. I'm going to take a look. -- [[Jon]] diff --git a/doc/todo/openid_user_filtering.mdwn b/doc/todo/openid_user_filtering.mdwn index 8b2d0082e..6a318c4c0 100644 --- a/doc/todo/openid_user_filtering.mdwn +++ b/doc/todo/openid_user_filtering.mdwn @@ -7,3 +7,7 @@ So I suggest an ikiwiki configuration like: users => ["*.webvm.net"], Would only allow edits from openIDs of that form. + +> This kind of thing can be [[done]] now: --[[Joey]] +> +> locked_pages => "* and !user(http://*.webvm.net/)" diff --git a/doc/todo/optional_underlaydir_prefix.mdwn b/doc/todo/optional_underlaydir_prefix.mdwn new file mode 100644 index 000000000..06900a904 --- /dev/null +++ b/doc/todo/optional_underlaydir_prefix.mdwn @@ -0,0 +1,46 @@ +For security reasons, symlinks are disabled in IkiWiki. That's fair enough, but that means that some problems, which one could otherwise solve by using a symlink, cannot be solved. The specfic problem in this case is that all underlays are placed at the root of the wiki, when it could be more convenient to place some underlays in specific sub-directories. + +Use-case 1 (to keep things tidy): + +Currently IkiWiki has some javascript files in `underlays/javascript`; that directory is given as one of the underlay directories. Thus, all the javascript files appear in the root of the generated site. But it would be tidier if one could say "put the contents of *this* underlaydir under the `js` directory". + +> Of course, this could be accomplished, if we wanted to, by moving the +> files to `underlays/javascript/js`. --[[Joey]] + +Use-case 2 (a read-only external dir): + +Suppose I want to include a subset of `/usr/local/share/docs` on my wiki, say the docs about `foo`. But I want them to be under the `docs/foo` sub-directory on the generated site. Currently I can't do that. If I give `/usr/local/share/docs/foo` as an underlaydir, then the contents of that will be in the root of the site, rather than under `docs/foo`. And if I give `/usr/local/share/docs` as an underlaydir, then the contents of the `foo` dir will be under `foo`, but it will also include every other thing in `/usr/local/share/docs`. + +Since we can't use symlinks in an underlay dir to link to these directories, then perhaps one could give a specific underlay dir a specific prefix, which defines the sub-directory that the underlay should appear in. + +I'm not sure how this would be implemented, but I guess it could be configured something like this: + + prefixed_underlay => { + 'js' => '/usr/local/share/ikiwiki/javascript', + 'docs/foo' => '/usr/local/share/docs/foo', + } + +> So, let me review why symlinks are an issue. For normal, non-underlay +> pages, users who do not have filesystem access to the server may have +> commit access, and so could commit eg, a symlink to `/etc/passwd` (or +> to `/` !). The guards are there to prevent ikiwiki either exposing the +> symlink target's contents, or potentially overwriting it. +> +> Is this a concern for underlays? Most of the time, certianly not; +> the underlay tends to be something only the site admin controls. +> Not all the security checks that are done on the srcdir are done +> on the underlays, either. Most checks done on files in the underlay +> are only done because the same code handles srcdir files. The one +> exception is the test that skips processing symlinks in the underlay dir. +> (But note that the underlay directory can be a symlinkt to elsewhere +> which the srcdir, by default, cannot.) +> +> So, one way to approach this is to make ikiwiki follow directory symlinks +> inside the underlay directory. Just a matter of passing `follow => 1` to +> find. (This would still not allow individual files to be symlinks, because +> `readfile` does not allow reading symlinks. But I don't see much need +> for that.) --[[Joey]] + +>> If you think that enabling symlinks in underlay directories wouldn't be a security issue, then I'm all for it! That would be much simpler to implement, I'm sure. --[[KathrynAndersen]] + +[[!taglink wishlist]] diff --git a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn index 204c48cd7..48ed744b1 100644 --- a/doc/todo/rewrite_ikiwiki_in_haskell.mdwn +++ b/doc/todo/rewrite_ikiwiki_in_haskell.mdwn @@ -29,6 +29,7 @@ It's appealing for a lot of reasons, including: edit in html editors currently. - This would be a chance to make WikiLinks with link texts read "the right way round" (ie, vaguely wiki creole compatably). + *[See also [[todo/link_plugin_perhaps_too_general?]] --[[smcv]]]* - The data structures would probably be quite different. - I might want to drop a lot of the command-line flags, either requiring a setup file be used for those things, or leaving the diff --git a/doc/todo/salmon_protocol_for_comment_sharing.mdwn b/doc/todo/salmon_protocol_for_comment_sharing.mdwn new file mode 100644 index 000000000..1e56b0a8b --- /dev/null +++ b/doc/todo/salmon_protocol_for_comment_sharing.mdwn @@ -0,0 +1,21 @@ +The <a href="http://www.salmon-protocol.org/home">Salmon protocol</a> +provides for aggregating comments across sites. If a site that syndicates +a feed receives a comment on an item in that feed, it can re-post the +comment to the original source. + +> Ikiwiki does not allow comments to be posted on items it aggregates. +> So salmon protocol support would only need to handle the comment +> receiving side of the protocol. +> +> The current draft protocol document confuses me when it starts talking +> about using OAuth in the abuse prevention section, since their example +> does not show use of OAuth, and it's not at all clear to me where the +> OAuth relationship between aggregator and original source is supposed +> to come from. +> +> Their security model, which goes on to include Webfinger, +> thirdparty validation services, XRD, and Magic Signatures, looks sorta +> like they kept throwing technology, at it, hoping something will stick. :-P +> --[[Joey]] + +[[!tag wishlist]] diff --git a/doc/todo/smarter_sorting.mdwn b/doc/todo/smarter_sorting.mdwn new file mode 100644 index 000000000..901e143a7 --- /dev/null +++ b/doc/todo/smarter_sorting.mdwn @@ -0,0 +1,141 @@ +I benchmarked a build of a large wiki (my home wiki), and it was spending +quite a lot of time sorting; `CORE::sort` was called only 1138 times, but +still flagged as the #1 time sink. (I'm not sure I trust NYTProf fully +about that FWIW, since it also said 27238263 calls to `cmp_age` were +the #3 timesink, and I suspect it may not entirely accurately measure +the overhead of so many short function calls.) + +`pagespec_match_list` currently always sorts *all* pages first, and then +finds the top M that match the pagespec. That's innefficient when M is +small (as for example in a typical blog, where only 20 posts are shown, +out of maybe thousands). + +As [[smcv]] noted, It could be flipped, so the pagespec is applied first, +and then sort the smaller matching set. But, checking pagespecs is likely +more expensive than sorting. (Also, influence calculation complicates +doing that.) + +Another option, when there is a limit on M pages to return, might be to +cull the M top pages without sorting the rest. + +> The patch below implements this. +> +> But, I have not thought enough about influence calculation. +> I need to figure out which pagespec matches influences need to be +> accumulated for in order to determine all possible influences of a +> pagespec are known. +> +> The old code accumulates influences from matching all successful pages +> up to the num cutoff, as well as influences from an arbitrary (sometimes +> zero) number of failed matches. New code does not accumulate influences +> from all the top successful matches, only an arbitrary group of +> successes and some failures. +> +> Also, by the time I finished this, it was not measuarably faster than +> the old method. At least not with a few thousand pages; it +> might be worth revisiting this sometime for many more pages? [[done]] +> --[[Joey]] + +<pre> +diff --git a/IkiWiki.pm b/IkiWiki.pm +index 1730e47..bc8b23d 100644 +--- a/IkiWiki.pm ++++ b/IkiWiki.pm +@@ -2122,36 +2122,54 @@ sub pagespec_match_list ($$;@) { + my $num=$params{num}; + delete @params{qw{num deptype reverse sort filter list}}; + +- # when only the top matches will be returned, it's efficient to +- # sort before matching to pagespec, +- if (defined $num && defined $sort) { +- @candidates=IkiWiki::SortSpec::sort_pages( +- $sort, @candidates); +- } +- ++ # Find the first num matches (or all), before sorting. + my @matches; +- my $firstfail; + my $count=0; + my $accum=IkiWiki::SuccessReason->new(); +- foreach my $p (@candidates) { +- my $r=$sub->($p, %params, location => $page); ++ my $i; ++ for ($i=0; $i < @candidates; $i++) { ++ my $r=$sub->($candidates[$i], %params, location => $page); + error(sprintf(gettext("cannot match pages: %s"), $r)) + if $r->isa("IkiWiki::ErrorReason"); + $accum |= $r; + if ($r) { +- push @matches, $p; ++ push @matches, $candidates[$i]; + last if defined $num && ++$count == $num; + } + } + ++ # We have num natches, but they may not be the best. ++ # Efficiently find and add the rest, without sorting the full list of ++ # candidates. ++ if (defined $num && defined $sort) { ++ @matches=IkiWiki::SortSpec::sort_pages($sort, @matches); ++ ++ for ($i++; $i < @candidates; $i++) { ++ # Comparing candidate with lowest match is cheaper, ++ # so it's done before testing against pagespec. ++ if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[-1], $sort) < 0 && ++ $sub->($candidates[$i], %params, location => $page) ++ ) { ++ # this could be done less expensively ++ # using a binary search ++ for (my $j=0; $j < @matches; $j++) { ++ if (IkiWiki::SortSpec::cmptwo($candidates[$i], $matches[$j], $sort) < 0) { ++ splice @matches, $j, $#matches-$j+1, $candidates[$i], ++ @matches[$j..$#matches-1]; ++ last; ++ } ++ } ++ } ++ } ++ } ++ + # Add simple dependencies for accumulated influences. +- my $i=$accum->influences; +- foreach my $k (keys %$i) { +- $depends_simple{$page}{lc $k} |= $i->{$k}; ++ my $inf=$accum->influences; ++ foreach my $k (keys %$inf) { ++ $depends_simple{$page}{lc $k} |= $inf->{$k}; + } + +- # when all matches will be returned, it's efficient to +- # sort after matching ++ # Sort if we didn't already. + if (! defined $num && defined $sort) { + return IkiWiki::SortSpec::sort_pages( + $sort, @matches); +@@ -2455,6 +2473,12 @@ sub sort_pages { + sort $f @_ + } + ++sub cmptwo { ++ $a=$_[0]; ++ $b=$_[1]; ++ $_[2]->(); ++} ++ + sub cmp_title { + IkiWiki::pagetitle(IkiWiki::basename($a)) + cmp +</pre> + +This would be bad when M is very large, and particularly, of course, when +there is no limit and all pages are being matched on. (For example, an +archive page shows all pages that match a pagespec specifying a creation +date range.) Well, in this case, it *does* make sense to flip it, limit by +pagespe first, and do a (quick)sort second. (No influence complications, +either.) + +> Flipping when there's no limit implemented, and it knocked 1/3 off +> the rebuild time of my blog's archive pages. --[[Joey]] + +Adding these special cases will be more complicated, but I think the best +of both worlds. --[[Joey]] diff --git a/doc/todo/structured_page_data.mdwn b/doc/todo/structured_page_data.mdwn index da9da9663..9f21fab7f 100644 --- a/doc/todo/structured_page_data.mdwn +++ b/doc/todo/structured_page_data.mdwn @@ -253,6 +253,9 @@ in a large number of other cases. > dependencies between bugs from arbitrary links. >> This issue (the need for distinguished kinds of links) has also been brought up in other discussions: [[tracking_bugs_with_dependencies#another_kind_of_links]] (deps vs. links) and [[tag_pagespec_function]] (tags vs. links). --Ivan Z. +>>> And multiple link types are now supported; plugins can set the link +>>> type when registering a link, and pagespec functions can match on them. --[[Joey]] + ---- #!/usr/bin/perl diff --git a/doc/todo/svg.mdwn b/doc/todo/svg.mdwn index 89b183db6..274ebf3e3 100644 --- a/doc/todo/svg.mdwn +++ b/doc/todo/svg.mdwn @@ -57,3 +57,21 @@ in the trunk if other people think it's useful. [htmlscrubber.pm]:http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blob;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hb=fe333c8e5b4a5f374a059596ee698dacd755182d [diff]: http://xbeta.org/gitweb/?p=xbeta/ikiwiki.git;a=blobdiff;f=IkiWiki/Plugin/htmlscrubber.pm;h=3c0ddc8f25bd8cb863634a9d54b40e299e60f7df;hp=3bdaccea119ec0e1b289a0da2f6d90e2219b8d66;hb=fe333c8e5b4a5f374a059596ee698dacd755182d;hpb=be0b4f603f918444b906e42825908ddac78b7073 + +> Unfortuantly these links are broken. --[[Joey]] + +* * * + +Actually, there's a way to embed SVG into MarkDown sources using the [data: URI scheme][rfc2397], [like this](data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/Pgo8c3ZnIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KIDwhLS0gQ3JlYXRlZCB3aXRoIFNWRy1lZGl0IC0gaHR0cDovL3N2Zy1lZGl0Lmdvb2dsZWNvZGUuY29tLyAtLT4KIDx0aXRsZT5IZWxsbywgd29ybGQhPC90aXRsZT4KIDxnPgogIDx0aXRsZT5MYXllciAxPC90aXRsZT4KICA8ZyB0cmFuc2Zvcm09InJvdGF0ZSgtNDUsIDk3LjY3MTksIDk3LjY2OCkiIGlkPSJzdmdfNyI+CiAgIDxyZWN0IHN0cm9rZS13aWR0aD0iNSIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjRkYwMDAwIiBpZD0ic3ZnXzUiIGhlaWdodD0iNTYuMDAwMDAzIiB3aWR0aD0iMTc1IiB5PSI2OS42Njc5NjkiIHg9IjEwLjE3MTg3NSIvPgogICA8dGV4dCB4bWw6c3BhY2U9InByZXNlcnZlIiB0ZXh0LWFuY2hvcj0ibWlkZGxlIiBmb250LWZhbWlseT0ic2VyaWYiIGZvbnQtc2l6ZT0iMjQiIHN0cm9rZS13aWR0aD0iMCIgc3Ryb2tlPSIjMDAwMDAwIiBmaWxsPSIjZmZmZjAwIiBpZD0ic3ZnXzYiIHk9IjEwNS42NjgiIHg9Ijk5LjY3MTkiPkhlbGxvLCB3b3JsZCE8L3RleHQ+CiAgPC9nPgogPC9nPgo8L3N2Zz4=). +Of course, this way to display an image one needs to click a link, but it may be considered a feature. +— [[Ivan_Shmakov]], 2010-03-12Z. + +[rfc2397]: http://tools.ietf.org/html/rfc2397 + +> You can do the same with img src actually. +> +> If svg markup allows unsafe elements (ie, javascript), +> which it appears to, +> then this is a security hole, and the htmlscrubber +> needs to lock it down more. Darn, now I have to spend my afternoon making +> security releases! --[[Joey]] diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn index 5f3ece290..456dadad0 100644 --- a/doc/todo/tracking_bugs_with_dependencies.mdwn +++ b/doc/todo/tracking_bugs_with_dependencies.mdwn @@ -81,6 +81,9 @@ I like the idea of [[tips/integrated_issue_tracking_with_ikiwiki]], and I do so >> I saw that this issue is targeted at by the work on [[structured page data#another_kind_of_links]]. --Ivan Z. +>>> It's fixed now; links can have a type, such as "tag", or "dependency", +>>> and pagespecs can match links of a given typo. --[[Joey]] + Okie - I've had a quick attempt at this. Initial patch attached. This one doesn't quite work. And there is still a lot of debugging stuff in there. diff --git a/doc/todo/user-defined_templates_outside_the_wiki.mdwn b/doc/todo/user-defined_templates_outside_the_wiki.mdwn new file mode 100644 index 000000000..1d72aa6a7 --- /dev/null +++ b/doc/todo/user-defined_templates_outside_the_wiki.mdwn @@ -0,0 +1,10 @@ +[[!tag wishlist]] + +The [[plugins/contrib/ftemplate]] plugin looks for templates inside the wiki +source, but also looks in the system templates directory (the one with +`page.tmpl`). This means the wiki admin can provide templates that can be +invoked via `\[[!template]]`, but don't have to "work" as wiki pages in their +own right. I think the normal [[plugins/template]] plugin could benefit from +this functionality. + +[[done]] --[[Joey]] diff --git a/doc/usage.mdwn b/doc/usage.mdwn index e4808d4c2..2e12517ea 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -50,6 +50,14 @@ These options control the mode that ikiwiki operates in. If used with --setup --refresh, this makes it also update any configured wrappers. +* --clean + + This makes ikiwiki clean up by removing any files it denerated in the + `destination` directory, as well as any configured wrappers, and the + `.ikiwiki` state directory. This is mostly useful if you're running + ikiwiki in a Makefile to build documentation and want a corresponding + `clean` target. + * --cgi Enable [[CGI]] mode. In cgi mode ikiwiki runs as a cgi script, and @@ -226,6 +234,12 @@ also be configured using a setup file. Specifies a rexexp of source files to exclude from processing. May be specified multiple times to add to exclude list. +* --include regexp + + Specifies a rexexp of source files, that would normally be excluded, + but that you wish to include in processing. + May be specified multiple times to add to include list. + * --adminuser name Specifies a username of a user (or, if openid is enabled, an openid) @@ -306,20 +320,22 @@ also be configured using a setup file. intercepted. If you enable this option then you must run at least the CGI portion of ikiwiki over SSL. -* --getctime +* --gettime, --no-gettime - Pull creation time for each new page out of the revision control - system. This rarely used option provides a way to get the real creation - times of items in weblogs, such as when building a wiki from a new - VCS checkout. It is unoptimised and quite slow. It is best used - with --rebuild, to force ikiwiki to get the ctime for all pages. + Extract creation and modification times for each new page from the + the revision control's log. This is done automatically when building a + wiki for the first time, so you normally do not need to use this option. * --set var=value This allows setting an arbitrary configuration variable, the same as if it - were set via a setup file. Since most options can be configured - using command-line switches, you will rarely need to use this, but it can be - useful for the odd option that lacks a command-line switch. + were set via a setup file. Since most options commonly used options can be + configured using command-line switches, you will rarely need to use this. + +* --set-yaml var=value + + This is like --set, but it allows setting configuration variables that + use complex data structures, by passing in a YAML document. # EXAMPLES diff --git a/doc/users/David_Riebenbauer.mdwn b/doc/users/David_Riebenbauer.mdwn index 372a28588..d7469696e 100644 --- a/doc/users/David_Riebenbauer.mdwn +++ b/doc/users/David_Riebenbauer.mdwn @@ -1,2 +1,8 @@ Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through <davrieb@liegesta.at> + +## Branches in his [[git]] repository ## + +* `autotag` +([browse](http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag)) +See [[todo/auto-create_tag_pages_according_to_a_template]] diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn index b32927a1c..61d6150ef 100644 --- a/doc/users/Edward_Betts.mdwn +++ b/doc/users/Edward_Betts.mdwn @@ -1,9 +1,4 @@ My watchlist: -[[!inline archive="yes" sort="mtime" atom="yes" pages=" -todo/allow_wiki_syntax_in_commit_messages* -todo/shortcut_with_different_link_text* -todo/structured_page_data* -tips/convert_mediawiki_to_ikiwiki* -"]] +[[!inline archive="yes" sort="mtime" atom="yes" pages="todo/allow_wiki_syntax_in_commit_messages* or todo/shortcut_with_different_link_text* or todo/structured_page_data* or tips/convert_mediawiki_to_ikiwiki*"]] diff --git a/doc/users/KathrynAndersen.mdwn b/doc/users/KathrynAndersen.mdwn index 16cb390c4..8e827b0da 100644 --- a/doc/users/KathrynAndersen.mdwn +++ b/doc/users/KathrynAndersen.mdwn @@ -1,8 +1,8 @@ * aka [[rubykat]] -* Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need). * <http://kerravonsen.dreamwidth.org> -* <http://www.katspace.org> +* <http://www.katspace.org> (uses IkiWiki!) * <http://github.com/rubykat> +* Also an active [PmWiki](http://www.pmwiki.org) user, interested in having the best of both worlds. Has written the following plugins: [[!map pages="!*/Discussion and ((link(users/KathrynAndersen) or link(users/rubykat)) and plugins/*) "]] diff --git a/doc/users/KathrynAndersen/discussion.mdwn b/doc/users/KathrynAndersen/discussion.mdwn new file mode 100644 index 000000000..4f2790c39 --- /dev/null +++ b/doc/users/KathrynAndersen/discussion.mdwn @@ -0,0 +1,20 @@ +Had a look at your site. Sprawling, individualistic, using ikiwiki in lots of +ways. Makes me happy. :) I see that I have let a lot of contrib plugins +pile up. I will try to get to these. I'm particularly interested in +your use of yaml+fields. Encourage you to go ahead with any others you +have not submitted here, like pmap. (Unless it makes more sense to submit +that as a patch to the existing map plugin.) --[[Joey]] + +> Thanks. I would have put more up, but I didn't want to until they were properly documented, and other things have taken a higher priority. + +> I think pmap is probably better as a separate plugin, because it has additional dependencies (HTML::LinkList) which people might not want to have to install. + +>> One approach commonly used in ikiwiki is to make such optional features +>> be enabled by a switch somewhere, and 'eval q{use Foo}` so the module +>> does not have to be loaded unless the feature is used. --[[Joey]] + +>>> Unfortunately, HTML::LinkList isn't an optional feature for pmap; that's what it uses to create the HTML for the map. --[[KathrynAndersen]] + +> The "includepage" plugin I'm not sure whether it is worth releasing or not; it's basically a cut-down version of "inline", because the inline plugin is so complicated and has so many options, I felt more at ease to have something simpler. + +> --[[KathrynAndersen]] diff --git a/doc/users/NicolasLimare.mdwn b/doc/users/NicolasLimare.mdwn index 003449d40..56a950f7e 100644 --- a/doc/users/NicolasLimare.mdwn +++ b/doc/users/NicolasLimare.mdwn @@ -1,9 +1 @@ -Nicolas (nil) uses ikiwiki on a site/wiki/blog/something... and feels this approach much more comfortable than the usual web-only ones. - -He didn't touch any perl code before using ikiwiki, ant that was the first opportunity to propose tiny patches. - -Actualy, he would have felt much more comfortable with a python ikiwiki... :) - -Can be reached at nicolas at limare.net - -By the way, I can make translations to french if needed. And maybe to japanese. \ No newline at end of file +[[!meta redir="nil"]] diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn index f5effdbe3..1956263e0 100644 --- a/doc/users/Will.mdwn +++ b/doc/users/Will.mdwn @@ -13,14 +13,16 @@ Unless otherwise specified, any code that I post to this wiki I release under th ------ +Disabling these as I'm not using them much any more... + ### Open Bugs: -[[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]] +\[[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]] ### Open ToDos: -[[!inline pages="link(users/Will) and todo/* and !todo/done and !todo/discussion and !link(patch) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]] +\[[!inline pages="link(users/Will) and todo/* and !todo/done and !todo/discussion and !link(patch) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]] ### Unapplied Patches: -[[!inline pages="link(users/Will) and (todo/* or bugs/*) and !bugs/done and !bugs/discussion and !todo/done and !todo/discussion and link(patch) and !link(bugs/done) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]] +\[[!inline pages="link(users/Will) and (todo/* or bugs/*) and !bugs/done and !bugs/discussion and !todo/done and !todo/discussion and link(patch) and !link(bugs/done) and !link(todo/done) and !bugs/*/*" archive="yes" feeds="no" ]] diff --git a/doc/users/ivan_shmakov.mdwn b/doc/users/ivan_shmakov.mdwn new file mode 100644 index 000000000..4123e0fc6 --- /dev/null +++ b/doc/users/ivan_shmakov.mdwn @@ -0,0 +1,50 @@ +… To put it short: an Ikiwiki newbie. + +[Emacs]: http://www.gnu.org/software/emacs/ +[Lynx]: http://lynx.isc.org/ + +## Wikis + +Currently, I run a couple of Ikiwiki instances. Namely: + +* <http://lhc.am-1.org/lhc/> + — to hold random stuff written by me, my colleagues, + students, etc. + +* <http://rsdesne.am-1.org/rsdesne-2010/> + — for some of the materials related to the + “Remote Sensing in Education, Science and National + Economy” (2010-03-29 … 2010-04-10, Altai State + University) program I've recently participated in as + an instructor. + +## Preferences + +I prefer to use [Lynx][] along with [Emacs][] (via +`emacsclient`) to work with the wikis. (Note the “Local +variables” section below.) + +The things I dislike in the wiki engines are: + +* the use of home-brew specialized version control systems + — while there're a lot of much more developed general + purpose ones; + +* oversimplified syntax + — which (to some extent) precludes more sophisticated + forms of automated processing; in particular, this forces one + to reformat the material, once complete, to, say, prepare a + book, or an article, or slides. + +Out of all the wiki engines I'm familiar with, only Ikiwiki is +free of the first of these. I hope that it will support more +elaborate syntaxes eventually. + +---- + + Local variables: + mode: markdown + coding: utf-8 + fill-column: 64 + ispell-dictionary: "american" + End: diff --git a/doc/users/jeanprivat.mdwn b/doc/users/jeanprivat.mdwn new file mode 100644 index 000000000..4d75a9867 --- /dev/null +++ b/doc/users/jeanprivat.mdwn @@ -0,0 +1 @@ +Jean Privat is <jean@pryen.org>. diff --git a/doc/users/jogo.mdwn b/doc/users/jogo.mdwn index 6f87cbc45..e8068a10f 100644 --- a/doc/users/jogo.mdwn +++ b/doc/users/jogo.mdwn @@ -1,5 +1,5 @@ * An [economic game](http://sef.matabio.net/) in french, which [use](http://sef.matabio.net/wiki/) IkiWiki. - * Some [plugins](http://kimya.matabio.net/tcgi/hg/IkiPlugins/file/). - * An alternative [base wiki](http://kimya.matabio.net/tcgi/hg/FrIkiWiki/file/) in french. + * Some [plugins](http://www.matabio.net/tcgi/hg/IkiPlugins/file/). + * An alternative [base wiki](http://www.matabio.net/tcgi/hg/FrIkiWiki/file/) in french. email: `jogo matabio net`. diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn index f08076c2a..d5593dcbf 100644 --- a/doc/users/jon.mdwn +++ b/doc/users/jon.mdwn @@ -45,9 +45,14 @@ The following I have been looking at, but are on the back-burner: bugs such as [[bugs/tagged() matching wikilinks]]. Code for this lives in my github `tag2` branch: <http://github.com/jmtd/ikiwiki> -Finally, the following are merely half-formed thoughts: +Penultimately, the following are merely half-formed thoughts: * adding and removing tags to pages via the edit form by ticking and unticking checkboxes next to a tag name (rather than entering the directive into the text of the page directly) * perhaps the same for meta + +Finally, backlinks (since I have issues with the current backlinks +implementation, see [[bugs/backlinks onhover thing can go weird]]): + +[[!inline pages="link(users/Jon)" archive="yes" feeds="no"]] diff --git a/doc/users/nil.mdwn b/doc/users/nil.mdwn new file mode 100644 index 000000000..e1826cec6 --- /dev/null +++ b/doc/users/nil.mdwn @@ -0,0 +1,8 @@ +nil first used ikiwiki on a site/wiki/blog/something... and felt this approach much more comfortable than the usual web-only ones. +Since then, ikiwiki is a kind of swiss army knife when it comes to build anything for the web. + +Can be reached at nicolas at limare.net + +The current big ikiwiki-powered project is <http://www.ipol.im> + +TODO: document "how to split public/edition interfaces" diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn index 7ebd8311c..03c52b6aa 100644 --- a/doc/users/schmonz.mdwn +++ b/doc/users/schmonz.mdwn @@ -1,3 +1,3 @@ -[Amitai Schlair](http://www.columbia.edu/~ays2105/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing: +[Amitai Schlair](http://www.netbsd.org/~schmonz/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing: [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]] diff --git a/doc/users/tschwinge.mdwn b/doc/users/tschwinge.mdwn index 20d8d16a8..414612aff 100644 --- a/doc/users/tschwinge.mdwn +++ b/doc/users/tschwinge.mdwn @@ -99,12 +99,6 @@ page that uses \[[!meta redir]]. ## [[bugs/Broken Parentlinks]] -## Discussion Pages of Discussion Pages of... - -Is it useful to have Discussion pages of Discussion pages (etc.)? -- On -<http://www.gnu.org/software/hurd/hurd/building/cross-compiling/discussion.html>, -this possibility is offered. - ## Modifying [[plugins/inline]] for showing only an *appetizer* Currently ikiwiki's inline plugin will either show the full page or nothing of diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn index 6c0480cea..6e5a7261d 100644 --- a/doc/wikitemplates.mdwn +++ b/doc/wikitemplates.mdwn @@ -5,7 +5,8 @@ to learn. The aim is to keep almost all html out of ikiwiki and in the templates. It ships with some basic templates which can be customised. These are -located in /usr/share/ikiwiki/templates by default. +located in `/usr/share/ikiwiki/templates` by default; the `templatedir` +setting can be used to make another directory be searched first. * `page.tmpl` - Used for displaying all regular wiki pages. * `misc.tmpl` - Generic template used for any page that doesn't @@ -43,7 +44,8 @@ The [[plugins/pagetemplate]] plugin can allow individual pages to use a different template than `page.tmpl`. The [[plugins/template]] plugin also uses templates, though those -[[templates]] are stored in the wiki and inserted into pages. +[[templates]] are typically stored as pages in the wiki, and are inserted +into pages. The [[plugins/edittemplate]] plugin is used to make new pages default to containing text from a template, which can be filled as out the page is diff --git a/docwiki.setup b/docwiki.setup index 86f012c50..6bc200066 100644 --- a/docwiki.setup +++ b/docwiki.setup @@ -1,6 +1,18 @@ #!/usr/bin/perl # Configuration file for ikiwiki to build its documentation wiki. +# Use git during the build, if it's available and if we're building +# from a git checkout. This ensures ikiwiki gets the right mtimes and +# ctimes for files in the doc wiki. +our $rcs="norcs"; +BEGIN { + my $git=`which git 2>&1`; + chomp $git; + if (-x $git && -d ".git") { + $rcs="git"; + } +} + use IkiWiki::Setup::Standard { wikiname => "ikiwiki", srcdir => "doc", @@ -9,12 +21,15 @@ use IkiWiki::Setup::Standard { underlaydirbase => "underlays", underlaydir => "underlays/basewiki", discussion => 0, - exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/, + exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/, # save space locale => '', verbose => 1, syslog => 0, userdir => "users", usedirs => 0, prefix_directives => 1, - add_plugins => [qw{goodstuff version haiku polygen fortune}], + add_plugins => [qw{goodstuff version haiku polygen fortune table}], + disable_plugins => [qw{recentchanges}], # not appropriate for doc dir + rcs => $rcs, + gitorigin_branch => '', # don't pull during build } diff --git a/ikiwiki-calendar b/ikiwiki-calendar.in similarity index 81% rename from ikiwiki-calendar rename to ikiwiki-calendar.in index a9548d6ec..04352b970 100755 --- a/ikiwiki-calendar +++ b/ikiwiki-calendar.in @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; use IkiWiki::Setup; use Getopt::Long; @@ -14,7 +15,10 @@ GetOptions( "force" => \$force, ) || usage(); my $setup=shift || usage(); -my $pagespec=shift || "*"; +my $pagespec; +if (@ARGV && $ARGV[0] !~ /^\d+$/) { + $pagespec=shift; +} my $startyear=shift || 1900+(localtime(time))[5]; my $endyear=shift || $startyear; @@ -26,6 +30,10 @@ IkiWiki::checkconfig(); my $archivebase = 'archives'; $archivebase = $config{archivebase} if defined $config{archivebase}; +if (! defined $pagespec) { + $pagespec=$config{archive_pagespec} || "*"; +} + sub writearchive ($$;$) { my $template=template(shift); my $year=shift; @@ -54,4 +62,5 @@ foreach my $y ($startyear..$endyear) { IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef) if $config{rcs}; -system("ikiwiki", "-setup", $setup, "-refresh"); +exec("ikiwiki", "-setup", $setup, "-refresh"); +die "failed to run ikiwiki -setup $setup -refresh\n"; diff --git a/ikiwiki-transition b/ikiwiki-transition.in similarity index 99% rename from ikiwiki-transition rename to ikiwiki-transition.in index 1bebb1176..e3be645cc 100755 --- a/ikiwiki-transition +++ b/ikiwiki-transition.in @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; use HTML::Entities; diff --git a/ikiwiki.in b/ikiwiki.in index b8581d880..acd37f802 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -37,13 +37,15 @@ sub getconfig () { "syslog!" => \$config{syslog}, "rebuild!" => \$config{rebuild}, "refresh!" => \$config{refresh}, + "clean!" => \$config{clean}, "post-commit" => \$config{post_commit}, "render=s" => \$config{render}, "wrappers!" => \$config{genwrappers}, "wrappergroup=s" => \$config{wrappergroup}, "usedirs!" => \$config{usedirs}, "prefix-directives!" => \$config{prefix_directives}, - "getctime" => \$config{getctime}, + "getctime" => \$config{gettime}, + "gettime!" => \$config{gettime}, "numbacklinks=i" => \$config{numbacklinks}, "rcs=s" => \$config{rcs}, "no-rcs" => sub { $config{rcs}="" }, @@ -64,6 +66,9 @@ sub getconfig () { "exclude=s@" => sub { push @{$config{wiki_file_prune_regexps}}, $_[1]; }, + "include=s@" => sub { + $config{include}=defined $config{include} && length $config{include} ? "$config{include}|$_[1]" : $_[1]; + }, "adminuser=s@" => sub { push @{$config{adminuser}}, $_[1] }, @@ -92,6 +97,17 @@ sub getconfig () { } $config{$var}=$val; }, + "set-yaml=s" => sub { + my ($var, $val)=split('=', $_[1], 2); + if (! defined $var || ! defined $val) { + die gettext("usage: --set-yaml var=value"), "\n"; + } + eval q{use YAML::Any}; + eval q{use YAML} if $@; + die $@ if $@; + eval q{$YAML::Syck::ImplicitUnicode=1}; + $config{$var}=Load($val."\n"); + }, "version" => sub { print "ikiwiki version $IkiWiki::version\n"; exit; @@ -135,6 +151,7 @@ sub main () { if (@{$config{wrappers}} && ! $config{render} && ! $config{dumpsetup} && + ! $config{clean} && ((! $config{refresh} && ! $config{post_commit}) || $config{genwrappers})) { debug(gettext("generating wrappers..")); @@ -159,7 +176,7 @@ sub main () { # setup implies a wiki rebuild by default if (! $config{refresh} && ! $config{render} && - ! $config{post_commit}) { + ! $config{post_commit} && ! $config{clean}) { $config{rebuild}=1; } } @@ -190,6 +207,14 @@ sub main () { elsif ($config{post_commit} && ! commit_hook_enabled()) { # do nothing } + elsif ($config{clean}) { + require IkiWiki::Render; + foreach my $wrapper (@{$config{wrappers}}) { + prune($wrapper->{wrapper}); + } + clean_rendered(); + system("rm", "-rf", $config{wikistatedir}); + } else { if ($config{rebuild}) { debug(gettext("rebuilding wiki..")); diff --git a/ikiwiki.spec b/ikiwiki.spec index 044c7c033..fb7971b27 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100122 +Version: 3.20100403 Release: 1%{?dist} Summary: A wiki compiler diff --git a/mdwn2man b/mdwn2man index e4ba5aadf..090174534 100755 --- a/mdwn2man +++ b/mdwn2man @@ -9,7 +9,7 @@ print ".TH $prog $section\n"; while (<>) { s{(\\?)\[\[([^\s\|\]]+)(\|[^\s\]]+)?\]\]}{$1 ? "[[$2]]" : $2}eg; s/\`//g; - s/^\./\\&./g; + s/^\s*\./\\&./g; if (/^#\s/) { s/^#\s/.SH /; <>; # blank; diff --git a/plugins/rst b/plugins/rst index 9f64b33a0..838667507 100755 --- a/plugins/rst +++ b/plugins/rst @@ -33,7 +33,7 @@ def _to_dict(args): return dict((k, v) for k, v in zip(*[iter(args)]*2)) def getsetup(proxy, *kwargs): - return 'plugin', { 'safe' : 1, 'rebuild' : 1 } + return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' } import sys def debug(s): diff --git a/po/bg.po b/po/bg.po index 810a16e95..5585a10d6 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Грешка" @@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "готово" @@ -146,35 +146,35 @@ msgstr "готово" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -182,7 +182,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -197,12 +197,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -210,7 +210,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -246,7 +246,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -258,137 +258,147 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,116 +408,116 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Когато се използва „--rss” или „--atom” трябва да се укаже и " "местоположението на уикито посредством параметъра „--url”" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Огледала" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Огледало" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -515,19 +525,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "функцията „getctime” не е реализирана" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Получаване на OpenID номер" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." @@ -536,31 +546,39 @@ msgstr "Всички страници имат връзки от други ст msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Акаунтът е създаден. Можете да влезете." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Грешка при създаване на акаунта." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -591,119 +609,119 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "гласуване" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Общо гласове:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -771,12 +789,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -784,83 +802,83 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -875,21 +893,21 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "препратката няма указани параметрите „name” или „url”" @@ -897,7 +915,7 @@ msgstr "препратката няма указани параметрите #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "препратката „%s” сочи към „%s”" @@ -907,121 +925,123 @@ msgstr "препратката „%s” сочи към „%s”" msgid "failed to parse any smileys" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 #, fuzzy msgid "failed to process:" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1083,32 +1103,42 @@ msgstr "обновяване на страницата „%s”, зависещ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "грешка при четене на „%s”: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "крешка при компилиране на файла %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1127,13 +1157,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1146,19 +1176,23 @@ msgstr "формат: ikiwiki [опции] източник местоназна msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "генериране на обвивки..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." @@ -1166,40 +1200,40 @@ msgstr "осъвременяване на уики..." msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 399111069..0b45bb97a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoÅ¡těni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Chyba" @@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "hotovo" @@ -145,32 +145,32 @@ msgstr "hotovo" msgid "Must specify %s" msgstr "Musíte zadat %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Nepodařilo se vytvořit S3 bucket:" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Nepodařilo se uložit soubor na S3:" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Nelze smazat soubor z S3:" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "stránka nazvaná %s již existuje" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "zakázáno proměnnou allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "chybné jméno souboru s přílohou" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "příloha nahrána" @@ -178,7 +178,7 @@ msgstr "příloha nahrána" msgid "automatic index generation" msgstr "automatické vytváření indexu" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -195,12 +195,12 @@ msgstr "%s z %s" msgid "There are no broken links!" msgstr "Žádné poruÅ¡ené odkazy!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "komentář musí mít obsah" @@ -208,7 +208,7 @@ msgstr "komentář musí mít obsah" msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "chybný název stránky" @@ -244,7 +244,7 @@ msgstr "Přidán komentář" msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" @@ -256,131 +256,142 @@ msgstr "Schvalování komentářů" msgid "comment moderation" msgstr "schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Komentáře" +msgstr[1] "Komentáře" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Komentáře" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametr %s je povinný" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "na této stránce nebyl zkopírován žádný text" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "na této stránce nebyl zkopírován žádný text s id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "odstraňuji starý náhled %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "nebyl zadán parametr template" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "nepodařilo se zpracovat" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "musíte zadat formát a text" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune selhal" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "chybějící stránka" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Stránka %s neexistuje." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "není stránkou" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" @@ -389,105 +400,105 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick není nainstalován" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být Å xV)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "úprava stránky není povolena" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "chybí parametr pages" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "parametry %s a %s nelze použít zároveň" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "neexistující Å¡ablona %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "Stránka %s je zamknutá a nelze ji měnit" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Zrcadla" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Zrcadlo" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 #, fuzzy msgid "comment needs moderation" msgstr "schvalování komentářů" @@ -496,19 +507,19 @@ msgstr "schvalování komentářů" msgid "more" msgstr "více" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime není implementováno" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Přihlásit pomocí" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Získat OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." @@ -516,31 +527,39 @@ msgstr "Na každou stránku vede odkaz z jiné stránky." msgid "bad or missing template" msgstr "chybná nebo chybějící Å¡ablona" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Chyba při vytváření účtu." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Nepodařilo se odeslat email." -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Postup na resetování hesla vám byl odeslán na e-mail." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "chybné URL pro resetování hesla" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "resetování hesla bylo zamítnuto" @@ -570,40 +589,40 @@ msgstr "LWP nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji vÅ¡echny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -611,7 +630,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -619,76 +638,76 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraÅ¥te na předchozí " "stránku" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "hlasovat" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Celkem hlasů:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen není nainstalován" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "příkaz selhal" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "chybí vzorec" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "neznámý vzorec" @@ -756,12 +775,12 @@ msgstr "o půlnoci" msgid "at noon on %A" msgstr "%A o poledni" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "neplatná procentuální hodnota %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" @@ -769,81 +788,81 @@ msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" msgid "(Diff truncated)" msgstr "(Diff oříznut)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s neexistuje" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s není souborem" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "potvrďte odstranění %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "odstraněno" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "jméno souboru nebylo změněno" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "neplatné jméno" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s již existuje" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s již na disku existuje" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "přejmenování %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Také přejmenovat podstránky a přílohy" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Najednou lze přejmenovat pouze jednu přílohu." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Vyberte přílohu, kterou chcete přejmenovat." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -858,28 +877,28 @@ msgstr "nepodařilo se přečíst %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "pro indexování %s je potřeba Digest::SHA1" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "hledání" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "Modul shortcut nebude pracovat bez %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "chybí parametr jméno nebo url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "zkratka %s odkazuje na <i>%s</i>" @@ -888,107 +907,109 @@ msgstr "zkratka %s odkazuje na <i>%s</i>" msgid "failed to parse any smileys" msgstr "nepodařilo se rozpoznat žádné smajlíky" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "chyba syntaktického rozboru" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "chybný průměr zvýrazněného bodu" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "chybné umístění zvýrazněného bodu" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "chybná výška" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "chybí parametr šířka (width)" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "chybná šířka" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "nepodařilo se spustit php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "nemohu najít soubor" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "neznámý formát dat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "prázdná data" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Stáhnout zdrojová data" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "zpracovávání selhalo na řádku %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "chybí parametr id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "Å¡ablona %s nebyla nalezena" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "chybí TeXový kód" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "z kódu se nepodařilo vygenerovat obrázek" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "modul" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "moduly" + +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "moduly" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -996,7 +1017,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1062,32 +1083,42 @@ msgstr "sestavuji %s, která závisí na %s" msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "nemohu číst %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "nemohu číst %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "nepodařilo se aktualizovat %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "nepodporovaný systém pro správu verzí: %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" @@ -1106,13 +1137,13 @@ msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1125,19 +1156,24 @@ msgstr "použití: ikiwiki [volby] zdroj cíl" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup konfigurační.soubor" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "použití: --set proměnná=hodnota" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "generuji obaly..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "obnovuji wiki..." @@ -1145,38 +1181,38 @@ msgstr "obnovuji wiki..." msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index 4bff9254c..be7a95e6a 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Fejl" @@ -140,7 +140,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "færdig" @@ -149,35 +149,35 @@ msgstr "færdig" msgid "Must specify %s" msgstr "Skal angive %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Oprettelse af bundt i S3 mislykkedes: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Arkivering af fil i S3 mislykkedes: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "Sletning af fil fra S3 mislykkedes: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "der er allerede en side ved navn %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "dÃ¥rligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "vedhæftningsoplægning" @@ -185,7 +185,7 @@ msgstr "vedhæftningsoplægning" msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -202,12 +202,12 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "kommentar skal have indhold" @@ -215,7 +215,7 @@ msgstr "kommentar skal have indhold" msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dÃ¥rligt sidenavn" @@ -251,7 +251,7 @@ msgstr "Tilføjede en kommentar" msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "du er ikke logget pÃ¥ som en administrator" @@ -263,132 +263,143 @@ msgstr "Kommentarmoderering" msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Kommentarer" +msgstr[1] "Kommentarer" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Kommentarer" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametren %s er krævet" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "ingen tekst blev kopieret i denne side" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "ingen tekst blev kopieret i denne side med id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "fjerner gammelt smugkig %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "skabelon %s ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "dannelsen mislykkedes" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "skal angive format og tekst" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "spÃ¥dom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "kan ikke fÃ¥ sider til at passe sammen: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke pÃ¥virke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s nÃ¥r udvidelsen %s bruges" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -400,107 +411,107 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "læsning af %s mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Skal angive url til wiki med --url nÃ¥r --rss eller --atom anvendes" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "sideredigering er ikke tilladt" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s er lÃ¥st og kan ikke redigeres" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Spejle" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spejl" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 #, fuzzy msgid "comment needs moderation" msgstr "kommentarkoderering" @@ -509,19 +520,19 @@ msgstr "kommentarkoderering" msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime ikke implementeret" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Log pÃ¥ med" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Skaf en OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Alle sider har henvisninger fra andre sider." @@ -529,32 +540,40 @@ msgstr "Alle sider har henvisninger fra andre sider." msgid "bad or missing template" msgstr "dÃ¥rlig eller manglende skabelon" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Konto korrekt oprettet. Nu kan du logge pÃ¥." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Fejl ved kontooprettelse." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Ingen emailadresse, sÃ¥ kan ikke sende adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Afsendelse af mail mislykkedes" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Du har fÃ¥et tilsendt adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "Ukorrekt adgangskodenumstillings-URL" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "adgangskodenulstilling afvist" @@ -584,12 +603,12 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -597,7 +616,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -605,21 +624,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -627,7 +646,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, sÃ¥ fjernes dens " "oversættelser ogsÃ¥." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -635,75 +654,75 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, sÃ¥ omdøbes dens " "oversættelser ogsÃ¥." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gÃ¥ tilbage til forrige side og fortsæt redigering" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "stem" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Samlede stemmer:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen ikke installeret" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "kommando fejlede" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "manglende formular" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "ukendt formular" @@ -771,12 +790,12 @@ msgstr "ved midnat" msgid "at noon on %A" msgstr "midt pÃ¥ dagen %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "ugyldig procentværdi %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" @@ -784,81 +803,81 @@ msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" msgid "(Diff truncated)" msgstr "(Diff trunkeret)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s eksisterer ikke" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s er ikke i srcdir, sÃ¥ kan ikke blive slettet" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s er ikke en fil" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "bekræft at %s bliver fjernet" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "fjernet" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s er ikke i srcdir, sÃ¥ kan ikke blive omdøbt" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "ingen ændring til filnavnet blev angivet" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "ugyldigt navn" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s eksisterer allerede" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s eksisterer allerede pÃ¥ disken" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "omdøb %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Omdøb ogsÃ¥ UnderSider og vedhæftninger" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Kun en vedhæftning kan blive omdøbt ad gangen." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Vælg vedhæftningen som skal omdøbes." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -873,28 +892,28 @@ msgstr "læsning af %s mislykkedes" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "søg" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "genvejsudvidelsen vil ikke fungere uden %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "manglende navn eller url parameter" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "genvej %s viser til <i>%s</i>" @@ -903,109 +922,111 @@ msgstr "genvej %s viser til <i>%s</i>" msgid "failed to parse any smileys" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "afkodningsfejl" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "forkert featurepoint-parameter diameter" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "forkert featurepoint-parameter location" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "manglende værdier" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "forkert højdeværdi" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "manglende breddeparameter" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "forkert breddeværdi" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "php-kørsel mislykkedes" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "kan ikke finde fil" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "ukendt dataformat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "blanke data" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Direkte datanedlastning" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "afkodningsfejl pÃ¥ linje %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "manglende id-parameter" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "dannelsen mislykkedes:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "manglende tex-kode" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "udvidelse" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "udvidelser" + +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "udvidelser" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1013,7 +1034,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1077,32 +1098,42 @@ msgstr "danner %s, som afhænger af %s" msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "kan ikke læse %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "kan ikke læse %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "opdatering af %s mislykkedes" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "revisionskontrolsystem %s ikke understøttet" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" @@ -1121,13 +1152,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1140,19 +1171,24 @@ msgstr "brug: ikiwiki [valg] kilde mÃ¥l" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "brug: --set var=værdi" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "bygger wrappers.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1160,39 +1196,39 @@ msgstr "genopfrisker wiki..." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url nÃ¥r der bruges --cgi" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet pÃ¥ %s ved dybde %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke fÃ¥ sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index 53d0db850..e5a18d47b 100644 --- a/po/de.po +++ b/po/de.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" -"PO-Revision-Date: 2009-07-23 01:07+0100\n" -"Last-Translator: Kurt Gramlich <kurt@skolelinux.de>\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" +"PO-Revision-Date: 2010-03-14 16:09+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Fehler" @@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "fertig" @@ -146,35 +146,33 @@ msgstr "fertig" msgid "Must specify %s" msgstr "%s muss angegeben werden" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Konnte die Datei nicht in S3 speichern: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Konnte die Datei nicht in S3 löschen: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "eine Seite mit dem Namen %s existiert bereits" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "durch allowed_attachements verboten" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "fehlerhafter Dateiname für Anhang" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "Anhang hochladen" @@ -182,7 +180,7 @@ msgstr "Anhang hochladen" msgid "automatic index generation" msgstr "automatische Index-Erstellung" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -199,12 +197,12 @@ msgstr "%s von %s" msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "ein Kommentar sollte Inhalt haben" @@ -212,7 +210,7 @@ msgstr "ein Kommentar sollte Inhalt haben" msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "fehlerhafter Seitenname" @@ -249,7 +247,7 @@ msgstr "Kommentar hinzugefügt" msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" @@ -261,132 +259,141 @@ msgstr "Kommentar-Moderation" msgid "comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" -msgstr "Kommentare" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "%i Kommentar" +msgstr[1] "%i Kommentare" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" +msgstr "Kommentieren" + +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "der Parameter %s wird benötigt" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "es wurde kein Text in diese Seite kopiert" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "es wurde kein Text in diese Seite mit der id %s kopiert" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "entferne alte Vorschau %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "bearbeite %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "Vorlage nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "Ablauf fehlgeschlagen" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "Format und Text müssen spezifiziert werden" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune fehlgeschlagen" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." -#: ../IkiWiki/Plugin/getsource.pm:74 -#, fuzzy +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" -msgstr "Kann die Seiten nicht zuordnen: %s" +msgstr "Keine Seite" -#: ../IkiWiki/Plugin/getsource.pm:76 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/getsource.pm:77 +#, perl-format msgid "%s is an attachment, not a page." -msgstr "Seite %s kann nicht bearbeitet werden" +msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -394,170 +401,175 @@ msgstr "" "through" #: ../IkiWiki/Plugin/htmltidy.pm:50 -#, fuzzy msgid "htmltidy failed to parse this html" -msgstr "Smileys konnten nicht ausgewertet werden" +msgstr "htmltidy konnte dieses HTML nicht auswerten" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Die URL zum Wiki muss mit --url angegeben werden, wenn --rss oder --atom " "genutzt wird" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "bearbeiten der Seiten nicht erlaubt" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" -msgstr "" +msgstr "die Parameter %s und %s können nicht zusammen benutzt werden" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" -msgstr "" +msgstr "Verknüpfungskarte" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s ist gesperrt und kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht " "installiert" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Spiegel" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spiegel" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 -#, fuzzy +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" -msgstr "Kommentar-Moderation" +msgstr "Kommentar muss moderiert werden" #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "mehr" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime ist nicht implementiert" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Anmelden mit" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Eine OpenID anfordern" -#: ../IkiWiki/Plugin/orphans.pm:55 -#, fuzzy +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." -msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." +msgstr "Alle Seiten haben mindestens einen Verweis von einer anderen Seite." #: ../IkiWiki/Plugin/pagetemplate.pm:30 msgid "bad or missing template" msgstr "fehlerhafte oder fehlende Vorlage" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "Ihre Benutzerseite: " + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "Benutzerseite erstellen" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Konto konnte nicht erstellt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "es gibt keine E-Mail Adresse, deshalb kann keine Anweisung zum Zurücksetzen " "des Passwortes zugeschickt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Es konnte keine E-Mail versandt werden" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "fehlerhafte URL zum Zurücksetzen des Passworts" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "zurücksetzen des Passworts abgelehnt" @@ -585,14 +597,14 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." -msgstr "" +msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -600,7 +612,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -608,21 +620,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -630,7 +642,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -638,76 +650,76 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:884 -#, fuzzy, perl-format +#: ../IkiWiki/Plugin/po.pm:885 +#, perl-format msgid "failed to copy underlay PO file to %s" -msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" +msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " "arbeiten" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "abstimmen" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Alle Stimmen:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen ist nicht installiert" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "Befehl fehlgeschlagen" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "fehlende Formel" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "unbekannte Formel" @@ -775,12 +787,12 @@ msgstr "um Mitternacht" msgid "at noon on %A" msgstr "am Nachmittag des %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "unzulässiger Prozentwert %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " @@ -790,117 +802,117 @@ msgstr "" msgid "(Diff truncated)" msgstr "(Diff wurde gekürzt)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s existiert nicht" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s ist keine Datei" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "bestätigen Sie die Entfernung von %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "entfernt" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s ist nicht im srcdir und kann deshalb nicht umbenannt werden" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "es wurde keine Änderung des Dateinamens angegeben" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "unzulässiger Name" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s existiert bereits" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s existiert bereits auf der Festplatte" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "benenne %s um" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" #: ../IkiWiki/Plugin/rsync.pm:37 -#, fuzzy, perl-format +#, perl-format msgid "failed to execute rsync_command: %s" -msgstr "lesen von %s fehlgeschlagen" +msgstr "konnte das rsync_command nicht ausführen: %s" #: ../IkiWiki/Plugin/rsync.pm:40 #, perl-format msgid "rsync_command exited %d" -msgstr "" +msgstr "rsync_command gibt Fehler %d zurück" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "suchen" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "fehlender Name oder URL-Parameter" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "Tastenkürzel %s verweist nach <i>%s</i>" @@ -909,109 +921,111 @@ msgstr "Tastenkürzel %s verweist nach <i>%s</i>" msgid "failed to parse any smileys" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "Auswertungsfehler" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "ungültiger featurepoint diameter" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "ungültige featurepoint location" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "fehlende Werte" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "ungültige Wert für height" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "fehlender Parameter für width" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "ungültige Wert für width" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "konnte PHP nicht ausführen" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "konnte Datei nicht finden" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "unbekanntes Datenformat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "keine Daten" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Direkter Daten-Download" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "Auswertungsfehler in Zeile %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "fehlender Parameter id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "Vorlage %s nicht gefunden" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "fehlender TeX-Code" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" -msgstr "Erweiterung" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "%s-Erweiterung:" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "%s-Erweiterungen" + +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "Erweiterungen" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1019,7 +1033,7 @@ msgstr "" "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1086,33 +1100,43 @@ msgstr "erzeuge %s, die von %s abhängt" msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "kann %s nicht lesen: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "kann %s nicht lesen: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "aktualisieren von %s fehlgeschlagen" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "nicht unterstütztes Versionskontrollsystem %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1133,13 +1157,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1152,19 +1176,24 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup Konfigurationsdatei" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "Aufruf: --set Variable=Wert" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "erzeuge Wrapper.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." @@ -1172,41 +1201,41 @@ msgstr "aktualisiere Wiki.." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index de85edbdf..413572866 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral <victor@taquiones.net>\n" "Language-Team: <en@li.org>\n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Error" @@ -142,7 +142,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "completado" @@ -151,35 +151,35 @@ msgstr "completado" msgid "Must specify %s" msgstr "Debe especificar %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Creación de directorio en S3 fallida: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "No puedo guardar el archivo en S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "No puedo borrar archivo en S3: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "ya existe una página de nombre %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "prohibido por la claúsula allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "enviado el adjunto" @@ -187,7 +187,7 @@ msgstr "enviado el adjunto" msgid "automatic index generation" msgstr "creación de índice automática" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -204,12 +204,12 @@ msgstr "%s desde la página %s" msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "Un comentario debe tener algún contenido" @@ -217,7 +217,7 @@ msgstr "Un comentario debe tener algún contenido" msgid "Anonymous" msgstr "Anónimo" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nombre de página erróneo" @@ -253,7 +253,7 @@ msgstr "Añadir un comentario" msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" @@ -265,132 +265,143 @@ msgstr "Aprobación de comentarios" msgid "comment moderation" msgstr "aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Comentarios" +msgstr[1] "Comentarios" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Comentarios" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "el parámetro %s es obligatorio" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "no se ha copiado ningún texto en esta página" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "eliminando la antigua previsualización %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "falta indicar la plantilla (template)" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "fallo en el proceso" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "se deben especificar tanto el formato como el texto" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "el programa fortune ha fallado" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "no encuentro páginas coincidentes: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -402,109 +413,109 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó " "--atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "no está permitida la modificación de páginas" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "La página %s está bloqueada y no puede modificarse" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar " "el programa /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Réplicas" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Réplica" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 #, fuzzy msgid "comment needs moderation" msgstr "aprobación de comentarios" @@ -513,19 +524,19 @@ msgstr "aprobación de comentarios" msgid "more" msgstr "ver más" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "la funcionalidad getctime no está incluida" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Identificarse mediante " -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Consiga un identificador OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Todas las páginas están referenciadas entre sí." @@ -534,35 +545,43 @@ msgstr "Todas las páginas están referenciadas entre sí." msgid "bad or missing template" msgstr "plantilla errónea ó no existente" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Error creando la cuenta de usuario." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "No tengo dirección de correo electrónica, así que no puedo enviar " "instrucciones para reiniciar la contraseña" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "No he podido enviar el mensaje de correo electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Las instrucciones para reiniciar la contraseña se le han enviado por correo " "electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "el url para reiniciar la contraseña es incorrecto" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "reinicio de contraseña denegado" @@ -592,118 +611,118 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Votar" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Recuento de votos:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "El complemento polygen no ha sido instalado" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "la ejecución del programa ha fallado" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "falta la fórmula" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "fórmula desconocida " @@ -771,12 +790,12 @@ msgstr "a medianoche" msgid "at noon on %A" msgstr "el %A a media tarde" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "%s es un valor erróneo para un porcentaje" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" @@ -784,81 +803,81 @@ msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" msgid "(Diff truncated)" msgstr "(Lista de diferencias truncada)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "borrado" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "no se ha indicado cambio alguno en el nombre del archivo" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "nombre no válido" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s ya existe" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s ya existe en el disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "cambiando de nombre %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -873,28 +892,28 @@ msgstr "no puedo leer de %s: %s " msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "se necesita la instalación de Digest::SHA1 para indexar %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "buscar" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "el complemento shortcut no funcionará si no existe la página %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "El atajo %s apunta a <i>%s</i>" @@ -903,113 +922,115 @@ msgstr "El atajo %s apunta a <i>%s</i>" msgid "failed to parse any smileys" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "error de análisis " -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "diámetro inválido " -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "localización errónea " -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "faltan valores" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "valor incorrecto para la altura" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "falta el parámetro que indica el ancho" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "valor incorrecto para el ancho" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "error fatal invocando el programa php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "no puedo encontrar el archivo" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "formato de datos desconocido" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "sin datos" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Enlace directo para descarga" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "error de análisis en la línea %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "falta el parámetro \"id\"" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "no he encontrado la plantilla %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "falta el código tex" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "complemento" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "complementos" + +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "complementos" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1038,7 @@ msgstr "" "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1085,32 +1106,42 @@ msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "no puedo leer el archivo %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "no puedo leer el archivo %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "ha fallado la compilación del programa %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "el sistema de control de versiones %s no está soportado" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1131,13 +1162,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "ha fallado la compilación del programa %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1150,19 +1181,24 @@ msgstr "uso: ikiwiki [opciones] origen destino" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup archivo_de_configuración" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "uso: --set variable=valor" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "generando programas auxiliares.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "actualizando el wiki.." @@ -1170,44 +1206,44 @@ msgstr "actualizando el wiki.." msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 5ba71d6cf..6be9482ce 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Erreur" @@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "Terminé" @@ -147,32 +147,32 @@ msgstr "Terminé" msgid "Must specify %s" msgstr "Vous devez spécifier %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Impossible de créer un compartiment S3 :" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Échec lors de la suppression du fichier sur S3 :" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "Il existe déjà une page nommée %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "Action interdite par allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "Envoi de la pièce jointe" @@ -180,7 +180,7 @@ msgstr "Envoi de la pièce jointe" msgid "automatic index generation" msgstr "Génération de l'index automatique" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -197,12 +197,12 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." @@ -210,7 +210,7 @@ msgstr "Un commentaire doit avoir un contenu." msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "Nom de page incorrect" @@ -246,7 +246,7 @@ msgstr "Commentaire ajouté" msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" @@ -258,131 +258,142 @@ msgstr "Modération du commentaire" msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Commentaires" +msgstr[1] "Commentaires" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Commentaires" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "Le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "Aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "Suppression de l'ancienne prévisualisation %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "modèle (« template ») non indiqué" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "Échec du traitement" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "le format et le texte doivent être indiqués" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "Échec du lancement de « fortune »" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "Ce n'est pas une page." -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -394,108 +405,108 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss " "ou --atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "Modification de page interdite" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s est verrouillé et ne peut être modifié" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Miroirs" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Miroir" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 #, fuzzy msgid "comment needs moderation" msgstr "modération du commentaire" @@ -504,19 +515,19 @@ msgstr "modération du commentaire" msgid "more" msgstr "lire la suite" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime n'est pas implémenté" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "S'identifier en tant que" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -524,35 +535,43 @@ msgstr "Toutes les pages sont liées à d'autres pages." msgid "bad or missing template" msgstr "Modèle de page incorrect ou manquant" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Erreur lors de la création du compte." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Aucune adresse indiquée. Impossible d'envoyer les instructions pour " "réinitialiser le mot de passe." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Impossible d'envoyer un courriel" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Vous avez reçu un message contenant les instructions pour réinitialiser le " "mot de passe" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "Adresse pour la réinitialisation du mot de passe incorrecte" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "réinitialisation du mot de passe refusée" @@ -584,12 +603,12 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -597,7 +616,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -605,23 +624,23 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -629,7 +648,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -637,76 +656,76 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " "des modifications." -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Voter" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Total des suffrages :" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen n'est pas installé" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "Échec de la commande" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "formule manquante" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "formule inconnue" @@ -774,12 +793,12 @@ msgstr "à minuit" msgid "at noon on %A" msgstr "%A, à midi" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "pourcentage %s illégal" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire." @@ -788,81 +807,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s n'existe pas" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "supprimé" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s n'est pas dans srcdir. Impossible de le renommer" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "Aucun changement dans le nom du fichier n'a été spécifié" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "Appellation interdite" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s existe déjà" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -877,28 +896,28 @@ msgstr "Impossible de lire %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "recherche" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "Il manque le paramètre nom ou URL." #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "Le raccourci %s pointe vers <i>%s</i>" @@ -907,109 +926,111 @@ msgstr "Le raccourci %s pointe vers <i>%s</i>" msgid "failed to parse any smileys" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "Erreur d'analyse" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "Diamètre du point incorrect" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "Emplacement du point incorrect" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "Il manque des valeurs" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "Hauteur incorrecte" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "Le paramètre largeur manque" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "Largeur incorrecte" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "Échec du lancement de php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "Fichier introuvable" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "Format de données inconnu" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "Pas de données" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Téléchargement direct des données" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "Modèle de page %s introuvable" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "Échec du traitement :" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "greffon" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "Greffons" + +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "Greffons" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1038,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1082,34 +1103,44 @@ msgstr "Reconstruction de %s, qui dépend de %s" msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "Lecture impossible de %s : %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "Impossible de mettre à jour %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1131,13 +1162,13 @@ msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1150,19 +1181,24 @@ msgstr "Syntaxe : ikiwiki [options] source destination" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup fichier de configuration" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "Syntaxe : -- set var=valeur" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." @@ -1170,39 +1206,39 @@ msgstr "Rafraîchissement du wiki..." msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff --git a/po/gu.po b/po/gu.po index 83afdef4c..d4bfd42c0 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n" "Language-Team: Gujarati <team@utkarsh.org>\n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "ક્ષતિ" @@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "સંપૂર્ણ" @@ -144,35 +144,35 @@ msgstr "સંપૂર્ણ" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -180,7 +180,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -195,12 +195,12 @@ msgstr "" msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -208,7 +208,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -244,7 +244,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -256,136 +256,146 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -395,109 +405,109 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "મિરરો" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "મિરર" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -505,19 +515,19 @@ msgstr "" msgid "more" msgstr "વધુ" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime અમલમાં મૂકાયેલ નથી" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." @@ -526,31 +536,39 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "ખાતું બનાવવામાં ક્ષતિ." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -581,119 +599,119 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "મત" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "કુલ મત:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "ખોવાયેલ સૂત્ર" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "અજાણ્યું સૂત્ર" @@ -762,12 +780,12 @@ msgstr "મધ્યરાત્રે" msgid "at noon on %A" msgstr "બપોરે %A પર" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -775,82 +793,82 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, fuzzy, perl-format msgid "%s is not a file" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -865,28 +883,28 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિકલ્પ" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દેશ કરે છે" @@ -895,119 +913,121 @@ msgstr "ટુંકોરસ્તો %s એ <i>%s</i> નો નિર્દ msgid "failed to parse any smileys" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "ઉકેલવામાં ક્ષતિ" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "ખરાબ લાક્ષણિકબિંદુ વ્યાસ" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "ખરાબ લાક્ષણિકબિંદુ સ્થિતિ" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "ખરાબ ઉંચાઇ કિંમત" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "ખોવાયેલ પહોળાઇ વિકલ્પ" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "ખરાબ પહોળાઇ કિંમત" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "php ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "ફાઇલ મળી શકી નહી" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "અજાણ્યો માહિતી પ્રકાર" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "ખાલી માહિતી" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "સીધી માહિતી ડાઉનલોડ" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 #, fuzzy msgid "missing tex code" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1069,32 +1089,42 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "વાંચી શકાતી નથી %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1113,13 +1143,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1132,19 +1162,23 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "આવરણ બનાવે છે.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." @@ -1152,38 +1186,38 @@ msgstr "વીકીને તાજી કરે છે.." msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index f4749b841..c2f4e24a9 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,13 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\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=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." @@ -54,7 +55,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "" @@ -135,7 +136,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "" @@ -144,32 +145,32 @@ msgstr "" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -177,7 +178,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -192,12 +193,12 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -205,7 +206,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -241,7 +242,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -253,131 +254,141 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -386,104 +397,104 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -491,19 +502,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "" @@ -511,31 +522,39 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -565,117 +584,117 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -743,12 +762,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -756,81 +775,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -845,28 +864,28 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "" @@ -875,113 +894,115 @@ msgstr "" msgid "failed to parse any smileys" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1043,32 +1064,42 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, perl-format +msgid "cannot load %s in safe mode" +msgstr "" + +#: ../IkiWiki/Setup.pm:46 +#, perl-format +msgid "failed to parse %s" +msgstr "" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1087,13 +1118,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1106,19 +1137,23 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "" @@ -1126,38 +1161,38 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 3b0f45348..b1b3dbd55 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno <lucab@debian.org>\n" "Language-Team: Italian TP <tp@lists.linux.it>\n" @@ -53,7 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Errore" @@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "fatto" @@ -144,32 +144,32 @@ msgstr "fatto" msgid "Must specify %s" msgstr "Occorre specificare %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Impossibile creare il contenitore S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Impossibile salvare il file sul S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Impossibile eliminare il file dal S3: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "esiste già una pagina chiamata %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "non permesso da allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "nome file dell'allegato non valido" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "carica allegato" @@ -177,7 +177,7 @@ msgstr "carica allegato" msgid "automatic index generation" msgstr "generazione automatica dell'indice" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -194,12 +194,12 @@ msgstr "%s da %s" msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "i commenti devono avere un contenuto" @@ -207,7 +207,7 @@ msgstr "i commenti devono avere un contenuto" msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nome pagina non valido" @@ -243,7 +243,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -255,131 +255,142 @@ msgstr "Moderazione commenti" msgid "comment moderation" msgstr "moderazione commento" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Commenti" +msgstr[1] "Commenti" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Commenti" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametro %s necessario" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "nessun testo è stato copiato in questa pagina" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "nessun testo è stato copiato in questa pagina con l'id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "rimozione vecchia anteprima %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s non è una pagina modificabile" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "modifica %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "modello non specificato" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "errore nell'elaborazione" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "occorre specificare formato e testo" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "non è una pagina" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "errore nell'eseguire graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -390,107 +401,107 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "modifica della pagina non ammessa" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "parametro pagine mancante" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "i parametri %s e %s non possono essere usati insieme" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "impossibile eseguire dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s è bloccata e non può essere modificata" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Mirror" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Mirror" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 #, fuzzy msgid "comment needs moderation" msgstr "moderazione commento" @@ -499,19 +510,19 @@ msgstr "moderazione commento" msgid "more" msgstr "altro" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime non implementata" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Accedi tramite" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Ottieni un OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." @@ -519,34 +530,42 @@ msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." msgid "bad or missing template" msgstr "modello errato o mancante" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Account creato con successo. È ora possibile effettuare l'accesso." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Errore nella creazione dell'account." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Nessun indirizzo email, impossibile inviare per email le istruzioni per " "reimpostare la password." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Impossibile spedire il messaggio" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Il messaggio con le istruzioni per reimpostare la password è stato inviato." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "url per il reset della password non corretto" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "reset della password non permesso" @@ -578,19 +597,19 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -598,21 +617,21 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -620,7 +639,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -628,76 +647,76 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " "modifiche" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "voto" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Voti totali:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen non è installato" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "errore nel comando" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "formula mancante" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "formula sconosciuta" @@ -765,12 +784,12 @@ msgstr "a mezzanotte" msgid "at noon on %A" msgstr "%A a mezzogiorno" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "valore percentuale %s non ammesso" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " @@ -780,81 +799,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "(Diff troncato)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s non esiste" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s non è in src, quindi non può essere eliminato" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s non è un file" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "conferma rimozione di %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "rimosso" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s non è in src, quindi non può essere rinominato" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "non è stata specificata nessuna modifica al nome del file" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "nome non valido" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s esiste già" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s già presente su disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "rinomina di %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Rinomina anche SottoPagine e allegati" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Si può rinominare un solo allegato alla volta." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Selezionare l'allegato da rinominare." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -869,28 +888,28 @@ msgstr "impossibile leggere %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "è necessario Digest::SHA1 per l'indice di %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "cerca" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "il plugin scorciatoia non può funzionare senza %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "parametro nome o url mancante" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "la scorciatoia %s punta a <i>%s</i>" @@ -899,109 +918,111 @@ msgstr "la scorciatoia %s punta a <i>%s</i>" msgid "failed to parse any smileys" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "errore nell'interpretazione" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "Diametro featurepoint non valido" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "Posizione featurepoint non valida" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "valori mancanti" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "valore altezza non valido" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "parametro larghezza mancante" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "valore larghezza non valido" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "impossibile eseguire php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "impossibile trovare il file" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "formato dati sconosiuto" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "nessun dato" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Scaricamento diretto dei dati" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "errore di interpretazione alla riga %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "parametro id mancante" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "modello %s non trovato" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "codice tex mancante" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "plugin" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "plugin" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1009,7 +1030,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1073,32 +1094,42 @@ msgstr "compilazione di %s, che dipende da %s" msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "impossibile leggere %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "impossibile aggiornare %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "sistema di controllo di revisione %s non supportato" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "impossibile creare un repository tramite ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1118,13 +1149,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1137,19 +1168,24 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup configfile" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "utilizzo: --set var=valore" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "generazione contenitori..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." @@ -1157,38 +1193,38 @@ msgstr "aggiornamento wiki..." msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index 203155cfb..9fb3cacc0 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n" "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Błąd" @@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "gotowe" @@ -148,35 +148,35 @@ msgstr "gotowe" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -184,7 +184,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -199,12 +199,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -212,7 +212,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -248,7 +248,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -260,137 +260,147 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "Parametry \"test\" i \"then\" są wymagane" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "awaria w trakcie uruchamiania wtyczki graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -400,117 +410,117 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za " "pomocą parametru --url" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " "teraz edytowana" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Kopie lustrzane" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Kopia lustrzana" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -518,19 +528,19 @@ msgstr "" msgid "more" msgstr "więcej" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "niedostępna funkcja getctime" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Pobierz OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" @@ -539,31 +549,39 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Konto założone pomyślnie. Teraz można zalogować się." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Błąd w trakcie zakładania konta." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -594,119 +612,119 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "głosuj" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Oddane głosy:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "brakująca reguła" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "nieznana reguła" @@ -775,12 +793,12 @@ msgstr "o północy" msgid "at noon on %A" msgstr "w południe w %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -788,84 +806,84 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " "teraz edytowana" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, fuzzy, perl-format msgid "%s is not a file" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "renderowanie %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -880,21 +898,21 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "brakujący parametr name lub url" @@ -902,7 +920,7 @@ msgstr "brakujący parametr name lub url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "skrót %s wskazuje na adres <i>%s</i>" @@ -912,124 +930,126 @@ msgstr "skrót %s wskazuje na adres <i>%s</i>" msgid "failed to parse any smileys" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "błąd w trakcie przetwarzania" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "nieprawidłowa średnica dla featurepoint" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "nieprawidłowe położenie dla featurepoint" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "nieprawidłowa wysokość" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "brakujący parametr width" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "nieprawidłowa szerokość" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "awaria w trakcie uruchamiania php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "nie można znaleźć pliku" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "nieznany format danych" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "brak danych" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Bezpośrednie pobieranie danych" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "awaria w trakcie przetwarzania linii %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "brakujący parametr id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 #, fuzzy msgid "failed to process:" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 #, fuzzy msgid "missing tex code" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1091,32 +1111,42 @@ msgstr "renderowanie %s zależącego od %s" msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "awaria w trakcie odczytu %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "awaria w trakcie kompilowania %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1135,13 +1165,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1154,19 +1184,23 @@ msgstr "użycie: ikiwiki [parametry] źródło cel" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "tworzenie osłon..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." @@ -1174,40 +1208,40 @@ msgstr "odświeżanie wiki..." msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 49518e2a8..0d4c6202e 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Fel" @@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "klar" @@ -145,35 +145,35 @@ msgstr "klar" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -181,7 +181,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -196,12 +196,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -209,7 +209,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -245,7 +245,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -257,137 +257,147 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "MÃ¥ste ange %s när sökinsticket används" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -397,113 +407,113 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "MÃ¥ste ange url till wiki med --url när --rss eller --atom används" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s är lÃ¥st av %s och kan inte redigeras" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Speglar" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spegel" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -511,19 +521,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime inte implementerad" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Skaffa ett OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." @@ -532,31 +542,39 @@ msgstr "Alla sidor länkas till av andra sidor." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Kontot har skapats. Du kan nu logga in." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Fel vid skapandet av konto." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -587,119 +605,119 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "röst" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Antal röster:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -767,12 +785,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -780,82 +798,82 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s är lÃ¥st av %s och kan inte redigeras" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "ritar upp %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -870,21 +888,21 @@ msgstr "misslyckades med att skriva %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "genväg saknar parameter för namn eller url" @@ -892,7 +910,7 @@ msgstr "genväg saknar parameter för namn eller url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "genvägen %s pekar pÃ¥ %s" @@ -902,121 +920,123 @@ msgstr "genvägen %s pekar pÃ¥ %s" msgid "failed to parse any smileys" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 #, fuzzy msgid "failed to process:" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1078,32 +1098,42 @@ msgstr "ritar upp %s, vilken är beroende av %s" msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakÃ¥tlänkar" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "kan inte läsa %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "misslyckades med att kompilera %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1122,13 +1152,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1141,19 +1171,23 @@ msgstr "användning: ikiwiki [flaggor] källa mÃ¥l" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "genererar wrappers.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." @@ -1161,38 +1195,38 @@ msgstr "uppdaterar wiki.." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "MÃ¥ste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades pÃ¥ %s, djup %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index 113427f9b..b59f5e941 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş <roktas@debian.org>\n" "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi." msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Hata" @@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "" @@ -141,32 +141,32 @@ msgstr "" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -174,7 +174,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -189,12 +189,12 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -202,7 +202,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -238,7 +238,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -250,131 +250,141 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -383,104 +393,104 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -488,19 +498,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "" @@ -508,31 +518,39 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -562,117 +580,117 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -740,12 +758,12 @@ msgstr "geceyarısında" msgid "at noon on %A" msgstr "%A öğleyin" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -753,81 +771,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -842,28 +860,28 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "" @@ -872,113 +890,115 @@ msgstr "" msgid "failed to parse any smileys" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 msgid "failed to process:" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1040,32 +1060,42 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, perl-format +msgid "cannot load %s in safe mode" +msgstr "" + +#: ../IkiWiki/Setup.pm:46 +#, perl-format +msgid "failed to parse %s" +msgstr "" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1084,13 +1114,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1103,19 +1133,23 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "" @@ -1123,38 +1157,38 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/underlay.setup b/po/underlay.setup index 333d331d1..c34045981 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -8,7 +8,7 @@ use IkiWiki::Setup::Standard { # will excessively bloat things. po_slave_languages => { 'es' => 'Español', - #'de' => 'Deutsch', + 'de' => 'Deutsch', 'fr' => 'Français', 'da' => 'Dansk', 'cs' => 'česky', diff --git a/po/underlays/basewiki/ikiwiki.de.po b/po/underlays/basewiki/ikiwiki.de.po new file mode 100644 index 000000000..1eb8429f3 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki.de.po @@ -0,0 +1,69 @@ +# German translation of basewiki/ikiwiki page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 09:37+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, 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 "" +"Dieses Wiki basiert auf [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then=\"(Es läuft Version [[!version ]].)\"\n" +"]]\n" + +#. type: Plain text +msgid "Some documentation on using ikiwiki:" +msgstr "Dokumentation zur Verwendung von ikiwiki:" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/formatting]]" +msgstr "[[Formatierung|ikiwiki/formatting]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/wikilink]]" +msgstr "[[ikiwiki/wikilink]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/subpage]]" +msgstr "[[Unterseiten|ikiwiki/subpage]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/pagespec]]" +msgstr "[[ikiwiki/pagespec]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/directive]]" +msgstr "[[Anweisungen|ikiwiki/directive]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/markdown]]" +msgstr "[[ikiwiki/markdown]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/openid]]" +msgstr "[[ikiwiki/openid]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/searching]]" +msgstr "[[Suchen|ikiwiki/searching]]" + diff --git a/po/underlays/basewiki/ikiwiki/directive.de.po b/po/underlays/basewiki/ikiwiki/directive.de.po new file mode 100644 index 000000000..d969f8102 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/directive.de.po @@ -0,0 +1,137 @@ +# German translation of basewiki/ikiwiki/directive page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:16+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Anweisungen\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin " +"with `!` and may contain parameters. The general form is:" +msgstr "" +"Anweisungen haben eine ähnliche Form wie ein [[ikiwiki/WikiLink]], " +"allerdings beginnen sie mit `!` und sie können Parameter enthalten. " +"Die allgemeine Form ist:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n" +msgstr "\t\\[[!anweisung param=\"Wert\" param=\"Wert\"]]\n" + +#. type: Plain text +msgid "" +"This gets expanded before the rest of the page is processed, and can be used " +"to transform the page in various ways." +msgstr "" +"Dies wird expandiert, bevor der Rest der Seite verarbeitet wird, und kann " +"auf unterschiedliche Weise genutzt werden, die Seite zu verändern." + +#. type: Plain text +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 "" +"Die Anführungszeichen um die Werte können weggelassen werden, " +"wenn der Wert ein einfaches Wort ist. Einige Anweisungen verwenden " +"auch Parameter ohne Wert, zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!tag foo]]\n" +msgstr "\t\\[[!tag foo]]\n" + +#. type: Plain text +msgid "" +"A directive does not need to all be on one line, it can be wrapped to " +"multiple lines if you like:" +msgstr "" +"Eine Anweisung muss nicht ganz in einer einzelnen Zeile stehen, " +"sie kann auch auf mehrere Zeilen verteilt werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!directive foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" +msgstr "" +"\t\\[[!anweisung foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" + +#. type: Plain text +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 "" +"Außerdem können mehrere Zeilen Text *in Anführungszeichen* für einen " +"Wert verwendet werden. Um Anführungszeichen innerhalb des Werts zu " +"ermöglichen, trenne den Textblock durch dreifache Anführungszeichen ab:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive text=\"\"\"\n" +msgstr "\t\\[[!anweisung text=\"\"\"\n" + +#. type: Bullet: ' 1. ' +msgid "\"foo\"" +msgstr "\"foo\"" + +#. type: Bullet: ' 2. ' +msgid "\"bar\"" +msgstr "\"bar\"" + +#. type: Bullet: ' 3. ' +msgid "\"baz\"" +msgstr "\"baz\"" + +#. type: Plain text +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 default. However, ikiwiki still supports wikis using " +"the older syntax, if the `prefix_directives` option is disabled." +msgstr "" +"Es gibt in ikiwiki auch eine ältere Syntax für Anweisungen, die ein " +"Leerzeichen in erfordert, um sie von [[Wiki-Links|ikiwiki/wikilink]] zu " +"unterscheiden. Diese Syntax hat mehrere Nachteile: Sie erfordert ein " +"Leerzeichen nach Anweisungen ohne Parameter (so wie " +"`\\[[pagecount ]]`), and sie verbietet Leerzeichen in " +"[[Wiki-Links|ikiwiki/wikilink]]. Die oben gezeigte Syntax mit `!`-Präfix " +"ist nun der Standard in ikiwiki. Die alte Syntax wird allerdings auch " +"noch unterstützt, wenn die Option `prefix_directives` deaktiviert wird." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +msgid "Here is a list of currently available directives in this wiki:" +msgstr "" +"Hier ist eine Liste der aktuell verfügbaren Anweisungen in diesem Wiki:" + +#. type: Plain text +#, no-wrap +msgid "[[!listdirectives ]]\n" +msgstr "[[!listdirectives ]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/formatting.de.po b/po/underlays/basewiki/ikiwiki/formatting.de.po new file mode 100644 index 000000000..d4955eeb8 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/formatting.de.po @@ -0,0 +1,299 @@ +# German translation of basewiki/ikiwiki/formatting page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:35+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"Formatting wiki pages\"]]\n" +msgstr "[[!meta title=\"Wiki-Seiten formatieren\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +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 "" +"Text wird in diesem Wiki standardmäßig in einer Form geschrieben, die " +"sehr stark dem ähnelt, wie man eine E-Mail schreibt. Dieser " +"Formatierungs-Stil wird [[MarkDown]] genannt und funktioniert folgendermaßen:" + +#. type: Plain text +msgid "Leave blank lines between paragraphs." +msgstr "Lasse Leerzeilen zwischen Absätzen." + +#. type: Plain text +msgid "" +"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by " +"placing it in single or double asterisks." +msgstr "" +"Man kann Text *\\*hervorheben\\** oder **\\*\\*stark hervorheben\\*\\***, " +"indem man ihn zwischen einfache oder doppelte Sternchen setzt." + +#. type: Plain text +msgid "To create a list, start each line with an asterisk:" +msgstr "Um eine Liste zu erstellen, beginne jede Zeile mit einem Sternchen:" + +#. type: Bullet: '* ' +msgid "\"* this is my list\"" +msgstr "\"* Dies ist meine Liste\"" + +#. type: Bullet: '* ' +msgid "\"* another item\"" +msgstr "\"* Noch ein Eintrag.\"" + +#. type: Plain text +msgid "" +"To make a numbered list, start each line with a number (any number will do) " +"followed by a period:" +msgstr "" +"Um eine nummerierte Liste zu erhalten, beginne jede Zeile mit einer Zahl " +"(welche ist egal), auf die ein Punkt folgt:" + +#. type: Bullet: '1. ' +msgid "\"1. first line\"" +msgstr "\"1. Erste Zeile\"" + +#. type: Bullet: '2. ' +msgid "\"2. second line\"" +msgstr "\"2. Zweite Zeile\"" + +#. type: Bullet: '2. ' +msgid "\"2. third line\"" +msgstr "\"2. Dritte Zeile\"" + +#. type: Plain text +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 "" +"Um eine Überschrift zu erstellen, beginne eine Zeile mit einem oder mehreren " +"`#`-Zeichen gefolgt von einem Leerzeichen und dem Text der Überschrift. " +"Die Anzahl der `#` steuert die Größe der Überschriften:" + +#. type: Title # +#, no-wrap +msgid "# h1" +msgstr "# h1 " + +#. type: Title ## +#, no-wrap +msgid "## h2" +msgstr "## h2" + +#. type: Title ### +#, no-wrap +msgid "### h3" +msgstr "### h3" + +#. type: Title #### +#, no-wrap +msgid "#### h4" +msgstr "#### h4" + +#. type: Title ##### +#, no-wrap +msgid "##### h5" +msgstr "##### h5" + +#. type: Title ###### +#, no-wrap +msgid "###### h6" +msgstr "###### h6" + +#. type: Plain text +msgid "" +"To create a horizontal rule, just write three or more dashes or stars on " +"their own line:" +msgstr "" +"Um eine horizontale Linie zu erzeugen, schreibe einfach drei oder mehr " +"Bindestriche oder Sternchen allein in eine Zeile:" + +#. type: Plain text +#, no-wrap +msgid "To quote someone, prefix the quote with \">\":\n" +msgstr "Um jemanden zu zitieren, stelle dem Zitat `>` voran:\n" + +#. type: Plain text +#, no-wrap +msgid "" +"> To be or not to be,\n" +"> that is the question.\n" +msgstr "" +"> Sein oder nicht sein,\n" +"> das ist die Frage.\n" + +#. type: Plain text +msgid "To write a code block, indent each line with a tab or 4 spaces:" +msgstr "" +"Um einen Block mit Programmcode zu schreiben, rücke jede Zeile mit " +"einem Tabulatorzeichen oder 4 Leerzeichen ein:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t10 PRINT \"Hello, world!\"\n" +"\t20 GOTO 10\n" +msgstr "" +"\t10 PRINT \"Hallo, Welt!\"\n" +"\t20 GOTO 10\n" + +#. type: Plain text +#, no-wrap +msgid "" +"To link to an url or email address, you can just put the\n" +"url in angle brackets: <<http://ikiwiki.info>>, or you can use the\n" +"form \\[link text\\]\\(url\\)\n" +msgstr "" +"Um eine URL oder E-Mail-Adresse zu verlinken, kann man die\n" +"URL einfach ein spitze Klammern schreiben: <<http://ikiwiki.info>>; " +"man kann auch die Form \\[Link-Text\\]\\(URL)\) verwenden.\n" + +#. type: Plain text +msgid "" +"In addition to basic html formatting using [[MarkDown]], this wiki lets you " +"use the following additional features:" +msgstr "" +"Zusätzlich zu der einfachen HTML-Formatierung mit [[MarkDown]] können " +"in diesem Wiki die folgenden zusätzlichen Funktionen verwenden werden:" + +#. type: Bullet: '* ' +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 "" +"Um eine andere Seite des Wikis zu verlinken, schreibe den Namen dieser " +"Seite in doppelte eckige Klammern. Zum Beispiel kann man mit " +"`\\[[WikiLink]]` auf [[WikiLink]] verweisen." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Insert [[smileys]] and some other useful symbols. :-)" +msgstr "[[Smileys|smileys]] und einige andere nützliche Symbole einfügen. :-)" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Use [[shortcuts]] to link to common resources." +msgstr "" +"[[Abkürzungen|shortcuts]] verwenden, um auf gängige Quellen zu verweisen." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n" +msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "" +"Create and fill out [[templates]] for repeated chunks of parameterized wiki " +"text." +msgstr "" +"[[Vorlagen|templates]] erstellen und ausfüllen für wiederholte Blöcke " +"von parametrisiertem Wiki-Text." + +#. type: Plain text +#, no-wrap +msgid "" +"* Insert various [[directives|directive]] onto a page to perform useful\n" +" actions.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" " +"then=\"\"\"\n" +msgstr "" +"* Unterschiedliche [[Anweisungen|directives]] in eine Seite einfügen,\n" +" die nützliche Aktionen durchführen.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" " +"then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " For example, you can:\n" +msgstr " Zum Beispiel kann man:\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Add a table of contents to a page:" +msgstr "Ein Inhaltsverzeichnis zu einer Seite hinzufügen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc]]\n" +msgstr "\t\\[[!toc]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Change the title of a page:" +msgstr "Den Titel einer Seite verändern:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!meta title=\"full page title\"]]\n" +msgstr "\t\\[[!meta title=\"Vollständiger Titel der Seite\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Create a blog by inlining a set of pages:" +msgstr "Einen Blog durch Einbetten mehrerer Seiten erstellen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"blog/*\"]]\n" +msgstr "\t\\[[!inline pages=\"blog/*\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " Full list of [[directives|directive]] enabled for this wiki:\n" +msgstr "" +" Eine vollständige Liste der in diesem Wiki aktivierten " +"[[Anweisungen|directive]]:\n" + +#. type: Plain text +#, no-wrap +msgid " [[!listdirectives ]]\n" +msgstr " [[!listdirectives ]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/markdown.de.po b/po/underlays/basewiki/ikiwiki/markdown.de.po new file mode 100644 index 000000000..1d1d84980 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/markdown.de.po @@ -0,0 +1,52 @@ +# German translation of basewiki/ikiwiki/markdown page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:36+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +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/) ist eine minimale " +"Sprache für Hervorhebungen, die sich an einfachem Text orientiert, wie er " +"in " +"E-Mail-Nachrichten verwendet wird. Diese Hervorhebungssprache wird " +"standardmäßig in diesem Wiki verwendet." + +#. type: Plain text +msgid "" +"For documentation about the markdown syntax, see [[formatting]] and " +"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)." +msgstr "" +"Für die Dokumentation der Markdown-Syntax siehe " +"[[Formatierung|formatting]] " +"und [Markdown: Syntax](http://daringfireball.net/projects/markdown/syntax)." + +#. type: Plain text +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 "" +"Beachte dabei, dass [[WikiLinks|WikiLink]] und [[Anweisungen|directive]] " +"nicht Teil der Markdown-Syntax sind: Sie sind die einzigen " +"Formatierungsanweisungen, die dieses Wiki intern verarbeitet." + + diff --git a/po/underlays/basewiki/ikiwiki/openid.de.po b/po/underlays/basewiki/ikiwiki/openid.de.po new file mode 100644 index 000000000..27c74679a --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/openid.de.po @@ -0,0 +1,115 @@ +# German translation of basewiki/ikiwiki/openid page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 22:29+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"OpenID\"]]\n" +msgstr "[[!meta title=\"OpenID\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"This wiki has OpenID **enabled**.\"\n" +" else=\"This wiki has OpenID **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"In diesem Wiki ist OpenID **aktiviert**.\"\n" +" else=\"In diesem Wiki ist OpenID **deaktiviert**.\"]]\n" + +#. type: Plain text +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) ist ein Mechanismus zur dezentralen " +"Authentifizierung, der es erlaubt, sich mit einem einzigen Benutzerkonto bei " +"einer wachsenden Anzahl von Webseiten anzumelden." + +#. type: Plain text +msgid "To sign up for an OpenID, visit one of the following identity providers:" +msgstr "" +"Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:" + +#. type: Bullet: '* ' +msgid "[MyOpenID](https://www.myopenid.com/)" +msgstr "[MyOpenID](https://www.myopenid.com/)" + +#. type: Bullet: '* ' +msgid "[GetOpenID](https://getopenid.com/)" +msgstr "[GetOpenID](https://getopenid.com/)" + +#. type: Bullet: '* ' +msgid "[LiveJournal](http://www.livejournal.com/openid/)" +msgstr "[LiveJournal](http://www.livejournal.com/openid/)" + +#. type: Bullet: '* ' +msgid "[TrustBearer](https://openid.trustbearer.com/)" +msgstr "[TrustBearer](https://openid.trustbearer.com/)" + +#. type: Bullet: '* ' +msgid "" +"or any of the [many others out " +"there](http://openiddirectory.com/openid-providers-c-1.html)" +msgstr "" +"oder einem der [vielen anderen](http://openiddirectory." +"com/openid-providers-c-1.html)." + +#. type: Plain text +#, no-wrap +msgid "" +"Your OpenID is the URL that you are given when you sign up.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" +msgstr "" +"Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter " +"erhält.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" + +#. type: Plain text +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 "" +"In diesem Wiki kann man sich per OpenID anmelden, indem man einfach seine " +"OpenID im entsprechenden Feld des Anmeldeformulars eingibt. Man muss in " +"diesem Wiki kein Passwort setzen und auch keinen Registrierungsprozess " +"durchlaufen, wenn man OpenID verwendet." + +#. type: Plain text +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 "" +"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar zu " +"machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist ein " +"Beispiel, wie dies gemacht wird:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" +msgstr "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po new file mode 100644 index 000000000..401b4f4b7 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po @@ -0,0 +1,258 @@ +# German translation of basewiki/ikiwiki/pagespec page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:39+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +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 "" +"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden sollen, " +"deren Einrechungs-Mails man abonnieren will, oder die man zu einem Blog " +"kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein Ausdruck, " +"der auf bestimmte Seiten passt." + +#. type: Plain text +msgid "" +"The simplest PageSpec is a simple list of pages. For example, this matches " +"any of the three listed pages:" +msgstr "" +"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel passt " +"dies " +"auf jede der drei aufgezählten Seiten:" + +#. type: Plain text +#, no-wrap +msgid "\tfoo or bar or baz\n" +msgstr "\tfoo or bar or baz\n" + +#. type: Plain text +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 "" +"Häufiger wird es vorkommen, dass man Seiten erfassen will, deren Name etwas " +"bestimmtes enthält. Man kann dies mit einem Muster tun: \"`*`\" steht für " +"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen beliebigen " +"Buchstaben eines Seitennamens. Also passt dies alle Seiten über Musik, und alle " +"[[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den Sandkasten selbst:" + +#. type: Plain text +#, no-wrap +msgid "\t*music* or SandBox/*\n" +msgstr "\t*music* or SandBox/*\n" + +#. type: Plain text +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 "" +"Man kann einem Eintrag ein \"`!`\" voranstellen, um die betreffenden Seiten " +"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten und " +"Sandkasten erfasst werden:" + +#. type: Bullet: ' * ' +msgid "and !SandBox and !*/Discussion" +msgstr "and !SandBox and !*/Discussion" + +#. type: Plain text +msgid "" +"Some more elaborate limits can be added to what matches using these " +"functions:" +msgstr "" +"Einige weitergehende Einschränkungen können hinzugefügt werden, indem die " +"folgenden Funktionen verwendet werden:" + +#. type: Bullet: '* ' +msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)" +msgstr "" +"\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die angegebene Seite " +"(oder das angegebene Muster) enthalten" + +#. type: Bullet: '* ' +msgid "" +"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag " +"(or tags matched by a glob)" +msgstr "" +"\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag versehen " +"sind oder auf diesen verweisen (auch hier kann ein Muster verwendet werden)" + +#. type: Bullet: '* ' +msgid "\"`backlink(page)`\" - matches only pages that a given page links to" +msgstr "" +"\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen Seite " +"verwiesen wird" + +#. type: Bullet: '* ' +msgid "\"`creation_month(month)`\" - matches only pages created on the given month" +msgstr "" +"\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen Monat " +"erstellt wurden" + +#. type: Bullet: '* ' +msgid "\"`creation_day(mday)`\" - or day of the month" +msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat" + +#. type: Bullet: '* ' +msgid "\"`creation_year(year)`\" - or year" +msgstr "\"`creation_year(year)`\" - der ein Jahr" + +#. type: Bullet: '* ' +msgid "" +"\"`created_after(page)`\" - matches only pages created after the given page " +"was created" +msgstr "" +"\"`created_after(page)`\" - passt nur auf Seiten, die nach der angegebenen Seite " +"angelegt wurden" + +#. type: Bullet: '* ' +msgid "" +"\"`created_before(page)`\" - matches only pages created before the given " +"page was created" +msgstr "" +"\"`created_before(page)`\" - passt nur auf Seiten, die vor der angegebenen Seite " +"angelegt wurden." + +#. type: Bullet: '* ' +msgid "" +"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing " +"the glob by itself is actually a shorthand for this function." +msgstr "" +"\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene Muster passt." +" " +"Das Muster direkt anzugeben ist eine Abkürzung für diese Funktion." + +#. type: Bullet: '* ' +msgid "" +"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages " +"that globs do not usually match." +msgstr "" +"\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern verwendete " +"Seiten " +"erfasst, auf die normale Muster nicht passen." + +#. type: Bullet: '* ' +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)`\" - passt auf Seiten, deren Metadaten " +"auf die angegebenen Muster passen." + +#. type: Bullet: '* ' +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. Glob patterns can be used in the username. For example, to match all " +"openid users, use `user(*://*)`" +msgstr "" +"\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem " +"angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine " +"OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. " +"zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden." + +#. type: Bullet: '* ' +msgid "" +"\"`admin()`\" - tests whether a modification is being made by one of the " +"wiki admins." +msgstr "" +"\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-Administratoren " +"gemacht wird." + +#. type: Bullet: '* ' +msgid "" +"\"`ip(address)`\" - tests whether a modification is being made from the " +"specified IP address." +msgstr "" +"\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse aus " +"gemacht wird." + +#. type: Bullet: '* ' +msgid "" +"\"`postcomment(glob)`\" - matches only when comments are being posted to a " +"page matching the specified glob" +msgstr "" +"\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch das " +"Muster angegebenen Seite gemacht wird" + +#. type: Plain text +msgid "" +"For example, to match all pages in a blog that link to the page about music " +"and were written in 2005:" +msgstr "" +"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen Link " +"zu einer Seite über Musik enthalten und 2005 geschrieben wurden:" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and link(music) and creation_year(2005)\n" +msgstr "\tblog/* and link(music) and creation_year(2005)\n" + +#. type: Plain text +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 "" +"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass " +"nur die Seiten auf den gesamten Ausdruck passen, die auf alle drei " +"Teilausdrücke passen. Verwende `and` um Ausdrücke so zu kombinieren " +"und `or` wenn eine Seite nur auf einen der Ausdrücke passen soll. Beachte " +"dass es sinnlos ist, `index and SandBox` zu sagen, da keine Seite auf beide " +"Ausdrücke passen kann." + +#. type: Plain text +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 "" +"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern " +"zur Gruppierung verwendet werden. Zum Beispiel passt der folgende " +"Ausdruck auf Blog-Seiten, die mit einem der beiden angegebenen Tags " +"versehen sind:" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and (tagged(foo) or tagged(bar))\n" +msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n" + +#. type: Plain text +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 "" +"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen " +"der Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` " +"wird weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum " +"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du " +"`./` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`." + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po new file mode 100644 index 000000000..1a20a5f0e --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po @@ -0,0 +1,122 @@ +# German translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:17+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Anhänge\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"This wiki has attachments **enabled**.\"\n" +" else=\"This wiki has attachments **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"In diesem Wiki sind Anhänge **aktiviert**.\"\n" +" else=\"In diesem Wiki sind Anhänge **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "" +"If attachments are enabled, the wiki admin can control what types of " +"attachments will be accepted, via the `allowed_attachments` configuration " +"setting." +msgstr "" +"Wenn Anhänge aktiviert sind, kann der Administrator des Wikis bestimmen, " +"welche Arten von Anhängen akzeptiert werden, indem er die Einstellung " +"`allowed_attachments` verändert." + +#. type: Plain text +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 viruses, something like this could be used:" +msgstr "" +"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, " +"aber größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, " +"und alle Anhänge nach Viren durchsucht werden, indem etwas wie " +"das Folgende verwendet wird:" + +#. type: Plain text +#, no-wrap +msgid "" +"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) " +"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" +msgstr "" +"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) " +"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" + +#. type: Plain text +msgid "" +"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following " +"additional tests:" +msgstr "" +"Die reguläre [[ikiwiki/PageSpec]]-Syntax ist um die folgenden zusätzlichen " +"Tests erweitert:" + +#. type: Bullet: '* ' +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(size)`\" - prüft ob der Anhang nicht größer ist als angegeben. " +"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, " +"`gb` und so weiter kann verwendet werden, um die Einheit anzugeben." + +#. type: Bullet: '* ' +msgid "" +"\"`minsize(size)`\" - tests whether the attachment is no smaller than the " +"specified size." +msgstr "" +"\"`minsize(size)`\" - prüft ob der Anhang nicht kleiner ist als angegeben." + +#. type: Bullet: '* ' +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()`\" - prüft ob der Anhang von ikiwiki als Wiki-Seite behandelt " +"wird. Dies ist der Fall, wenn er die Endung `.mdwn` oder die eines anderen " +"aktivierten Seitenformats hat." + +#. type: Plain text +#, no-wrap +msgid "" +" So, if you don't want to allow wiki pages to be uploaded as attachments,\n" +" use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n" +" as attachments, use `ispage()`.\n" +msgstr "" +" Wenn man also verhindern will, dass Wiki-Seiten als Anhang hochgeladen\n" +" werden, kann `!ispage()` verwendet werden; wenn nur Wiki-Seiten\n" +" hochgeladen werden können sollen, geht dies mit `ispage()`.\n" + +#. type: Bullet: '* ' +msgid "" +"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can " +"include a glob in the type, for example `mimetype(image/*)`." +msgstr "" +"\"`mimetype(foo/bar)`\" - prüft den MIME-Typ des Anhangs. Man kann ein " +"Muster für den Typen verwenden, zum Beispiel `mimetype(image/*)`." + +#. type: Bullet: '* ' +msgid "\"`virusfree()`\" - checks the attachment with an antiviral program." +msgstr "\"`virusfree()`\" - prüft den Anhang mit einem Virenscanner." + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po new file mode 100644 index 000000000..785b16ffa --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po @@ -0,0 +1,70 @@ +# German translation of basewiki/ikiwiki/pagespec/po page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:55+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(po)\"\n" +" then=\"This wiki has po support **enabled**.\"\n" +" else=\"This wiki has po support **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(po)\"\n" +" then=\"In diesem Wiki ist die po-Unterstützung **aktiviert**.\"\n" +" else=\"In diesem Wiki ist die po-Unterstützung **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "" +"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular " +"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests " +"that can be used to improve user navigation in a multi-lingual wiki:" +msgstr "" +"Wenn die [[!iki plugins/po desc=po]]-Erweiterung aktiviert ist, ist die " +"reguläre " +"[[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests erweitert, " +"die zur Verbesserung der Benutzernavigation in mehrsprachigen Wikis " +"verwendet werden kann:" + +#. type: Bullet: '* ' +msgid "" +"\"`lang(LL)`\" - tests whether a page is written in the language specified " +"as a ISO639-1 (two-letter) language code." +msgstr "" +"\"`lang(LL)`\" - prüft ob eine Seite in der angegebenen Sprache geschrieben " +"ist. " +"Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 angegeben." + +#. type: Bullet: '* ' +msgid "" +"\"`currentlang()`\" - tests whether a page is written in the same language " +"as the current page." +msgstr "" +"\"`currentlang()`\" - prüft, ob eine Seite in der gleichen Sprache " +"geschrieben ist wie " +"die aktuelle Seite." + +#. type: Plain text +msgid "" +"Note that every non-po page is considered to be written in " +"`po_master_language`, as specified in `ikiwiki.setup`." +msgstr "" +"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language` " +" angenommen wird, wie in `ikiwiki.setup` angegeben." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po new file mode 100644 index 000000000..dbc6dbb95 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po @@ -0,0 +1,48 @@ +# German translation of basewiki/ikiwiki/pagespec/sorting page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:19+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"Some [[directives|ikiwiki/directive]] that use " +"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching " +"pages are shown in. The following sort orders can be specified." +msgstr "" +"[[!meta title=\"Sortierung\"]]\n" +"Bei einigen der [[Anweisungen|ikiwiki/directive]], die [[PageSpecs|ikiwiki/pagespec]] verwenden, kann eine Reihenfolge angegeben werden, in der die ausgewählten Seiten angezeigt werden. Die folgenden Sortierreihenfolgen können angegeben werden:" + +#. type: Bullet: '* ' +msgid "`age` - List pages from the most recently created to the oldest." +msgstr "`age` - Zeige die Seiten von der zuletzt angelegten zur ältesten." + +#. type: Bullet: '* ' +msgid "`mtime` - List pages with the most recently modified first." +msgstr "`mtime` - Zeige die Seiten mit der zuletzt veränderten zuerst." + +#. type: Bullet: '* ' +msgid "`title` - Order by title." +msgstr "`title` - Sortiere nach Titel." + +#. type: Bullet: '* ' +msgid "" +"`title_natural` - Only available if [[!cpan Sort::Naturally]] is " +"installed. Orders by title, but numbers in the title are treated as such, " +"(\"1 2 9 10 20\" instead of \"1 10 2 20 9\")" +msgstr "" +"`title_natural` - Nur verfügbar, wenn [[!cpan Sort::Naturally]] " +"installiert ist. " +"Sortiert nach Titel, aber Zahlen im Titel werden als solche behandelt" +"(\"1 2 9 10 20\" statt \"1 10 2 20 9\")." + + diff --git a/po/underlays/basewiki/ikiwiki/searching.de.po b/po/underlays/basewiki/ikiwiki/searching.de.po new file mode 100644 index 000000000..ca50e05d4 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/searching.de.po @@ -0,0 +1,92 @@ +# German translation of basewiki/ikiwiki/searching page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:14+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta robots=\"noindex, follow\"]]\n" +"[[!meta title=\"Suchen\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(search)\"\n" +"then=\"This wiki has searching **enabled**.\"\n" +"else=\"This wiki has searching **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(search)\"\n" +"then=\"In diesem Wiki ist Suchen **aktiviert**.\"\n" +"else=\"In diesem Wiki ist Suchen **deaktiviert**.\"]]\n" + +#. type: Plain text +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 construct more " +"powerful searches." +msgstr "" +"Wenn Suchen aktiviert ist, kann man wie erwartet Suchausdrücke in das " +"Suchfeld eintragen. Es gibt einige spezielle Ausdrücke, um mächtigere " +"Suchen zu erstellen." + +#. type: Bullet: '* ' +msgid "To match a phrase, enclose it in double quotes." +msgstr "" +"Um nach einer Phrase aus mehreren Wörtern zu suchen, schreibe sie in " +"Anführungszeichen." + +#. type: Bullet: '* ' +msgid "`AND` can be used to search for documents containing two expressions." +msgstr "" +"`AND` kann verwendet werden, um nach Dokumenten mit zwei Ausdrücken zu " +"suchen." + +#. type: Bullet: '* ' +msgid "" +"`OR` can be used to search for documents containing either one of two " +"expressions." +msgstr "" +"`OR` kann verwendet werden, um nach Dokumenten mit einem der beiden " +"Ausdrücke zu suchen." + +#. type: Bullet: '* ' +msgid "" +"Parentheses can be used to build up complicated search expressions. For " +"example, \"(foo AND bar) OR (me AND you)\"" +msgstr "" +"Klammern können verwendet werden, um komplexere Suchausdrücke aufzubauen. " +"Zum Beispiel `(foo AND bar) OR (ich AND du)`." + +#. type: Bullet: '* ' +msgid "" +"Prefix a search term with \"-\" to avoid it from appearing in the results. " +"For example, \"-discussion\" will omit \"discussion\"." +msgstr "" +"Stelle einem Suchausdruck `-` voran, damit er nicht in den Ergebnissen " +"auftaucht. " +"Zum Beispiel wird `-Diskussion`alle Seiten mit \"Diskussion\" ausschließen." + +#. type: Bullet: '* ' +msgid "To search for a page with a given title, use \"title:foo\"." +msgstr "" +"Um nach einer Seite mit einem bestimmten Titel zu suchen, verwende " +"`title:foo`." + +#. type: Bullet: '* ' +msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"." +msgstr "" +"Um nach Seiten mit einem Link auf \"bar\" zu suchen, verwende `link:bar`." + + diff --git a/po/underlays/basewiki/ikiwiki/subpage.de.po b/po/underlays/basewiki/ikiwiki/subpage.de.po new file mode 100644 index 000000000..184144ca0 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage.de.po @@ -0,0 +1,54 @@ +# German translation of basewiki/ikiwiki/subpage page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:19+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Unterseiten\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +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 "" +"In ikiwiki werden Seiten in einem Verzeichnisbaum angeordnet. Zum Beispiel " +"gibt es unterhalb dieser Seite, [[SubPage]], einige verwandte Seiten, etwa " +"[[SubPage/LinkingRules]]. Dies ist eine nützliche Möglichkeit, Ordnung in " +"ein Wiki zu bringen und nicht nur ein riesiges Verzeichnis voller Seiten zu " +"haben." + +#. type: Plain text +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 "" +"Um eine Unterseite hinzuzufügen, legt man einfach ein Unterverzeichnis an " +"und erstellt darin Seiten. Zum Beispiel ist diese Seite `SubPage.mdwn` in " +"der Quelle dieses Wikis und es existiert auch ein Unterverzeichnis " +"`SubPage`, das `SubPage/LinkingRules.mdwn` enthält. Unterseiten können " +"beliebig tief verschachtelt werden." + +#. type: Plain text +msgid "Linking to and from a SubPage is explained in [[LinkingRules]]." +msgstr "" +"Wie Links auf Unterseiten gesetzt werden, wird in [[LinkingRules]] erklärt." + + diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po new file mode 100644 index 000000000..08ffd8cbf --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po @@ -0,0 +1,109 @@ +# German translation of basewiki/ikiwiki/subpage/linkingrules page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:21+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Regeln für Links\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +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 "" +"Um einen Link von oder zu einer [[Unterseite|SubPage]] anzulegen, kann man " +"normalerweise einfache WikiLinks verwenden, ohne dass diese den Namen des " +"Verzeichnisses enthalten, in dem die [[Unterseite|SubPage]] liegt. " +"Ikiwiki läuft dann die Verzeichnishierarchie ab und sucht nach einer Seite, " +"die zu dem angegebenen Link passt." + +#. type: Plain text +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 "" +"Wenn zum Beispiel `FooBar/UnterSeite` einen Link auf `AndereSeite` enthält, " +"wird ikiwiki bevorzugt auf `FooBar/UnterSeite/AndereSeite` verweisen, wenn " +"diese existiert, dann auf `FooBar/AndereSeite` und schließlich auf " +"`AndereSeite` im Wurzelverzeichnis des Wikis." + +#. type: Plain text +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 "" +"Insbesondere bedeutet dies, dass wenn ein Link auf `FooBar/EineSeite` auf " +"`AndereSeite` momentan auf `AndereSeite` im Wurzelverzeichnis des Wikis " +"verweist, und `FooBar/AndereSeite` erstellt wird, dann _ändert_ sich das " +"Ziel des Links auf `FooBar/AndereSeite`. Andererseits würde ein Link von " +"`BazBar` auf `AndereSeite` durch das Anlegen einer [[Unterseite|SubPage]] " +"von `FooBar` unverändert bleiben." + +#. type: Plain text +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 "" +"Man kann auch einen Link mit Verzeichnisnamen angeben, etwa " +"`FooBar/AndereSeite`, um genauer anzugeben auf welche Seite verwiesen werden " +"soll. Nur so kann auf eine [[Unterseite|SubPage]] einer anderen Seite " +"verwiesen werden." + +#. type: Plain text +msgid "" +"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", " +"or from BazBar/SubPage to \"FooBar/SubPage\"." +msgstr "" +"Man kann dies zum Beispiel dazu verwenden, um einen Link von `BazBar` auf " +"`FooBar/UnterSeite` oder von `BazBar/UnterSeite` auf `FooBar/UnterSeite` " +"anzulegen." + +#. type: Plain text +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 "" +"Man kann auch `/` am Anfang des Links verwenden, um die Zielseite genau zu " +"spezifizieren, wenn es mehrere Seiten mit ähnlichen Namen gibt und der Link " +"standardmäßig zur falschen geht. Zum Beispiel zeigt der Link `/AndereSeite` " +"auf der Seite `FooBar/UnterSeite` auf `AndereSeite` im Wurzelverzeichnis des " +"Wikis, selbst wenn es eine `FooBar/AndereSeite` gibt." + +#. type: Plain text +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 "" +"Wenn das Wiki mit einem `userdir` konfiguriert ist, kann man außerdem " +"die Seiten im Benutzerverzeichnis direkt verlinken, ohne einen Pfad " +"anzugeben. Dadurch können leichter Links auf die Seite eines Benutzers " +"gesetzt werden, etwa beim Signieren eines Kommentars. Diese Links " +"werden als letzte von allen in Betracht gezogen." + + diff --git a/po/underlays/basewiki/ikiwiki/wikilink.de.po b/po/underlays/basewiki/ikiwiki/wikilink.de.po new file mode 100644 index 000000000..ccdd20303 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/wikilink.de.po @@ -0,0 +1,111 @@ +# German translation of basewiki/ikiwiki/wikilink page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:41+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +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 ermöglichen es, auf einfache Weise Links zwischen Seiten im Wiki " +"zu setzen. " +"Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der Zielseite in " +"doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"If you ever need to write something like `\\[[WikiLink]]` without creating a " +"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`." +msgstr "" +"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, " +"ohne einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in " +"`\\\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"There are some special [[SubPage/LinkingRules]] that come into play when " +"linking between [[SubPages|SubPage]]." +msgstr "" +"Es gibt einige spezielle [[Regeln für Links|SubPage/LinkingRules]], die beim " +"setzen von Links zwischen [[Unterseiten|SubPage]] ins Spiel kommen." + +#. type: Plain text +msgid "" +"Also, if the file linked to by a WikiLink looks like an image, it will be " +"displayed inline on the page." +msgstr "" +"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses " +"innerhalb der Seite angezeigt." + +#. type: Plain text +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 werden unabhängig von der Groß- und Kleinschreibung gefunden, " +"man braucht sich also keine Gedanken über identische Schreibweise zu machen " +"und kann zum Beispiel das erste Wort eines Satzes groß schreiben." + +#. type: Plain text +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 "" +"Es ist auch möglich einen WikiLink zu schreiben, der etwas anderes als den " +"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist " +"`\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint " +"als [[foo_bar|SandBox]]." + +#. type: Plain text +msgid "" +"To link to an anchor inside a page, you can use something like " +"`\\[[WikiLink#foo]]` ." +msgstr "" +"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie " +"`\\[[WikiLink#foo]]` verwenden." + +#. type: Title ## +#, no-wrap +msgid "Directives and WikiLinks" +msgstr "Anweisungen und WikiLinks" + +#. type: Plain text +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 "" +"Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die ältere " +"Syntax verwendete Leerzeichen, um zwischen Anweisungen und WikiLinks " +"zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser Syntax " +"keine Leerzeichen in WikiLinks verwendet werden können und durch " +"Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch " +"die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt " +"Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. " +"Zukünftige Versionen von ikiwiki werden diese Option standardmäßig " +"aktivieren." + + diff --git a/po/underlays/basewiki/index.de.po b/po/underlays/basewiki/index.de.po new file mode 100644 index 000000000..c2dcdd341 --- /dev/null +++ b/po/underlays/basewiki/index.de.po @@ -0,0 +1,29 @@ +# German translation of basewiki/index page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 09:40+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "Welcome to your new wiki." +msgstr "Willkommen in Ihrem neuen Wiki." + +#. type: Plain text +msgid "All wikis are supposed to have a [[SandBox]], so this one does too." +msgstr "" +"Alle Wikis sollten einen [[Sandkasten|SandBox]] haben, also hat dieses " +"auch einen." + +#. type: Plain text +msgid "This wiki is powered by [[ikiwiki]]." +msgstr "Dieses Wiki wird mit [[ikiwiki]] betrieben." + diff --git a/po/underlays/basewiki/recentchanges.de.po b/po/underlays/basewiki/recentchanges.de.po new file mode 100644 index 000000000..88ff46fca --- /dev/null +++ b/po/underlays/basewiki/recentchanges.de.po @@ -0,0 +1,38 @@ +# German translation of basewiki/recentchanges page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 09:41+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"RecentChanges\"]]\n" +msgstr "[[!meta title=\"Letzte Änderungen\"]]\n" + +#. type: Plain text +msgid "Recent changes to this wiki:" +msgstr "Die letzten Änderungen an diesem Wiki:" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" +msgstr "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" + diff --git a/po/underlays/basewiki/sandbox.de.po b/po/underlays/basewiki/sandbox.de.po new file mode 100644 index 000000000..bb1b837c6 --- /dev/null +++ b/po/underlays/basewiki/sandbox.de.po @@ -0,0 +1,91 @@ +# German translation of basewiki/sandbox page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:14+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, fuzzy +msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki." +msgstr "" +"[[!meta title=\"Sandkasten\"]]\n" +"Dies ist der Sandkasten: Eine Seite die jeder bearbeiten kann, um zu lernen wie man das Wiki benutzt." + +#. type: Plain text +msgid "Here's a paragraph." +msgstr "Dies ist ein Absatz." + +#. type: Plain text +msgid "Here's another one with *emphasised* text." +msgstr "Dies ist noch ein Absatz mit *hervorgehobenem* Text." + +#. type: Title # +#, no-wrap +msgid "Header" +msgstr "Überschrift" + +#. type: Title ## +#, no-wrap +msgid "Subheader" +msgstr "Unterüberschrift" + +#. type: Plain text +#, no-wrap +msgid "" +"> This is a blockquote.\n" +">\n" +"> This is the first level of quoting.\n" +">\n" +"> > This is nested blockquote.\n" +">\n" +"> Back to the first level.\n" +msgstr "" +"> Dies ist ein zitierter Absatz.\n" +">\n" +"> Dies ist die erste Zitatebene.\n" +">\n" +"> > Dies ist ein verschachteltes Zitat.\n" +">\n" +"> Zurück zur ersten Ebene.\n" + +#. type: Plain text +msgid "Numbered list" +msgstr "Nummerierte Aufzählung" + +#. type: Bullet: '1. ' +msgid "First item." +msgstr "Erster Eintrag" + +#. type: Bullet: '1. ' +msgid "Another." +msgstr "Noch einer." + +#. type: Bullet: '1. ' +msgid "And another.." +msgstr "Und noch einer ..." + +#. type: Plain text +msgid "Bulleted list" +msgstr "Einfache Aufzählung" + +#. type: Bullet: '* ' +msgid "*item*" +msgstr "*Eintrag*" + +#. type: Bullet: '* ' +msgid "item" +msgstr "Eintrag" + +#. type: Plain text +msgid "[[ikiwiki/WikiLink]]" +msgstr "[[ikiwiki/WikiLink]]" + diff --git a/po/underlays/basewiki/shortcuts.de.po b/po/underlays/basewiki/shortcuts.de.po new file mode 100644 index 000000000..abfa26bdc --- /dev/null +++ b/po/underlays/basewiki/shortcuts.de.po @@ -0,0 +1,287 @@ +# German translation of basewiki/shortcuts page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:14+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"This wiki has shortcuts **enabled**.\"\n" +" else=\"This wiki has shortcuts **disabled**.\"]]\n" +msgstr "" +"[[!meta title=\"Abkürzungen\"]]\n" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"In diesem Wiki sind Abkürzungen **aktiviert**.\"\n" +" else=\"In diesem Wiki sind Abkürzungen **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "Some examples of using shortcuts include:" +msgstr "Abkürzungen können unter anderem so benutzt werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n" +msgstr "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tBetrachte die \\[[!cia ikiwiki desc=\"CIA-Seite für %s\"]].\n" + +#. type: Plain text +msgid "This page controls what shortcut links the wiki supports." +msgstr "Diese Seite bestimmt, welche Abkürzungen das Wiki unterstützt." + +#. type: Bullet: '* ' +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: '* ' +msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" +msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" + +#. type: Bullet: '* ' +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: '* ' +msgid "[[!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: '* ' +msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" +msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug " +"#%s\"]]" +msgstr "" +"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug " +"#%s\"]]" + +#. type: Bullet: '* ' +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: '* ' +msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" +msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" + +#. type: Bullet: '* ' +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: '* ' +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 +#, 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" +"* [[!shortcut name=cpanrt " +"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN " +"RT#%s\"]]\n" +"* [[!shortcut name=novellbug " +"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n" +msgstr "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Verwendung: `\\[[!debss Paket]]`, `\\[[!debss Paket#Version]]`, or " +"`\\[[!debss Paket/Version]]`. Details unter http://snapshot.debian.net.\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" +"* [[!shortcut name=cpanrt " +"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN " +"RT#%s\"]]\n" +"* [[!shortcut name=novellbug " +"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n" + +#. type: Plain text +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 " +"[[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, " +"non-encoded text. The optional `desc` parameter controls the description of " +"the link." +msgstr "" +"Um eine neue Abkürzung hinzuzufügen, verwende die " +"shortcut-[[Anweisung|ikiwiki/directive]]. " +"In der URL wird `%s` durch den der Abkürzung übergebenen Text in " +"URL-Kodierung ersetzt. Außerdem wird `%S` durch den unveränderten Text ersetzt. " +"Der optionale Parameter `desc` steuert die Beschriftung der Verknüpfung." + +#. type: Plain text +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 "" +"Denke daran, dass der angegebene `name` eine neue " +"[[Anweisung|ikiwiki/directive]] wird. Deshalb sollte man es vermeiden, " +"einen Namen zu verwenden, der mit einer bestehenden " +"[[Anweisung|ikiwiki/directive]] in Konflikt steht. Diese Anweisungen akzeptieren " +"einen optionalen Parameter `desc`, der statt des Werts aus der Definition " +"verwendet wird." + +#. type: Plain text +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 " +"wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki " +"will include your shortcut in the standard underlay." +msgstr "" +"Wenn Sie eine Idee für eine Abkürzung haben, die auch andere nützlich " +"finden könnten, können Sie diese auf der [Abkürzungs-Seite des " +"ikiwiki-Wiki](http://ikiwiki.info/shortcuts/) eintragen, damit künftige " +"Versionen von ikiwiki diese Abkürzung standardmäßig zur Verfügung stellen." + + diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po new file mode 100644 index 000000000..beb92b49f --- /dev/null +++ b/po/underlays/basewiki/templates.de.po @@ -0,0 +1,256 @@ +# German translation of basewiki/templates page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:15+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(template)\"\n" +"then=\"This wiki has templates **enabled**.\"\n" +"else=\"This wiki has templates **disabled**.\"\n" +"]]\n" +msgstr "" +"[[!meta title=\"Vorlagen\"]]\n" +"[[!if test=\"enabled(template)\"\n" +"then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n" +"else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n" +"]]\n" + +#. type: Plain text +msgid "" +"Templates are files that can be filled out and inserted into pages in the " +"wiki." +msgstr "" +"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden " +"können." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" + +#. type: Plain text +msgid "These templates are available for inclusion onto other pages in this wiki:" +msgstr "" +"Diese Vorlagen sind verfügbar und können in andere Seiten dieses " +"Wikis eingebettet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" +msgstr "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" + +#. type: Title ## +#, no-wrap +msgid "Using a template" +msgstr "Verwenden einer Vorlage" + +#. type: Plain text +msgid "Using a template works like this:" +msgstr "Eine Vorlage kann folgendermaßen verwendet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my " +"note.\"\"\"]]\n" +msgstr "" +"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine " +"Notiz eingefügt werden soll.\"\"\"]]\n" + +#. type: Plain text +msgid "" +"This fills out the [[note]] template, filling in the `text` field with the " +"specified value, and inserts the result into the page." +msgstr "" +"Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem " +"angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein." + +#. type: Plain text +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 "" +"Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen enthalten, " +"die im Wiki außerhalb der Vorlage zulässig sind. Durch die Verwendung dreier " +"Anführungszeichen können sogar Anführungszeichen enthalten sein. In Kombination " +"mit mehrzeiligen Werten in Anführungszeichen können so große Mengen an " +"zu formatierendem Text in die Vorlage eingefügt werden:" + +#. type: Plain text +#, no-wrap +msgid "" +" \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 " +"notes=\"\"\"\n" +msgstr "" +" \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 " +"notes=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "\\[[Charley]]'s sister." +msgstr "\\[[Thomas]] Schwester." + +#. type: Bullet: ' * ' +msgid "\"I want to be an astronaut when I grow up.\"" +msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\"" + +#. type: Bullet: ' * ' +msgid "Really 8 and a half." +msgstr "Wirklich achteinhalb." + +#. type: Title ## +#, no-wrap +msgid "Creating a template" +msgstr "Erstellen einer Vorlage" + +#. type: Plain text +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 "" +"Um eine Vorlage zu erstellen, füge einfach die Anweisung `template` zu " +"einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der " +"Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im Unterverzeichnis " +"`templates/` des Wiki-Quellverzeichnisses liegt." + +#. type: Plain text +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 "" +"Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::Template]], " +"das die Umsetzung auch komplexer Vorhaben ermöglicht. In seiner Dokumentation " +"ist die vollständige Syntax beschrieben, zur Verwendung muss man aber nur " +"das Folgende wirklich wissen:" + +#. type: Bullet: '* ' +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 "" +"Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine " +"Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige " +"vordefinierte Variablen wie PAGE und BASENAME." + +#. type: Bullet: '* ' +msgid "" +"To insert the value of a variable, use `<TMPL_VAR variable>`. Wiki markup in " +"the value will first be converted to html." +msgstr "" +"Um den Wert einer Variable einzufügen, verwende `<TMPL_VAR Variable>`. " +"Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden." + +#. type: Bullet: '* ' +msgid "" +"To insert the raw value of a variable, with wiki markup not yet converted to " +"html, use `<TMPL_VAR raw_variable>`." +msgstr "" +"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten " +"Wiki-Formatierungsanweisungen enthält, verwende `<TMPL_VAR raw_Variable>`." + +#. type: Bullet: '* ' +msgid "" +"To make a block of text conditional on a variable being set use `<TMPL_IF " +"NAME=\"variable\">text</TMPL_IF>`." +msgstr "" +"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable gesetzt " +"ist, " +"verwende `<TMPL_IF NAME=\"Variable\">Text</TMPL_IF>`." + +#. type: Bullet: '* ' +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 "" +"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen " +"anderen, wenn sie es nicht ist, verwende `<TMPL_IF " +"NAME=\"Variable\">Text<TMPL_ELSE>anderer Text</TMPL_IF>`." + +#. type: Plain text +msgid "Here's a sample template:" +msgstr "Hier ist eine Beispiel-Vorlage:" + +#. type: Plain text +#, no-wrap +msgid "" +" <span class=\"infobox\">\n" +" Name: \\[[<TMPL_VAR raw_name>]]<br />\n" +" Age: <TMPL_VAR age><br />\n" +" <TMPL_IF NAME=\"color\">\n" +" Favorite color: <TMPL_VAR color><br />\n" +" <TMPL_ELSE>\n" +" No favorite color.<br />\n" +" </TMPL_IF>\n" +" <TMPL_IF NAME=\"notes\">\n" +" <hr />\n" +" <TMPL_VAR notes>\n" +" </TMPL_IF>\n" +" </span>\n" +msgstr "" +" <span class=\"infobox\">\n" +" Name: \\[[<TMPL_VAR raw_name>]]<br />\n" +" Alter: <TMPL_VAR age><br />\n" +" <TMPL_IF NAME=\"color\">\n" +" Lieblingsfarbe: <TMPL_VAR color><br />\n" +" <TMPL_ELSE>\n" +" Keine Lieblingsfarbe.<br />\n" +" </TMPL_IF>\n" +" <TMPL_IF NAME=\"notes\">\n" +" <hr />\n" +" <TMPL_VAR notes>\n" +" </TMPL_IF>\n" +" </span>\n" + +#. type: Plain text +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 "" +"Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, die " +"sie enthält, man kann also WikiLinks und alle anderen Arten von " +"Wiki-Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass " +"solche WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die " +"die Vorlage verwendet." + +#. type: Plain text +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 "" +"Beachte auch die Verwendung von `raw_name` innerhalb des Generators für " +"den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach HTML " +"konvertiert wird, selbst wenn er etwas enthält, was für eine " +"Wiki-Formatierungsanweisung gehalten werden könnte, bevor er als " +"[[ikiwiki/WikiLink]] verarbeitet wird." + + diff --git a/po/underlays/basewiki/templates/note.de.po b/po/underlays/basewiki/templates/note.de.po new file mode 100644 index 000000000..c408d11a0 --- /dev/null +++ b/po/underlays/basewiki/templates/note.de.po @@ -0,0 +1,42 @@ +# German translation of basewiki/templates/note page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 20:04+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"<div class=\"notebox\">\n" +"<TMPL_VAR text>\n" +"</div>\n" +"<TMPL_UNLESS NAME=\"text\">\n" +"Use this template to insert a note into a page. The note will be styled to\n" +"float to the right of other text on the page. This template has one\n" +"parameter:\n" +"<ul>\n" +"<li>`text` - the text to display in the note\n" +"</ul>\n" +"</TMPL_UNLESS>\n" +msgstr "" +"<div class=\"notebox\">\n" +"<TMPL_VAR text>\n" +"</div>\n" +"<TMPL_UNLESS NAME=\"text\">\n" +"Verwende diese Vorlage, um eine Notiz in eine Seite einzufügen. Die Notiz\n" +"wird rechts vom restlichen Text der Seite schwebend angezeigt werden.\n" +"Diese Vorlage hat einen Parameter:" +"<ul>\n" +"<li>`text` - der Text, der in der Notiz angezeigt werden soll.\n" +"</ul>\n" +"</TMPL_UNLESS>\n" + diff --git a/po/underlays/basewiki/templates/popup.de.po b/po/underlays/basewiki/templates/popup.de.po new file mode 100644 index 000000000..c75b79d94 --- /dev/null +++ b/po/underlays/basewiki/templates/popup.de.po @@ -0,0 +1,59 @@ +# German translation of basewiki/templates/popup page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 20:08+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"<TMPL_UNLESS NAME=\"mouseover\">\n" +"Use this template to create a popup window that is displayed when the " +"mouse\n" +"is over part of the page. This template has two parameters:\n" +"<ul>\n" +"<li>`mouseover` - This is the text or other content that triggers the\n" +"popup.\n" +"<li>`popup` - This should be the content of the popup window. It can be\n" +"anything, even images or a whole little wiki page, but should not be too\n" +"large for good usability.\n" +"</ul>\n" +"Note that browsers that do not support the CSS will display the popup\n" +"inline in the page, inside square brackets.\n" +"</TMPL_UNLESS>\n" +"<span class=\"popup\"><TMPL_VAR mouseover>\n" +"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR " +"popup></span><span class=\"paren\">]</span>\n" +"</span>\n" +msgstr "" +"<TMPL_UNLESS NAME=\"mouseover\">\n" +"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die " +"Maus\n" +"über diesem Teil der Seite befindet. Dies Vorlage hat zwei Parameter:\n" +"<ul>\n" +"<li>`mouseover` - Dies ist der Text oder andere Inhalt, der das " +"Popup-Fenster\n" +"auslöst.\n" +"<li>`popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig " +"sein,\n" +"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter " +"Benutzbarkeit\n" +"sollte er aber nicht zu groß sein." +"</ul>\n" +"Beachte, dass Browser, die CSS nicht unterstützen, das Popup innerhalb\n" +"der Seite anzeigen, eingerahmt durch eckige Klammern.\n" +"</TMPL_UNLESS>\n" +"<span class=\"popup\"><TMPL_VAR mouseover>\n" +"<span class=\"paren\">[</span><span class=\"balloon\"><TMPL_VAR " +"popup></span><span class=\"paren\">]</span>\n" +"</span>\n" + diff --git a/po/underlays/directives/ikiwiki/directive/aggregate.de.po b/po/underlays/directives/ikiwiki/directive/aggregate.de.po new file mode 100644 index 000000000..07803ffb9 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/aggregate.de.po @@ -0,0 +1,189 @@ +# German translation of directives/ikiwiki/directive/aggregate page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:56+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +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 "" +"Die `aggregate`-Anweisung wird durch die [[!iki plugins/aggregate " +"desc=aggregate]]-Erweiterung zur Verfügung gestellt. Diese Erweiterung erfordert " +"zusätzliche Konfiguration, insbesondere einen cron-Job. Für Details siehe die " +"Dokumentation der Erweiterung." + +#. type: Plain text +msgid "" +"This directive allows content from other feeds to be aggregated into the " +"wiki. Aggregate a feed as follows:" +msgstr "" +"Diese Anweisung erlaubt es, Inhalt von anderen Feeds in diesem Wiki " +"gesammelt zur Verfügung zu stellen. Dies funktioniert wie folgt:" + +#. type: Plain text +#, 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 "" +"\t\\[[!aggregate name=\"Beispiel-Blog\" dir=\"beispiel\"\n" +"\tfeedurl=\"http://beispiel.de/index.rss\"\n" +"\turl=\"http://beispiel.de/\" updateinterval=\"15\"]]\n" + +#. type: Plain text +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 "" +"In diesem Beispiel werden Beiträge aus dem angegebenen RSS-Feed " +"eingesammelt, und zwar nicht öfter als alle 15 Minuten (möglicherweise " +"aber seltener, wenn der cron-Job seltener läuft), und dann als eine Seite " +"pro Beitrag im Verzeichnis `beispiel/` des Wikis gespeichert." + +#. type: Plain text +msgid "" +"You can then use ikiwiki's [[inline]] directive to create a blog of one or " +"more aggregated feeds. For example:" +msgstr "" +"Man kann dann ikiwikis [[inline]]-Anweisun nutzen, um einen Blog aus " +"einem oder mehreren eingesammelten Feeds zu erstellen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"internal(example/*)\"]]\n" +msgstr "\t\\[[!inline pages=\"internal(beispiel/*)\"]]\n" + +#. type: Plain text +msgid "" +"Note the use of `internal()` in the [[ikiwiki/PageSpec]] to match aggregated " +"pages. By default, aggregated pages are internal pages, which prevents them " +"from showing up directly in the wiki, and so this special [[PageSpec]] is " +"needed to match them." +msgstr "" +"Dabei ist es wichtig, `internal()` in der [[ikiwiki/PageSpec]] zur Erfassung der " +"eingesammelten Seiten zu verwenden. Diese werden standardmäßig als interne " +"Seiten gespeichert: Dies verhindert, dass sie direkt im Wiki auftauchen. Deshalb " +"ist diese spezielle [[ikiwiki/PageSpec]] nötig, um sie zu erfassen." + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"Here are descriptions of all the supported parameters to the `aggregate` " +"directive:" +msgstr "" +"Hier die Beschreibung aller unterstützter Parameter der " +"`aggregate`-Anweisung:" + +#. type: Bullet: '* ' +msgid "`name` - A name for the feed. Each feed must have a unique name. Required." +msgstr "" +"`name` - Ein Name für den Feed. Jeder Feed muss einen nur einmal vergebenen " +"Namen haben. Erforderlich." + +#. type: Bullet: '* ' +msgid "" +"`url` - The url to the web page for the feed that's being aggregated. " +"Required." +msgstr "" +"`url` - Die URL mit der Webseite des Feeds, der eingesammelt werden soll. " +"Erforderlich." + +#. type: Bullet: '* ' +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 "" +"`dir` - Das Verzeichnis im Wiki, in dem die Seiten gespeichert werden sollen. " +"Optional, wenn nicht angegeben, wird der Verzeichnisname vom Namen des Feeds " +"abgeleitet." + +#. type: Bullet: '* ' +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 "" +"`feedurl` - Die URL des Feeds. Optional, wenn nicht angegeben, sucht ikiwiki in " +"unter der `url` nach feeds. Unterstützt werden RSS- und Atom-Feeds." + +#. type: Bullet: '* ' +msgid "" +"`updateinterval` - How often to check for new posts, in minutes. Default is " +"15 minutes." +msgstr "" +"`updateinterval` - Wie oft nach neuen Beiträgen geschaut werden soll. " +"Voreingestellt sind 15 Minuten." + +#. type: Bullet: '* ' +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 "" +"`expireage` - Entferne alte Einträge aus diesem Feed, wenn sie älter sind als " +"die angegebene Anzahl von Tagen. Voreingestellt ist, niemals Einträge aufgrund " +"ihres Alters zu entfernen." + +#. type: Bullet: '* ' +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 "" +"`expirecount` - Entferne alte Einträge aus diesem Feed, wenn es insgesamt mehr " +"als die angegebene Anzahl von Beiträgen gibt. Die ältesten Einträge werden " +"zuerst entfernt. Voreingestellt ist, niemals Einträge aufgrund der Anzahl zu " +"entfernen." + +#. type: Bullet: '* ' +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 "" +"`tag` - Ein Tag, mit dem alle Beiträge dieses Feeds versehen werden. Gut eignet " +"sich der Name des Feeds. Kann mehrmals angegeben werden. Die [[tag]]-Erweiterung " +"muss " +"aktiviert sein, damit dies funktioniert." + +#. type: Bullet: '* ' +msgid "" +"`template` - Template to use for creating the aggregated pages. Defaults to " +"aggregatepost." +msgstr "" +"`template` - Vorlage, die bei der Erstellung der eingesammelten Seiten verwendet " +"wird. Voreingestellt ist `aggregatepost`." + +#. type: Plain text +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 "" +"Dabei ist zu beachten, dass die beim Einsammeln erstellten Seiten nicht in der " +"Versionsverwaltung registriert werden, selbst wenn subversion oder ein " +"anderes solches System verwendet wird." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po new file mode 100644 index 000000000..773eb95ae --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po @@ -0,0 +1,57 @@ +# German translation of directives/ikiwiki/directive/brokenlinks page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:57+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `brokenlinks` directive is supplied by the [[!iki plugins/brokenlinks " +"desc=brokenlinks]] plugin." +msgstr "" +"Die `brokenlinks`-Anweisung wird durch die [[!iki plugins/brokenlinks " +"desc=brokenlinks]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung erzeugt eine Liste aller defekter Links im Wiki. Dies ist " +"ein nützlicher Weg zu erfahren, welche Seiten noch geschrieben werden " +"müssen und welche Links Fehler enthalten." + +#. type: Plain text +msgid "" +"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying " +"the pages to search for broken links, default is search them all." +msgstr "" +"Der optionale Parameter `pages` kann eine [[ikiwiki/PageSpec]] enthalten, " +"die angibt welche Seiten nach defekten Links durchsucht werden sollen. " +"Standardmäßig werden alle durchsucht." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n" +msgstr "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/calendar.de.po b/po/underlays/directives/ikiwiki/directive/calendar.de.po new file mode 100644 index 000000000..56a8c7e7e --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/calendar.de.po @@ -0,0 +1,183 @@ +# German translation of directives/ikiwiki/directive/calendar page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:57+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `calendar` directive is supplied by the [[!iki plugins/calendar " +"desc=calendar]] plugin." +msgstr "" +"Die `calendar`-Anweisung wird durch die [[!iki plugins/calendar " +"desc=calendar]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive displays a calendar, similar to the typical calendars shown " +"on some blogs." +msgstr "" +"Diese Anweisung zeigt einen Kalender, ähnlich denen, die auf manchen Blogs " +"angezeigt werden." + +#. type: Title # +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!calendar ]]\n" +msgstr "\t\\[[!calendar ]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n" +msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and " +"!*/Discussion\"]]\n" +msgstr "" +"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and " +"!*/Discussion\"]]\n" + +#. type: Title ## +#, no-wrap +msgid "setup" +msgstr "Einrichtung" + +#. type: Plain text +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. 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)." +msgstr "" +"Der Kalender ist im Wesentlichen eine schicke Schnittstelle zu einem Archiv mit " +"früheren Seiten und wird normalerweise für Blogs verwendet. Er kann einen " +"Kalender für einen angegebenen Monat erzeugen, oder eine Liste der Monate eines " +"angegebenen Jahres. Der Kalender im Jahresformat enthält einfach Links zu den " +"Archivseiten mit Namen wie `archiv/2007` (für ganz 2007) und `archiv/2007/01` " +"(für Januar 2007)." + +#. type: Plain text +msgid "" +"While you can insert calendar directives anywhere on your wiki, including in " +"the sidebar, you'll also need to create these archive pages. They typically " +"use this directive to display a calendar, and also use [[inline]] to display " +"or list pages created in the given time frame." +msgstr "" +"Während `calendar`-Anweisungen überall im Wiki verwendet werden können, auch in " +"der Sidebar, muss man auch die Archiv-Seiten anlegen. Dort wird typischerweise " +"diese Anweisung verwendet, um einen Kalender anzuzeigen, und außerdem die Seiten " +"aus dem entsprechenden Zeitraum über [[inline]] eingebunden." + +#. type: Plain text +msgid "" +"The `ikiwiki-calendar` command can be used to automatically generate the " +"archive pages. It also refreshes the wiki, updating the calendars to " +"highlight the current day. This command is typically run at midnight from " +"cron. An example crontab:" +msgstr "" +"Der `ikiwiki-calendar`-Befehl kann verwendet werden, um die Archivseiten " +"automatisch zu erzeugen. Es aktualisiert auch das Wiki und hebt in den Kalendern " +"den aktuellen Tag hervor. Dieser Befehl wird typischerweise um Mitternacht von " +"cron ausgeführt, beispielsweise durch folgenden crontab-Eintrag:" + +#. type: Plain text +msgid "An example crontab:" +msgstr "Ein Beispiel-Eintrag in crontab:" + +#. type: Plain text +#, no-wrap +msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n" +msgstr "" +"\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Bullet: '* ' +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` - Hiermit wird die Art des zu erzeugenden Kalenders angegeben. Kann " +"entweder \"month\" oder \"year\" sein. Vorgeingestellt ist die Monatsansicht." + +#. type: Bullet: '* ' +msgid "" +"`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the " +"month calendar. Defaults to \"*\"." +msgstr "" +"`pages` - Gibt die [[ikiwiki/PageSpec]] der Seiten an, auf die aus dem " +"Monatskalender verwiesen werden soll. Voreingestellt ist \"*\"." + +#. type: Bullet: '* ' +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 "" +"`archivebase` - Konfiguriert die Basis der Archiv-Hierarchie. Voreingestellt ist " +"\"archives\". Dies kann auch für das gesamte Wiki geändert werden, indem " +"`archivebase` in der Setup-Datei von ikiwiki gesetzt wird." + +#. type: Bullet: '* ' +msgid "" +"`year` - The year for which the calendar is requested. Defaults to the " +"current year." +msgstr "" +"`year` - Das Jahr, für das der Kalender angezeigt werden soll. Voreingestellt ist " +"das aktuelle Jahr." + +#. type: Bullet: '* ' +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 "" +"`month` - Der Monat, für den der Kalender angezeigt werden soll, als Zahl von 1 " +"bis 12. Wird nur für Monatskalender verwendet. Voreingestellt ist der aktuelle " +"Monat." + +#. type: Bullet: '* ' +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 "" +"`week_start_day` - Eine Zahl aus dem Bereich 0 bis 6, die den Wochentag angibt, " +"mit dem ein Monatskalender anfängt. 0 ist Sonntag, 1 ist Montag, und so weiter. " +"Voreingestellt ist 0, also Sonntag." + +#. type: Bullet: '* ' +msgid "" +"`months_per_row` - In the annual calendar, number of months to place in each " +"row. Defaults to 3." +msgstr "" +"`months_per_row` - Anzahl der Monate, die in einem Jahreskalender in einer Zeile " +"platziert werden. Voreingestellt ist 3." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/color.de.po b/po/underlays/directives/ikiwiki/directive/color.de.po new file mode 100644 index 000000000..48cd5736f --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/color.de.po @@ -0,0 +1,97 @@ +# German translation of directives/ikiwiki/directive/color page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:58+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `color` directive is supplied by the [[!iki plugins/color desc=color]] " +"plugin." +msgstr "" +"Die `color`-Anweisung wird durch die [[!iki plugins/color " +"desc=color]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung kann verwendet werden, um ein Stück Text auf einer Seite zu " +"färben. Sie kann die Schrift- und/oder Hintergrundfarbe verändern." + +#. type: Plain text +msgid "" +"You can use a color name (e.g. `white`) or HTML code (e.g. `#ffffff`) to " +"define colors." +msgstr "" +"Man kann einen Farbnamen (z.B. `white`) oder HTML-Code (z.B. `#ffffff`) " +"verwenden, um eine Farbe zu definieren." + +#. type: Title ## +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +msgid "" +"Here the foreground color is defined as a word, while the background color " +"is defined as a HTML color code:" +msgstr "" +"Hier wird die Schriftfarbe durch ein Wort und die Hintergrundfarbe durch eine " +"HTML-Farbe definiert:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!color foreground=white background=#ff0000 text=\"White text on red " +"background\"]]\n" +msgstr "" +"\t\\[[!color foreground=white background=#ff0000 text=\"Weißer Text auf rotem " +"Hintergrund\"]]\n" + +#. type: Plain text +msgid "" +"The background color is missing, so the text is displayed on default " +"background:" +msgstr "" +"Die Hintergrundfarbe fehlt, also wird der Text auf dem Standardhintergrund " +"dargestellt:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!color foreground=white text=\"White text on default color " +"background\"]]\n" +msgstr "" +"\t\\[[!color foreground=white text=\"Weißer Text auf Hintergrund in " +"Standardfarbe\"]]\n" + +#. type: Plain text +msgid "The foreground is missing, so the text has the default foreground color:" +msgstr "Die Schriftfarbe fehlt, also wird hierfür die Standardfarbe verwendet:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!color background=#ff0000 text=\"Default color text on red " +"background\"]]\n" +msgstr "" +"\t\\[[!color background=#ff0000 text=\"Schrift in Standardfarbe auf rotem " +"Hintergrund\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/comment.de.po b/po/underlays/directives/ikiwiki/directive/comment.de.po new file mode 100644 index 000000000..fed27cf75 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/comment.de.po @@ -0,0 +1,133 @@ +# German translation of directives/ikiwiki/directive/comment page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:58+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `comment` directive is supplied by the [[!iki plugins/comments " +"desc=comments]] plugin, and is used to add a comment to a page. Typically, " +"the directive is the only thing on a comment page, and is filled out by the " +"comment plugin when a user posts a comment." +msgstr "" +"Die `comment`-Anweisung wird durch die [[!iki plugins/comments " +"desc=comments]]-Erweiterung bereitgestellt, und wird zum Hinzufügen von " +"Kommentaren zu einer Seite verwendet. Typischerweise ist diese Anweisung " +"das Einzige auf einer Kommentarseite, und wird von der comment-Erweiterung " +"ausgefüllt, wenn ein Benutzer einen Kommentar veröffentlicht." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!comment format=mdwn\n" +"\tusername=\"foo\"\n" +"\tsubject=\"Bar\"\n" +"\tdate=\"2009-06-02T19:05:01Z\"\n" +"\tcontent=\"\"\"\n" +msgstr "" +"\t\\[[!comment format=mdwn\n" +"\tusername=\"foo\"\n" +"\tsubject=\"Bar\"\n" +"\tdate=\"2009-06-02T19:05:01Z\"\n" +"\tcontent=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tBlah blah.\n" +"\t\"\"\"\n" +msgstr "" +"\tBla bla.\n" +"\t\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\t]]\n" +msgstr "\t]]\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"The only required parameter is `content`, the others just add or override " +"metadata of the comment." +msgstr "" +"Der einzige erforderliche Parameter ist `content`, die übrigen fügen nur " +"Metadaten zu dem Kommentar hinzu oder ändern diese." + +#. type: Bullet: '* ' +msgid "" +"`content` - Text to display for the comment. Note that " +"[[directives|ikiwiki/directive]] may not be allowed, depending on the " +"configuration of the comment plugin." +msgstr "" +"`content` - Text, der in diesem Kommentar angezeigt werden soll. " +"[[Anweisungen|ikiwiki/directive]] sind hier unter Umständen nicht erlaubt, " +"abhängig von der Konfiguration der comment-Erweiterung." + +#. type: Bullet: '* ' +msgid "`format` - Specifies the markup used for the content." +msgstr "" +"`format` - Gibt die Formatierungssprache an, die für den Inhalt verwendet " +"wird." + +#. type: Bullet: '* ' +msgid "`subject` - Subject for the comment." +msgstr "`subject` - Betreff des Kommentars." + +#. type: Bullet: '* ' +msgid "" +"`date` - Date the comment was posted. Can be entered in nearly any format, " +"since it's parsed by [[!cpan TimeDate]]" +msgstr "" +"`date` - Datum, an dem der Kommentar veröffentlicht wurde. Kann in beinahe " +"beliebigem Format angegeben werden, da es von [[!cpan TimeDate]] " +"ausgewertet wird." + +#. type: Bullet: '* ' +msgid "" +"`username` - Used to record the username (or OpenID) of a logged in " +"commenter." +msgstr "" +"`username` - Hier wird der Benutzername (oder die OpenID) eines " +"angemeldeten Kommentators gespeichert." + +#. type: Bullet: '* ' +msgid "" +"`ip` - Can be used to record the IP address of a commenter, if they posted " +"anonymously." +msgstr "" +"`ip` - Hier kann die IP-Adresse eines Kommentators gespeichert werden, wenn " +"der Kommentar anonym abgegeben wurde." + +#. type: Bullet: '* ' +msgid "" +"`claimedauthor` - Records the name that the user entered, if anonymous " +"commenters are allowed to enter their (unverified) name." +msgstr "" +"`claimedauthor` - Speichert den Namen, den der Benutzer angegeben hat, wenn " +"anonyme Kommentatoren ihren (nicht verifizierten) Namen angeben dürfen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/copy.de.po b/po/underlays/directives/ikiwiki/directive/copy.de.po new file mode 100644 index 000000000..54f7caef0 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/copy.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/copy page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 22:05+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/cut.de.po b/po/underlays/directives/ikiwiki/directive/cut.de.po new file mode 100644 index 000000000..54f7caef0 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/cut.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/copy page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 22:05+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.de.po b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po new file mode 100644 index 000000000..b99826e82 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po @@ -0,0 +1,153 @@ +# German translation of directives/ikiwiki/directive/cutpaste page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:59+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `copy`, `cut` and `paste` directives are supplied by the [[!iki " +"plugins/cutpaste desc=cutpaste]] plugin." +msgstr "" +"Die `copy`- `cut`- und `paste`-Anweisungen werden durch die [[!iki " +"plugins/cutpaste desc=cutpaste]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "With these directives you can store and recall pieces of text in a page:" +msgstr "" +"Mit diesen Anweisungen kann man Textabschnitte innerhalb einer Seite " +"speichern und wieder abrufen:" + +#. type: Bullet: ' * ' +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 "" +"`\\[[!cut id=name text=\"text\"]]` merkt sich den Text und erlaubt es, ihn " +"über die angegebene id wieder abzurufen. Der Text taucht an dieser Stelle " +"nicht in der Ausgabe auf." + +#. type: Bullet: ' * ' +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 "" +"`\\[[!copy id=name text=\"text\"]]` merkt sich den Text und erlaubt es, ihn " +"über die angegebene id wieder abzurufen. Der Text *wird* an dieser Stelle " +"ausgegeben." + +#. type: Bullet: ' * ' +msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text." +msgstr "`\\[[!paste id=name]]` wird durch den zuvor gemerkten Text ersetzt." + +#. type: Plain text +msgid "" +"The text being cut, copied and pasted can freely include wiki markup, " +"including more calls to cut, copy and paste." +msgstr "" +"Der ausgeschnittene, kopierte und eingefügte Text kann beliebige " +"Wiki-Formatierungsanweisungen enthalten, inklusive weiterer Aufrufe von " +"`cut`, `copy` und `paste`." + +#. type: Plain text +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 "" +"Man muss sich einen Text nicht vor seiner Verwendung merken: Eine " +"`cut`-Anweisung kann auch erst nach der `paste`-Anweisung kommen, die ihren " +"Text verwendet. Dies ist ein durchaus nützlich, um größere Blöcke von Text " +"wie lange Anmerkungen erst später anzugeben und so für einen natürlicheren " +"Textfluss zu sorgen. Zum Beispiel:" + +#. type: Plain text +#, 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 "" +"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=beschreibungcut]]\"]]\n" +"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=beschreibungcopy]]\"]]\n" +"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=beschreibungpaste]]\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t[...some time later...]\n" +msgstr "\t[… und später …]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=cutlongdesc text=\"\"\"\n" +msgstr "\t\\[[!cut id=beschreibungcut text=\"\"\"\n" + +#. type: Plain text +#: +#, no-wrap +msgid "\t blah blah blah\n" +msgstr "\t bla bla bla\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=copylongdesc text=\"\"\"\n" +msgstr "\t\\[[!cut id=beschreibungcopy text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=pastelongdesc text=\"\"\"\n" +msgstr "\t\\[[!cut id=beschreibungpaste text=\"\"\"\n" + +#. type: Plain text +msgid "" +"This can potentially be used to create loops, but ikiwiki is clever and " +"breaks them." +msgstr "" +"Auf diese Weise können möglicherweise Schleifen erzeugt werden, aber ikiwiki " +"ist schlau und bricht diese auf." + +#. type: Plain text +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 "" +"Da man `paste` ohne Anführungszeichen verwenden kann, können mit `copy` und " +"`paste` Anweisungen ineinander geschachtelt werden, die mehrzeilige Parameter " +"benötigen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toggleable id=foo text=\"\"\"\n" +msgstr "\t\\[[!toggleable id=foo text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\t [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n" +msgstr "\t [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=baz text=\"\"\"\n" +msgstr "\t\\[[!cut id=baz text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\tmultiline parameter!\n" +msgstr "\tmehrzeiliger Parameter!\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/date.de.po b/po/underlays/directives/ikiwiki/directive/date.de.po new file mode 100644 index 000000000..517af753c --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/date.de.po @@ -0,0 +1,64 @@ +# German translation of directives/ikiwiki/directive/date page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:59+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `date` directive is supplied by the [[!iki plugins/date desc=date]] " +"plugin." +msgstr "" +"Die `date`-Anweisung wird durch die [[!iki plugins/date desc=date]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive can be used to display a date on a page, using the same " +"display method that is used to display the modification date in the page " +"footer, and other dates in the wiki. This can be useful for consistency of " +"display, or if you want to embed parseable dates into the page source." +msgstr "" +"Diese Anweisung kann verwendet werden, um ein Datum auf einer Seite anzuzeigen, " +"und verwendet dieselbe Methode, die auch zur Anzeige des Datums der letzten " +"Änderung im Seitenfuß und anderer Daten im Wiki verwendet wird. Dies ist " +"nützlich für die Konsistenz der Ausgabe, oder wenn der Seitenquelltext ein " +"maschinenlesbares Datum enthalten soll." + +#. type: Plain text +msgid "" +"Like the dates used by the [[meta]] directive, the date can be entered in " +"nearly any format, since it's parsed by [[!cpan TimeDate]]." +msgstr "" +"Wie auch in der [[meta]]-Anweisung kann das Datum in nahezu beliebigem Format " +"angegeben werden, da es durch [[!cpan TimeDate]] interpretiert wird." + +#. type: Plain text +msgid "" +"For example, an update to a page with an embedded date stamp could look " +"like:" +msgstr "" +"Zum Beispiel könnte eine Seite mit eingebettetem Zeitstempel folgendermaßen " +"aussehen:" + +#. type: Plain text +#, no-wrap +msgid "\tUpdated \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: mumble mumble\n" +msgstr "" +"\tAktualisiert \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: murmel murmel\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po new file mode 100644 index 000000000..d2ca0c29f --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po @@ -0,0 +1,99 @@ +# German translation of directives/ikiwiki/directive/edittemplate page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:59+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate " +"desc=edittemplate]] plugin." +msgstr "" +"Die `edittemplate`-Anweisung wird durch die [[!iki plugins/edittemplate " +"desc=edittemplate]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung erlaubt es, Vorlagen-Seiten zu registrieren, die einen " +"Standardinhalt für neue Seiten bereitstellen, die über das Webfrontend " +"angelegt werden. Um eine Vorlage zu registrieren, fügt man eine " +"[[ikiwiki/directive/template]]-Anweisung auf einer anderen Seite ein." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n" +msgstr "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n" + +#. type: Plain text +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 "" +"Im obigen Beispiel wird die Seite mit Namen \"bugtemplate\" für alle Seiten " +"als Vorlage registriert, die mit Namen \"bugs/*\" angelegt werden. Um den " +"Hinweis über die Registrierung der Vorlage zu unterdrücken, kann man " +"`silent=yes` hinzufügen." + +#. type: Plain text +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 "" +"Oft enthält eine Vorlagen-Seite ein einfaches Skelett für einen bestimmten " +"Seitentyp. Für die Fehlerberichte aus dem obigen Beispiel könnte sie " +"folgendermaßen aussehen:" + +#. type: Plain text +#, no-wrap +msgid "" +"\tPackage: \n" +"\tVersion: \n" +"\tReproducible: y/n\n" +"\tDetails:\n" +msgstr "" +"\tPaket: \n" +"\tVersion: \n" +"\tReproduzierbar: ja/nein\n" +"\tDetails:\n" + +#. type: Plain text +#, 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 +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 +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" + + diff --git a/po/underlays/directives/ikiwiki/directive/format.de.po b/po/underlays/directives/ikiwiki/directive/format.de.po new file mode 100644 index 000000000..499816ac4 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/format.de.po @@ -0,0 +1,93 @@ +# German translation of directives/ikiwiki/directive/format page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:00+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `format` directive is supplied by the [[!iki plugins/format " +"desc=format]] plugin." +msgstr "" +"Die `format`-Anweisung wird durch die [[!iki plugins/format " +"desc=format]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"The directive allows formatting a chunk of text using any available page " +"format. It takes two parameters. First is the type of format to use, ie the " +"extension that would be used for a standalone file of this type. Second is " +"the text to format." +msgstr "" +"Die Anweisung erlaubt es, einen Textabschnitt mit einem beliebigen " +"Seitenformat zu formatieren. Sie hat zwei Parameter. Der erste ist das zu " +"verwendende Seitenformat – also die Erweiterung, die für eine " +"eigenständige Seite dieses Typs verwendet würde. Der zweite ist der zu " +"formatierende Text." + +#. type: Plain text +msgid "" +"For example, this will embed an otl outline inside a page using mdwn or some " +"other format:" +msgstr "" +"Zum Beispiel bettet dies eine otl-Gliederung in eine Seite ein, die mdwn " +"oder ein anderes Format verwendet:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!format otl \"\"\"\n" +msgstr "\t\\[[!format otl \"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tfoo\n" +"\t\t1\n" +"\t\t2\n" +"\tbar\n" +"\t\t3\n" +"\t\t4\n" +msgstr "" +"\tfoo\n" +"\t\t1\n" +"\t\t2\n" +"\tbar\n" +"\t\t3\n" +"\t\t4\n" + +#. type: Plain text +msgid "" +"Note that if the highlight plugin is enabled, this directive can also be " +"used to display syntax highlighted code. Many languages and formats are " +"supported. For example:" +msgstr "" +"Wenn die highlight-Erweiterung installiert ist, kann diese Anweisung auch " +"zur " +"Anzeige von Programmcode mit Syntaxhervorhebung verwendet werden. Viele " +"Sprachen und Formate werden unterstützt. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!format perl \"\"\"\n" +msgstr "\t\\[[!format perl \"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\tprint \"hello, world\\n\";\n" +msgstr "\tprint \"hello, world\\n\";\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/fortune.de.po b/po/underlays/directives/ikiwiki/directive/fortune.de.po new file mode 100644 index 000000000..1e63609dc --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/fortune.de.po @@ -0,0 +1,42 @@ +# German translation of directives/ikiwiki/directive/fortune page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:00+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `fortune` directive is supplied by the [[!iki plugins/fortune " +"desc=fortune]] plugin." +msgstr "" +"Die `fortune`-Anweisung wird durch die [[!iki plugins/fortune " +"desc=fortune]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This just uses the `fortune` program to insert a fortune cookie into the " +"page. Usage:" +msgstr "" +"Sie verwendet einfach das Programm `fortune`, um einen Spruch (engl. " +"*fortune cookie*) in die Seite einzubinden. Verwendung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!fortune ]]\n" +msgstr "\t\\[[!fortune ]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/graph.de.po b/po/underlays/directives/ikiwiki/directive/graph.de.po new file mode 100644 index 000000000..0d62a55dc --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/graph.de.po @@ -0,0 +1,88 @@ +# German translation of directives/ikiwiki/directive/graph page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:01+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `graph` directive is supplied by the [[!iki plugins/graphviz " +"desc=graphviz]] plugin." +msgstr "" +"Die `graph`-Anweisung wird durch die [[!iki plugins/graphviz " +"desc=graphviz]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows embedding [graphviz](http://www.graphviz.org/) graphs " +"in a page. Example usage:" +msgstr "" +"Diese Anweisung erlaubt es, von [graphviz](http://www.graphviz.org/) " +"erzeugte Graphen in eine Seite einzubinden. Verwendungsbeispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n" +msgstr "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n" + +#. type: Plain text +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 "" +"Zu beachten ist, dass der Graph nur dann in der Vorschau auftaucht, wenn der " +"verwendete Browser [[!wikipedia data: URI]] unterstützt, oder wenn derselbe " +"Graph bereits auf der Seite existiert." + +#. type: Plain text +msgid "The `graph` directive supports the following parameters:" +msgstr "Die `graph`-Anweisung unterstützt die folgenden Parameter:" + +#. type: Bullet: '- ' +msgid "`src` - The graphviz source to render." +msgstr "`src` - Der graphviz-Quelltext des zu erzeugenden Graphen." + +#. type: Bullet: '- ' +msgid "" +"`type` - The type of graph to render: `graph` or `digraph`. Defaults to " +"`digraph`." +msgstr "" +"`type` - Die Art des zu erzeugenden Graphen: `graph` oder `digraph`. " +"Voreingestellt ist `digraph`." + +#. type: Bullet: '- ' +msgid "" +"`prog` - The graphviz program to render with: `dot`, `neato`, `fdp`, " +"`twopi`, or `circo`. Defaults to `dot`." +msgstr "" +"`prog` - Das graphviz-Programm, mit dem der Graph erzeugt werden soll: " +"`dot`, `neato`, `fdp`, " +"`twopi` oder `circo`. Voreingestellt ist `dot`." + +#. type: Bullet: '- ' +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 "" +"`height`, `width` - Begrenzt die Größe des erzeugten Graphen durch die in " +"Inch angegebene Höhe und Breite. Es müssen beide angegeben werden, um die " +"Größe zu beschränken, graphviz sucht sich sonst selbst eine Größe aus, ohne " +"jede Beschränkung." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/haiku.de.po b/po/underlays/directives/ikiwiki/directive/haiku.de.po new file mode 100644 index 000000000..779621673 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/haiku.de.po @@ -0,0 +1,60 @@ +# German translation of directives/ikiwiki/directive/haiku page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:01+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `haiku` directive is supplied by the [[!iki plugins/haiku desc=haiku]] " +"plugin." +msgstr "" +"Die `haiku`-Anweisung wird durch die [[!iki plugins/haiku " +"desc=haiku]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows inserting a randomly generated haiku into a wiki " +"page. Just type:" +msgstr "" +"Diese Anweisung erlaubt es, ein zufällig erzeugtes Haiku in eine Wiki-Seite " +"einzufügen. Dafür genügt:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!haiku hint=\"argument\"]]\n" +msgstr "\t\\[[!haiku hint=\"argument\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!haiku hint=\"argument test\"]]\n" +msgstr "[[!haiku hint=\"argument test\"]]\n" + +#. type: Plain text +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 "" +"Der `hint`-Parameter kann weggelassen werden, er gibt dem Generator nur " +"einen Hinweis, worüber er das Haiku schreiben soll. Wenn kein solcher " +"Hinweis gegeben wird, könnte er den Seitennamen verwenden. Da das ihm " +"bekannte Vokabular sehr klein ist, werden viele Hinweise das Ergebnis in " +"keiner Weise beeinflussen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/if.de.po b/po/underlays/directives/ikiwiki/directive/if.de.po new file mode 100644 index 000000000..337a84bd6 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/if.de.po @@ -0,0 +1,145 @@ +# German translation of directives/ikiwiki/directive/if page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:02+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `if` directive is supplied by the [[!iki plugins/conditional " +"desc=conditional]] plugin." +msgstr "" +"Die `if`-Anweisung wird durch die [[!iki plugins/conditional " +"desc=conditional]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"With this directive, you can make text be conditionally displayed on a " +"page. For example:" +msgstr "" +"Mit dieser Anweisung kann die Anzeige von Text an bestimmte Bedingungen " +"geknüpft werden. Zum Beispiel:" + +#. type: Plain text +#, 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 "" +"\t\\[[!if test=\"enabled(smiley)\"\n" +"\t then=\"Die smiley-Erweiterung ist aktiviert :-)\"\n" +"\t else=\"Hier gibt es keine smiley-Erweiterung …\"]]\n" + +#. type: Plain text +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 "" +"Wenn der angegebene `test` erfolgreich ist, wird der `then`-Text angezeigt, " +"sonst der `else`-Text. Der `else`-Teil ist optional." + +#. type: Plain text +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 "" +"Die Werte für `then` und `else` können beliebige Formatierungsanweisungen " +"enthalten, die außerhalb der Anweisung erlaubt wären. Werten die Werte durch " +"dreifache Anführungszeichen abgetrennt, können sie sogar Anführungszeichen " +"enthalten." + +#. type: Plain text +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 "" +"Der `test` ist eine [[ikiwiki/PageSpec]]; wenn sie auf irgendeine Seite im " +"Wiki passt, hat der Test Erfolg. Dadurch kann man die Existenz einer oder " +"mehrerer Seiten überprüfen, überprüfen ob in einem bestimmten Monat Seiten " +"angelegt wurden, und so weiter." + +#. type: Plain text +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 "" +"Wenn die [[ikiwiki/PageSpec]] nur auf die aktuelle Seite angewendet werden " +"soll, die die Bedingung enthält (und nicht auf alle Seiten im Wiki), kann " +"der optionale `all`-Parameter auf `no` gesetzt werden." + +#. type: Plain text +msgid "" +"In an `if` directive, the regular [[ikiwiki/PageSpec]] syntax is expanded " +"with the following additional tests:" +msgstr "" +"In einer `if`-Anweisung sind neben der regulären [[ikiwiki/PageSpec]]-Syntax " +"die folgenden zusätzlichen Test verfügbar:" + +#. type: Bullet: '* ' +msgid "enabled(plugin)" +msgstr "enabled(plugin)" + +#. type: Plain text +#, no-wrap +msgid " Tests whether the specified plugin is enabled.\n" +msgstr " Prüft, ob die angegebene Erweiterung aktiviert ist.\n" + +#. type: Bullet: '* ' +msgid "sourcepage(glob)" +msgstr "sourcepage(glob)" + +#. type: Plain text +#, no-wrap +msgid "" +" Tests whether the glob matches the name of the page that contains the\n" +" conditional.\n" +msgstr "" +" Prüft, ob das angegebene Muster auf den Namen der Seite passt, die die\n" +" Bedingung enthält.\n" + +#. type: Bullet: '* ' +msgid "destpage(glob)" +msgstr "destpage(glob)" + +#. type: Plain text +#, 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 "" +" Prüft, ob das Muster auf den namen der Seite passt, die gerade erzeugt\n" +" wird. Dies kann ein anderer Name sein als der der Seite, die die " +"Bedingung\n" +" enthält, wenn diese über [[inline]] in eine andere Seite eingebunden wird." +"\n" + +#. type: Bullet: '* ' +msgid "included()" +msgstr "included()" + +#. type: Plain text +#, no-wrap +msgid " Tests whether the page is being included onto another page.\n" +msgstr " Prüft, ob die Seite gerade in eine andere eingebunden wird.\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/img.de.po b/po/underlays/directives/ikiwiki/directive/img.de.po new file mode 100644 index 000000000..9ebdae5bc --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/img.de.po @@ -0,0 +1,115 @@ +# German translation of directives/ikiwiki/directive/img page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:02+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin." +msgstr "" +"Die `img`-Anweisung wird durch die [[!iki plugins/img desc=img]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung verarbeitet Bilder. Während ikiwiki das Einbinden von Bildern in " +"voller Größe durch einen [[ikiwiki/WikiLink]] auf das Bild unterstützt, kann man " +"mit dieser Anweisung ein Bild einfach herunterskalieren, um es in eine Seite " +"einzubinden, und einen Link auf das Bild in Originalgröße setzen." + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!img image1.jpg size=\"200x200\" alt=\"clouds\"]]\n" +msgstr "\t\\[[!img image1.jpeg size=\"200x200\" alt=\"Wolken\"]]\n" + +#. type: Plain text +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 "" +"Diese Bilddatei wird nach den gleichen Regeln gesucht wie das Ziel eines " +"[[ikiwiki/WikiLink]]." + +#. type: Plain text +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 "" +"Der Parameter `size` ist optional, voreingestellt ist die volle Größe. Das " +"Seitenverhältnis des Originalbildes wird immer bewahrt, auch wenn das Bild " +"dadurch kleiner wird als angegeben. Man kann auch nur die Breite oder nur die " +"Höhe angeben, dann wird der jeweils andere Wert automatisch berechnet: `200x`, " +"`x200`." + +#. type: Plain text +msgid "" +"You can also pass `alt`, `title`, `class`, `align` 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 "" +"Man kann auch die Parameter `alt`, `title`, `class`, `align` und `id` übergeben. " +"Diese werden an den img-Tag im erzeugten HTML-Code weitergereicht. Wird der " +"Parameter `caption` angegeben, wird sein Wert unter dem Bild zentriert angezeigt." + +#. type: Plain text +msgid "" +"The `link` parameter is used to control whether the scaled 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 "" +"Der Parameter `link` steuert, ob herunterskalierte Bilder mit dem Originalbild " +"verlinkt werden. In der Voreinstellung ist dies der Fall; mit `link=AndereSeite` " +"zeigt der Link auf eine andere Seite, mit `link=no` wird der Link deaktiviert, " +"mit `link=http://url` zeigt er auf die angegebene URL." + +#. type: Plain text +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 "" +"Man kann auch die Voreinstellung für die weiter unten auf der Seite eingebundenen " +"Bilder verändern. Dies ist nützlich, wenn es auf einer Seite viele Bilder gibt." + +#. type: Plain text +#, 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 "" +"\t\\[[!img defaults size=200x200 alt=\"Hochzeitsfoto\"]]\n" +"\t\\[[!img photo1.jpg]]\n" +"\t\\[[!img photo2.jpg]]\n" +"\t\\[[!img photo3.jpg size=200x600]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/inline.de.po b/po/underlays/directives/ikiwiki/directive/inline.de.po new file mode 100644 index 000000000..429ea59a3 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/inline.de.po @@ -0,0 +1,385 @@ +# German translation of directives/ikiwiki/directive/inline page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:02+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `inline` directive is supplied by the [[!iki plugins/inline " +"desc=inline]] plugin." +msgstr "" +"Die `inline`-Anweisung wird durch die [[!iki plugins/inline " +"desc=inline]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung erlaubt das Einbinden einer Wiki-Seite in eine andere. Die " +"häufigste Verwendung ist das Erzeugen von Blogs und RSS- oder Atom-Feeds." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, 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 +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 "" +"Es wird jede Seite Teil des Blogs, die auf die angegebene [[PageSpec]] passt " +"(im Beispiel jede [[Unterseite|subpage]] von \"blog\"), und die zehn neusten " +"davon erscheinen auf der Seite. Übrigens werden Dateien, die keine Seiten sind " +"und auf die [[PageSpec]] passen, als RSS-Einbettungen Teil des Feeds: Dies ist " +"nützlich für Podcasts." + +#. type: Plain text +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 "" +"Der optionale Parameter `rootpage` teilt dem Wiki mit, dass neue Einträge in " +"diesem Blog [[Unterseiten|subpage]] von \"blog\" sein sollen; in diesem Fall " +"wird ein Formular zum Hinzufügen neuer Beiträge am Anfang der Seite angezeigt." + +#. type: Plain text +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 "" +"Wenn es zu einem Blog eine Archivseite mit allen bisherigen Einträgen geben " +"soll, kann dies wie folgt erreicht werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n" +msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n" + +#. type: Plain text +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 "" +"Mit dem folgenden Code kann man sogar eine automatisch erzeugte Liste mit " +"allen Seiten des Wikis erstellen (die neuesten erscheinen oben):" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n" +msgstr "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n" + +#. type: Plain text +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 "" +"Es ist auch möglich, dass Seiten durch das Hinzufügen eines Tags Teil des " +"Blogs werden. Hierzu kann auf der betreffenden Seite einfach ein Link auf die " +"Seite (oder die Seiten) erstellt, die die Tags repräsentieren. Dann kann die " +"spezielle `link()`-[[PageSpec]] verwendet werden, um alle Seiten mit einem " +"gegebenen Tag zu erfassen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"link(life)\"]]\n" +msgstr "\t\\[[!inline pages=\"link(life)\"]]\n" + +#. type: Plain text +msgid "Or include some tags and exclude others:" +msgstr "" +"Es ist auch möglich, bestimmte Tags inzuschließen, während andere " +"ausgeschlossen werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n" +msgstr "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"There are many parameters you can use with the `inline` directive. These are " +"the commonly used ones:" +msgstr "" +"Es gibt viele Parameter, die man mit der `inline`-Anweisung verwenden kann. " +"Dies sind die am häufigsten benutzten:" + +#. type: Bullet: '* ' +msgid "`pages` - A [[PageSpec]] of the pages to inline." +msgstr "`pages` - Eine [[PageSpec]] der einzubindenden Seiten." + +#. type: Bullet: '* ' +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` - Gibt die maximale Anzahl von Seiten an, die eingebunden werden sollen." +" Voreingestellt sind 10, außer wenn archiviert wird, dass sind es alle. Ist " +"der Wert 0, werden alle passenden Seiten angezeigt." + +#. type: Bullet: '* ' +msgid "" +"`archive` - If set to \"yes\", only list page titles and some metadata, not " +"full contents." +msgstr "" +"`archive` - Hat dieser Parameter den Wert `yes`, werden nur der Titel und " +"einige Metadaten angezeigt, aber nicht der komplette Inhalt." + +#. type: Bullet: '* ' +msgid "" +"`description` - Sets the description of the rss feed if one is generated. " +"Defaults to the name of the wiki." +msgstr "" +"`description` - Setzt die Beschreibung des RSS-Feeds, wenn einer erzeugt wird. " +"Voreingestellt ist der Name des Wikis." + +#. type: Bullet: '* ' +msgid "" +"`skip` - Specify a number of pages to skip displaying. Can be useful to " +"produce a feed that only shows archived pages." +msgstr "" +"`skip` - Gibt die Anzahl von Seiten an, die bei der Anzeige übersprungen " +"werden. Dies kann nützlich sein, um einen Feed zu erstellen, der nur " +"archivierte Seiten enthält." + +#. type: Bullet: '* ' +msgid "`postform` - Set to \"yes\" to enable a form to post new pages to a blog." +msgstr "" +"`postform` - Bei dem Wert `yes`, wird ein Formular zum Erstellen neuer " +"Einträge in dem Blog angezeigt." + +#. type: Bullet: '* ' +msgid "`postformtext` - Set to specify text that is displayed in a postform." +msgstr "`postformtext` - Gibt an, welcher Text im 'postform' angezeigt wird." + +#. type: Bullet: '* ' +msgid "" +"`rootpage` - Enables the postform, and allows controling where newly posted " +"pages should go, by specifiying the page that they should be a [[SubPage]] " +"of." +msgstr "" +"`rootpage` - Aktiviert `postform` und erlaubt gleichzeitig die Kontrolle " +"darüber, wo neu erstellte Seiten landen sollen, indem eine Seite angegeben " +"wird, deren [[Unterseite|subpage]] die neuen Seiten werden sollen." + +#. type: Plain text +msgid "Here are some less often needed parameters:" +msgstr "Hier sind einige weniger häufig benötigte Parameter:" + +#. type: Bullet: '* ' +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` - Wenn `yes`, füge Links zum Bearbeiten und zur Diskussion am " +"unteren Ende jeder eingebundenen Seite ein (wenn sie im Kopf der jeweiligen " +"Seite angezeigt werden würden)." + +#. type: Bullet: '* ' +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` - Steuert die Erzeugung eines RSS-Feeds. Wenn das Wiki so konfiguriert " +"ist, dass es standardmäßig RSS-Feeds erzeugt, kann dies durch den Wert `no` " +"verhindert werden. Wenn das Wiki RSS erlaubt (`allowrss` in der " +"Konfigurationsdatei), dann kann der RSS-Feed mit `yes` aktiviert werden." + +#. type: Bullet: '* ' +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` - Steuert die Erzeugung eines Atom-Feeds. Wenn das Wiki so konfiguriert " +"ist, dass es standardmäßig Atom-Feeds erzeugt, kann dies durch den Wert `no` " +"verhindert werden. Wenn das Wiki Atom erlaubt (`allowatom` in der " +"Konfigurationsdatei), dann kann der Atom-Feed mit `yes` aktiviert werden." + +#. type: Bullet: '* ' +msgid "" +"`feeds` - controls generation of all types of feeds. Set to \"no\" to " +"disable generating any feeds." +msgstr "" +"`feeds` - Steuert die Erzeugung aller Feed-Typen. Ein Wert von `no` " +"unterdrückt alle Feeds." + +#. type: Bullet: '* ' +msgid "" +"`emptyfeeds` - Set to \"no\" to disable generation of empty feeds. Has no " +"effect if `rootpage` or `postform` is set." +msgstr "" +"`emptyfeeds` - Bei `no` werden keine leeren Feeds erzeugt. Dies hat keine " +"Auswirkung, wenn `rootpage` oder `postform` aktiv sind." + +#. type: Bullet: '* ' +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 or " +"the `microblog` template, optimised for microblogging. Note that you should " +"still set `archive=yes` if your custom template does not include the page " +"content." +msgstr "" +"`template` - Gibt die Vorlage an, die für die Anzeige der einzelnen " +"eingebundenen Seiten verwendet wird. Voreingestellt ist die " +"`inlinepage`-Vorlage, für Archive wird `archivepage` verwendet. Es können auch " +"andere, angepasste Vorlagen verwendet werden, etwa `titlepage` (zeigt nur die " +"Titel der Blog-Einträge) oder `microblog` (optimiert für Microblogging). Wenn " +"die angepasste Vorlage den Seiteninhalt nicht einbindet, kann zusätzlich " +"`archive=yes` gesetzt werden." + +#. type: Bullet: '* ' +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` - Statt des voreingestellten Verhaltens, einen Blog zu erzeugen, wird " +"bei `raw=yes` die Seite ohne zusätzliches Drumherum eingebunden, als ob sie " +"ein Teil des Quelltextes der einbindenden Seite wäre." + +#. type: Bullet: '* ' +msgid "" +"`sort` - Controls how inlined pages are [[sorted|pagespec/sorting]]. The " +"default is to sort the newest created pages first." +msgstr "" +"`sort` - Steuert wie die eingebundenen Seiten [[sortiert|pagespec/sorting]] " +"werden. In der Voreinstellung kommen die zuletzt angelegten Seiten zuerst." + +#. type: Bullet: '* ' +msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed." +msgstr "`reverse` - Bei `yes` wird die Sortierung umgekehrt." + +#. type: Bullet: '* ' +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` - Gibt an, wie viele Seiten höchstens in den RSS- und Atom-Feeds " +"eingebunden werden. Voreingestellt ist der Wert von `show`." + +#. type: Bullet: '* ' +msgid "" +"`feedonly` - Only generate the feed, do not display the pages inline on the " +"page." +msgstr "" +"`feedonly` - Erzeuge nur den Feed, zeige die Seiten nicht eingebettet auf der " +"Seite an." + +#. type: Bullet: '* ' +msgid "" +"`quick` - Build archives in quick mode, without reading page contents for " +"metadata. This also turns off generation of any feeds." +msgstr "" +"`quick` - Erzeuge Archive im Schnelldurchlauf, ohne im Seiteninhalt nach " +"Metadaten zu suchen. Dies deaktiviert auch das Erzeugen von Feeds." + +#. type: Bullet: '* ' +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` - Hiermit kann gesteuert werden, wie die Zeit oder das Datum der " +"Blogeinträge dargestellt wird. Der Wert wird an die Funktion strftime(3) " +"weitergereicht." + +#. type: Bullet: '* ' +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 " +"matched by that value are included, but some of those can be excluded by " +"specifying a tighter [[PageSpec]] here." +msgstr "" +"`feedpages` - Eine [[PageSpec]] mit Seiten, die im RSS- bzw. Atom-Feed " +"auftachen sollen. Voreingestellt ist der Wert von `pages`, und nur Seiten die " +"darauf passen werden eingebunden, aber einige davon können ausgeschlossen " +"werden, indem hier eine striktere [[PageSpec]] angegeben wird." + +#. type: Bullet: '* ' +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` - Wenn hier eine URI angegeben wird (möglicherweise eine UUID mit " +"Präfix `urn:uuid:`), dann hat der Atom-Feed diese als seine `<id>`. " +"Voreingestellt ist der Name der Seite, die die inline-Anweisung enthält." + +#. type: Bullet: '* ' +msgid "" +"`feedfile` - Can be used to change the name of the file generated for the " +"feed. This is particularly useful if a page contains multiple feeds. For " +"example, set \"feedfile=feed\" to cause it to generate `page/feed.atom` " +"and/or `page/feed.rss`. This option is not supported if the wiki is " +"configured not to use `usedirs`." +msgstr "" +"`feedfile` - Hiermit kann der Name der Datei verändert werden, die für den " +"Feed erzeugt wird. Dies ist insbesondere dann nützlich, wenn eine Seite " +"mehrere Feeds enthält. Zum Beispiel kann man `feedfile=feed` setzen, um " +"`page/feed.atom` und/oder `page/feed.rss` zu erzeugen. Diese Option ist nicht " +"verfügbar, wenn das Wiki die Option `usedirs` nicht verwendet." + +#. type: Bullet: '* ' +msgid "" +"`pagenames` - If given instead of `pages`, this is interpreted as a " +"space-separated list of links to pages (with the same " +"[[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined " +"in exactly the order given: the `sort` and `pages` parameters cannot be used " +"in conjunction with this one." +msgstr "" +"`pagenames` - Kann anstelle von `pages` angegeben werden und wird als " +"Leerzeichen-separierte Liste von Links zu Seiten interpretiert (mit den " +"gleichen [[Verlinkungsregeln|SubPage/LinkingRules]] wie in einem " +"[[ikiwiki/WikiLink]]), und werden dann genau in der angegebenen Reihenfolge " +"eingebunden. Die Parameter `sort` und `pages` können nicht in Kombination mit " +"diesem verwendet werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"A related directive is the [[ikiwiki/directive/edittemplate]] directive, " +"which allows default text for a new page to be specified." +msgstr "" +"Eine verwandte Anweisung ist die [[ikiwiki/directive/edittemplate]]-Anweisung, " +"mit der für eine neue Seite ein voreingestellter Text angegeben werden kann." + + diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.de.po b/po/underlays/directives/ikiwiki/directive/linkmap.de.po new file mode 100644 index 000000000..e06368e6e --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/linkmap.de.po @@ -0,0 +1,99 @@ +# German translation of directives/ikiwiki/directive/linkmap page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:03+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `linkmap` directive is supplied by the [[!iki plugins/linkmap " +"desc=linkmap]] plugin." +msgstr "" +"Die `linkmap`-Anweisung wird durch die [[!iki plugins/linkmap " +"desc=linkmap]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung verwendet [graphviz](http://www.graphviz.org/), um einen " +"Graph mit den Links zwischen den Seiten im Wiki zu erstellen. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n" +msgstr "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n" + +#. type: Plain text +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." +msgstr "" +"Nur Links zwischen den angegebenen Seiten werden angezeigt; Links die auf " +"andere Seiten zeigen werden ausgelassen. Wenn die einzuschließenden Seiten " +"nicht angegeben werden, werden Links zwischen allen Seiten (und anderen " +"Dateien) im Wiki angezeigt." + +#. type: Plain text +msgid "" +"Here are descriptions of all the supported parameters to the `linkmap` " +"directive:" +msgstr "" +"Hier die Beschreibung aller unterstützter Parameter der `linkmap`-Anweisung:" + +#. type: Bullet: '* ' +msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map." +msgstr "`pages` - Eine [[ikiwiki/PageSpec]] der darzustellenden Seiten." + +#. type: Bullet: '* ' +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 "" +"`height`, `width` - Begrenzt die Größe der erzeugten Graphik auf die (in " +"Inch) angegebene Breite und Höne. Beide müssen angegeben werden, damit die " +"Beschränkung wirksam wird." + +#. type: Bullet: '* ' +msgid "" +"`connected` - Controls whether to include pages on the map that link to no " +"other pages (connected=no, the default), or to only show pages that link to " +"others (connected=yes)." +msgstr "" +"`connected` - Steuert ob auch Seiten dargestellt werden, die keinen Link zu " +"anderen Seiten enthalten (`connected=no`, die Voreinstellung), oder ob nur " +"Seiten angezeigt werden, die auf andere verlinken (`connected=yes`)." + +#. type: Plain text +msgid "" +"For best results, only a small set of pages should be mapped, since " +"otherwise the map can become very large, unwieldy, and complicated. If too " +"many pages are included, the map may get so large that graphviz cannot " +"render it. Using the `connected` parameter is a good way to prune out pages " +"that clutter the map." +msgstr "" +"Um die besten Ergebnisse zu erzielen, sollte nur eine kleine Teilmenge der " +"Seiten angegeben werden, da die erzeugte Karte sonst groß, unhandlich und " +"kompliziert wird. Wenn zu viele Seiten angegeben werden, kann die Karte zu " +"kompliziert werden, als dass graphviz sie noch rendern könnte. Der Parameter " +"`connected` ist ein guter Weg Seiten loszuwerden, die die Karte " +"unübersichtlich machen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/listdirectives.de.po b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po new file mode 100644 index 000000000..2c9205880 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po @@ -0,0 +1,72 @@ +# German translation of directives/ikiwiki/directive/listdirectives page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:03+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `listdirectives` directive is supplied by the [[!iki " +"plugins/listdirectives desc=listdirectives]] plugin." +msgstr "" +"Die `listdirectives`-Anweisung wird durch die [[!iki " +"plugins/listdirectives desc=listdirectives]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a list of available " +"[[directives|ikiwiki/directive]]." +msgstr "" +"Diese Anweisung erzeugt eine Liste der verfügbaren " +"[[Anweisungen|ikiwiki/directives]]." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!listdirectives]]\n" +msgstr "\t\\[[!listdirectives]]\n" + +#. type: Plain text +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 "" +"Es gibt nur ein optionales Argument, `generated`. Normalerweise zeigt die " +"`listdirectives`-Anweisung alle eingebauten und alle durch eine Erweiterung " +"registrierten Anweisungen an. Mit diesem Schlüsselwort zeigt " +"`listdirectives` auch Anweisungen an, die erst später erzeugt wurden. Zum " +"Beispiel werden alle [[Abkürzungen|shortcuts]] durch die " +"`shortcut`-Anweisung erzeugt und werden nur aufgelistet, wenn das Argument " +"`generated` angegeben wird." + +#. type: Plain text +#, no-wrap +msgid " \\[[!listdirectives generated]]\n" +msgstr " \\[[!listdirectives generated]]\n" + +#. type: Plain text +msgid "" +"This extended list is often quite long, and often contains many undocumented " +"directives." +msgstr "" +"Diese erweiterte Liste ist oft ziemlich lang und enthält oft viele " +"undokumentierte Anweisungen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/map.de.po b/po/underlays/directives/ikiwiki/directive/map.de.po new file mode 100644 index 000000000..f09598232 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/map.de.po @@ -0,0 +1,77 @@ +# German translation of directives/ikiwiki/directive/map page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:03+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "The `map` directive is supplied by the [[!iki plugins/map desc=map]] plugin." +msgstr "" +"Die `map`-Anweisung wird durch die [[!iki plugins/map desc=map]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a hierarchical page map for the wiki. Example " +"usage:" +msgstr "" +"Diese Anweisung erzeugt eine hierarchische Liste der Seiten im Wiki. Beispiel für " +"die Verwendung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n" +msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n" + +#. type: Plain text +msgid "" +"If the pages to include are not specified, all pages (and other files) in " +"the wiki are mapped." +msgstr "" +"Wenn die anzuzeigenden Seiten nicht angegeben werden, kommen alle Seiten (und " +"andere Dateien) in die Liste." + +#. type: Plain text +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 "" +"In der Voreinstellung werden in der Liste die Namen der Seiten angezeigt. Mit dem " +"Parameter `show` können stattdessen der Titel (`title`) oder die Beschreibung " +"(`description`) verwendet werden, die mit der [[meta]]-Anweisung gesetzt wurden. " +"Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n" +msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n" +msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n" + +#. type: Plain text +msgid "" +"Hint: To limit the map to displaying pages less than a certain level deep, " +"use a [[ikiwiki/PageSpec]] like this: `pages=\"* and !*/*/*\"`" +msgstr "" +"Tipp: Um nur Seiten bis zu einer bestimmten Ebene anzuzeigen, kann eine " +"[[ikiwiki/PageSpec]] wie `pages=\"* and !*/*/*\"` verwendet werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/meta.de.po b/po/underlays/directives/ikiwiki/directive/meta.de.po new file mode 100644 index 000000000..47415c306 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/meta.de.po @@ -0,0 +1,455 @@ +# German translation of directives/ikiwiki/directive/meta page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:04+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `meta` directive is supplied by the [[!iki plugins/meta desc=meta]] " +"plugin." +msgstr "" +"Die `meta`-Anweisung wird durch die [[!iki plugins/meta desc=meta]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows inserting arbitrary metadata into the source of a " +"page. Enter the metadata as follows:" +msgstr "" +"Diese Anweisung erlaubt es, beliebige Metadaten in den Quelltext einer Seite " +"einzufügen. Dies geschieht wie folgt:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta field=\"value\"]]\n" +"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n" +msgstr "" +"\t\\[[!meta field=\"value\"]]\n" +"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n" + +#. type: Plain text +msgid "" +"The first form sets a given field to a given value, while the second form " +"also specifies some additional sub-parameters." +msgstr "" +"In der ersten Form wird das angegebene Feld auf den angegebenen Wert gesetzt. In " +"der zweiten Form werden zusätzlich einige Unter-Parameter angegeben." + +#. type: Plain text +msgid "" +"The field values are treated as HTML entity-escaped text, so you can include " +"a quote in the text by writing `"` and so on." +msgstr "" +"Die Feldwerte können HTML-Entities enthalten, zum Beispiel kann durch `"` " +"ein Anführungszeichen eingefügt werden." + +#. type: Plain text +msgid "Supported fields:" +msgstr "Unterstützte Felder:" + +#. type: Bullet: '* ' +msgid "title" +msgstr "`title` " + +#. type: Plain text +#, no-wrap +msgid "" +" Overrides the title of the page, which is generally the same as the\n" +" page name.\n" +msgstr "" +" Überschreibt den Titel der Seite, der normalerweise dem Namen\n" +" der Seite entspricht." + +#. type: Plain text +#, 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 "" +" Wenn der Titel so überschrieben wird, wird die Template-Variable\n" +" `title_overridden` auf wahr gesetzt. Eine Vorlage kann in diesem\n" +" Fall eine andere Darstellung wählen.\n" + +#. type: Bullet: '* ' +msgid "license" +msgstr "`license`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a license for the page, for example, \"GPL\". Can contain\n" +" WikiLinks and arbitrary markup.\n" +msgstr "" +" Gibt eine Lizenz für die Seite an, etwa `GPL`. Kann WikiLinks und\n" +" beliebige Formatierungsanweisungen enhalten.\n" + +#. type: Bullet: '* ' +msgid "copyright" +msgstr "`copyright`" + +#. type: Plain text +#, 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 "" +" Gibt die Urheberrechte der Seite an, zum Beispiel `Copyright 2007\n" +" by Joey Hess`. Kann WikiLinks und beliebige\n" +" Formatierungsanweisungen enhalten.\n" + +#. type: Bullet: '* ' +msgid "author" +msgstr "`author`" + +#. type: Plain text +#, no-wrap +msgid " Specifies the author of a page.\n" +msgstr " Gibt den Autor der Seite an.\n" + +#. type: Bullet: '* ' +msgid "authorurl" +msgstr "`authorurl`" + +#. type: Plain text +#, no-wrap +msgid " Specifies an url for the author of a page.\n" +msgstr " Gibt eine URL für den Autor der Seite an.\n" + +#. type: Bullet: '* ' +msgid "description" +msgstr "`description`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a short description for the page. This will be put in\n" +" the html header, and can also be displayed by eg, the [[map]] directive.\n" +msgstr "" +" Gibt eine kurze Beschreibung der Seite an. Diese wird im\n" +" HTML-Header angegeben und kann zum Beispiel auch durch die\n" +" [[map]]-Anweisung ausgegeben werden.\n" + +#. type: Bullet: '* ' +msgid "permalink" +msgstr "`permalink`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a permanent link to the page, if different than the page\n" +" generated by ikiwiki.\n" +msgstr "" +" Gibt einen dauerhaften Link zu der Seite an, wenn dieser anders ist\n" +" als die von ikiwiki generierte Seite.\n" + +#. type: Bullet: '* ' +msgid "date" +msgstr "`date`" + +#. type: Plain text +#, 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 "" +" Gibt das Erstellungsdatum der Seite an. Das Datum kann in\n" +" nahezu beliebigem Format angegeben werden, da es durch\n" +" [[!cpan TimeDate]] interpretiert wird.\n" + +#. type: Bullet: '* ' +msgid "stylesheet" +msgstr "`stylesheet`" + +#. type: Plain text +#, 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 "" +" Fügt ein Stylesheet zu der Seite hinzu. Der angegebene Name wird als\n" +" WikiLink zu einer `.css`-Datei im Wiki behandelt, es können also keine\n" +" externen Stylesheets eingebunden werden. Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n" +"\ttitle=\"somestyle\"]]\n" +msgstr "" +"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n" +"\ttitle=\"somestyle\"]]\n" + +#. type: Bullet: '* ' +msgid "openid" +msgstr "`openid`" + +#. type: Plain text +#, no-wrap +msgid "" +" Adds html <link> tags to perform OpenID delegation to an external\n" +" OpenID server. This lets you use an ikiwiki page as your OpenID.\n" +msgstr "" +" Fügt die nötigen <link>-Tags für die Weiterleitung an einen externen\n" +" OpenID-Server ein. Dadurch kann eine ikiwiki-Seite als OpenID\n" +" verwendet werden.\n" + +#. type: Plain text +#, no-wrap +msgid "" +" By default this will delegate for both `openid` and `openid2`. To only\n" +" delegate for one, add a parameter such as `delegate=openid`.\n" +msgstr "" +" Standardmäßig werden sowohl `openid` als auch `openid2`\n" +" weitergeleitet. Um nur eines davon weiterzuleiten, kann ein\n" +" Parameter wie `delegate=openid` verwendet werden.\n" + +#. type: Plain text +#, no-wrap +msgid "" +" 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 "" +" Der optionale Parameter `xrds-location` erlaubt es, den Ort eines\n" +" [eXtensible Resource\n" +" DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml)\n" +" anzugeben.\n" + +#. type: Plain text +#, no-wrap +msgid " Example:\n" +msgstr " Beispiel:\n" + +#. type: Plain text +#, 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 "" +"\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" + +#. type: Bullet: '* ' +msgid "link" +msgstr "`link`" + +#. type: Plain text +#, 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 "" +" Gibt einen Link zu einer anderen Seite an. Auf diese Weise kann das Wiki\n" +" dazu gebracht werden, eine Seite so zu behandeln, als ob sie einen Link\n" +" auf eine andere enthält, ohne dass die Benutzer einen [[ikiwiki/WikiLink]]\n" +" zu Gesicht bekommen:\n" + +#. type: Plain text +#, no-wrap +msgid " \\[[!meta link=otherpage]]\n" +msgstr " \\[[!meta link=andereseite]]\n" + +#. type: Plain text +#, no-wrap +msgid " It can also be used to insert a html <link> tag. For example:\n" +msgstr "" +" Es kann auch ein HTML <link>-Tag eingefügt werden, zum\n" +" Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid "" +" \\[[!meta link=\"http://joeyh.myopenid.com/\" " +"rel=\"openid.delegate\"]]\n" +msgstr "" +" \\[[!meta link=\"http://joeyh.myopenid.com/\" " +"rel=\"openid.delegate\"]]\n" + +#. type: Plain text +#: +#, 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 "" +" Allerdings ist diese zweite Syntax nicht erlaubt, wenn die\n" +" [[!iki plugins/htmlscrubber desc=htmlscrubber]]-Erweiterung aktiviert ist,\n" +" weil auf diese Weise unsichere Inhalte eingefügt werden können.\n" + +#. type: Bullet: '* ' +msgid "redir" +msgstr "`redir`" + +#. type: Plain text +#, no-wrap +msgid " Causes the page to redirect to another page in the wiki.\n" +msgstr " Lässt die Seite auf eine andere Seite im Wiki weiterleiten.\n" + +#. type: Plain text +#, no-wrap +msgid " \t\\[[!meta redir=otherpage]]\n" +msgstr " \t\\[[!meta redir=andereseite]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +" Optionally, a delay (in seconds) can be specified. The default is to\n" +" redirect without delay.\n" +msgstr "" +" Es kann optional eine Verzögerung (`delay=seconds`) angegeben\n" +" werden. Voreingestellt ist, ohne Verzögerung weiterzuleiten.\n" + +#. type: Plain text +#, no-wrap +msgid " It can also be used to redirect to an external url. For example:\n" +msgstr "" +" Es kann auch auf eine externe URL weitergeleitet werden. Zum\n" +" Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid " \t\\[[!meta redir=\"http://example.com/\"]]\n" +msgstr " \t\\[[!meta redir=\"http://beispiel.de/\"]]\n" + +#. type: Plain text +#, 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 "" +" In beiden Fällen kann ein anzuspringender Anker auf der Zielseite\n" +" angegeben werden, indem die übliche `#ANKER`-Syntax verwendet wird.\n " + +#. type: Bullet: '* ' +msgid "robots" +msgstr "`robots`" + +#. type: Plain text +#, no-wrap +msgid " Causes the robots meta tag to be written:\n" +msgstr " Schreibt den robots-Meta-Tag:\n" + +#. type: Plain text +#, no-wrap +msgid " \\[[!meta robots=\"index, nofollow\"]]\n" +msgstr " \\[[!meta robots=\"index, nofollow\"]]\n" + +#. type: Plain text +#, 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 "" +" Zulässige Werte sind `index`, `noindex`, `follow` und `nofollow`. Es\n" +" können mehrere Werte durch Kommas getrennt angegeben werden, aber\n" +" offensichtlich ergeben nur einige Kombinationen Sinn. Wenn der\n" +" robots-Meta-Tag nicht explizit angegeben wird, wird als Voreinstellung\n" +" \"index,follow\" angenommen.\n" + +#. type: Plain text +#, no-wrap +msgid " The value is escaped, but its contents are not otherwise checked.\n" +msgstr " Der Wert wird nicht auf Zulässigkeit geprüft.\n" + +#. type: Bullet: '* ' +msgid "guid" +msgstr "`guid`" + +#. type: Plain text +#, 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 "" +" Gibt eine global einmalige ID für die Seite an. Diese guid sollte eine\n" +" URI sein (insbesondere kann sie nach [[!rfc 4122]] `urn:uuid:`\n" +" gefolgt von einer UUID sein). Sie wird verwendet, um den Eintrag der\n" +" Seite in RSS- und Atom-Feeds zu identifizieren. Wird keine guid\n" +" angegeben, wird an dieser Stelle die URL der Seite verwendet.\n" + +#. type: Plain text +#, 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 "" +" Diese Angabe ist in erster Linie dann nützlich, wenn eine Seite\n" +" verschoben wurde: Indem die guids unverändert gelassen werden,\n" +" kann das Fluten von Aggregatoren vermieden werden (siehe\n" +" [[!iki tips/howto_avoid_flooding_aggregators]]).\n" + +#. type: Bullet: '* ' +msgid "updated" +msgstr "`updated`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a fake modification time for a page, to be output into RSS and\n" +" Atom feeds. This is useful to avoid flooding aggregators that sort by\n" +" modification time, like Planet: for instance, when editing an old blog " +"post\n" +" to add tags, you could set `updated` to be one second later than the " +"original\n" +" value. The date/time can be given in any format that\n" +" [[!cpan TimeDate]] can understand, just like the `date` field.\n" +msgstr "" +" Gibt eine gefälschte Änderungszeit für die Seite an, die dann von RSS-\n" +" und Atom-Feeds ausgegeben wird. Dies ist nützlich, um Aggregatoren\n" +" nicht zu fluten, die nach Änderungszeit sortieren, wie etwa Planet:\n" +" Wenn man zum Beispiel einen alten Blog-Eintrag bearbeitet (etwa um\n" +" Tags hinzuzufügen), kann man `updated` auf eine Sekunde später als\n" +" den ursprünglichen Wert setzen. Das Datum mit Uhrzeit kann in jedem\n" +" Format angegeben werden, das von [[!cpan TimeDate]] verstanden\n" +" wird, genauso wie im Feld `date`.\n" + +#. type: Plain text +msgid "" +"If the field is not one of the above predefined fields, the metadata will be " +"written to the generated html page as a <meta> 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 "" +"Wenn das Feld nicht eines der oben vordefinierten ist, werden die Metadaten als " +"<meta>-Header in die generierte Seite geschrieben. Dies ist allerdings " +"nicht erlaubt, wenn die [[!iki plugins/htmlscrubber " +"desc=htmlscrubber]]-Erweiterung aktiv ist, da auf diese Weise unsichere Inhalte " +"eingefügt werden können." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/more.de.po b/po/underlays/directives/ikiwiki/directive/more.de.po new file mode 100644 index 000000000..65615049b --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/more.de.po @@ -0,0 +1,63 @@ +# German translation of directives/ikiwiki/directive/more page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:04+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `more` directive is supplied by the [[!iki plugins/more desc=more]] " +"plugin." +msgstr "" +"Die `more`-Anweisung wird durch die [[!iki plugins/more desc=more]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweise stellt eine Möglichkeit zur Verfügung, einen \"mehr\"-Link in " +"einem Blogeintrag anzuzeigen, der zur kompletten Version der Seite führt. " +"Benutzt wird sie folgendermaßen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!more linktext=\"click for more\" text=\"\"\"\n" +msgstr "\t\\[[!more linktext=\"mehr …\" text=\"\"\"\n" + +#. type: Plain text +#, 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 "" +"\tDies ist der Rest meines Blog-Eintrags. Er ist nicht für Leute\n" +"\tgedacht, die auf 10000m Blogs lesen, weil ich es gerne kompliziert\n" +"\tmache.\n" + +#. type: Plain text +msgid "If the `linktext` parameter is omitted it defaults to just \"more\"." +msgstr "" +"Wenn der Parameter `linktext` weggelassen wird, wird einfach \"more\" angezeigt." + +#. type: Plain text +msgid "Note that you can accomplish something similar using a [[toggle]] instead." +msgstr "Etwas ähnliches kann auch mit einem [[toggle]] erreicht werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/orphans.de.po b/po/underlays/directives/ikiwiki/directive/orphans.de.po new file mode 100644 index 000000000..aeaebdf61 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/orphans.de.po @@ -0,0 +1,60 @@ +# German translation of directives/ikiwiki/directive/orphans page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:04+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `orphans` directive is supplied by the [[!iki plugins/orphans " +"desc=orphans]] plugin." +msgstr "" +"Die `orphans`-Anweisung wird durch die [[!iki plugins/orphans " +"desc=orphans]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a list of possibly orphaned pages -- pages that no " +"other page links to. Example:" +msgstr "" +"Diese Anweisung erzeugt eine Liste von möglicherweise verwaisten Seiten " +"– Seiten auf die von keiner anderen aus verlinkt wird. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!orphans pages=\"* and !blog/*\"]]\n" +msgstr "\t\\[[!orphans pages=\"* and !blog/*\"]]\n" + +#. type: Plain text +msgid "" +"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying " +"the pages to check for orphans, default is search them all." +msgstr "" +"Im optionalen Parameter `pages` kann durch eine [[ikiwiki/PageSpec]] " +"angegeben werden, welche Seiten auf Verwaistheit überprüft werden. In der " +"Voreinstellung werden alle geprüft." + +#. type: Plain text +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 "" +"Dabei werden backlinks berücksichtigt, nicht aber Einbetten mit [[inline]]. " +"Viele blogartige Seiten werden also als Waisen eingestuft werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/pagecount.de.po b/po/underlays/directives/ikiwiki/directive/pagecount.de.po new file mode 100644 index 000000000..5f2db30df --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/pagecount.de.po @@ -0,0 +1,48 @@ +# German translation of directives/ikiwiki/directive/pagecount page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:05+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `pagecount` directive is supplied by the [[!iki plugins/pagecount " +"desc=pagecount]] plugin." +msgstr "" +"Die `pagecount`-Anweisung wird durch die [[!iki plugins/pagecount " +"desc=pagecount]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive counts pages currently in the wiki. Example:" +msgstr "" +"Diese Anweisung zählt die Seiten, die es gerade im Wiki gibt. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagecount pages=\"*\"]]\n" +msgstr "\t\\[[!pagecount pages=\"*\"]]\n" + +#. type: Plain text +msgid "" +"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying " +"the pages to count, default is to count them all." +msgstr "" +"Im optionalen Parameter `pages` kann mit einer [[ikiwiki/PageSpec]] " +"angegeben werden, welche Seiten gezählt werden sollen, ein der " +"Voreinstellung werden alle gezählt." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.de.po b/po/underlays/directives/ikiwiki/directive/pagestats.de.po new file mode 100644 index 000000000..86ce00d9b --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/pagestats.de.po @@ -0,0 +1,99 @@ +# German translation of directives/ikiwiki/directive/pagestats page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:05+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `pagestats` directive is supplied by the [[!iki plugins/pagestats " +"desc=pagestats]] plugin." +msgstr "" +"Die `pagestats`-Anweisung wird durch die [[!iki plugins/pagestats " +"desc=pagestats]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung kann Statistiken darüber erzeugen, wie Seiten aufeinander " +"verlinken. Sie kann entweder eine Tag-Wolke erzeugen oder eine Tabelle mit " +"den Häufigkeiten, wie oft auf die einzelnen Seiten verwiesen wurde." + +#. type: Plain text +msgid "Here's how to use it to create a [[tag]] cloud:" +msgstr "So kann eine [[tag]]-Wolke erzeugt werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n" +msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n" + +#. type: Plain text +msgid "And here's how to create a table of all the pages on the wiki:" +msgstr "Und so kann eine Tabelle mit allen Seiten im Wiki erzeugt werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats style=\"table\"]]\n" +msgstr "\t\\[[!pagestats style=\"table\"]]\n" + +#. type: Plain text +msgid "" +"The optional `among` parameter limits the pages whose outgoing links are " +"considered. For instance, to display a cloud of tags used on blog entries, " +"while ignoring other pages that use those tags, you could use:" +msgstr "" +"Der optionale Parameter `among` beschränkt die Seiten, deren ausgehende " +"Links berücksichtigt werden. Zum Beispiel kann folgendermaßen eine Tag-Wolke " +"erzeugt werden, die nur Vorkommen in Blogeinträgen berücksichtigt:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n" +msgstr "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n" + +#. type: Plain text +msgid "Or to display a cloud of tags related to Linux, you could use:" +msgstr "Oder um eine Wolke mit Tags anzuzeigen, die mit Linux verwandt sind:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" " +"among=\"tagged(linux)\"]]\n" +msgstr "" +"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" " +"among=\"tagged(linux)\"]]\n" + +#. type: Plain text +msgid "" +"The optional `show` parameter limits display to the specified number of " +"pages. For instance, to show a table of the top ten pages with the most " +"links:" +msgstr "" +"Der optionale Parameter `show` zeigt nur die angegebene Anzahl von Seiten an." +" Zum Beispiel kann man eine Tabelle mit den zehn häufigsten Links anzeigen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n" +msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po new file mode 100644 index 000000000..71ea68e81 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po @@ -0,0 +1,64 @@ +# German translation of directives/ikiwiki/directive/pagetemplate page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:05+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate " +"desc=pagetemplate]] plugin." +msgstr "" +"Die `pagetemplate`-Anweisung wird durch die [[!iki plugins/pagetemplate " +"desc=pagetemplate]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows a page to be displayed using a different template than " +"the default `page.tmpl` template." +msgstr "" +"Diese Anweisung erlaubt es, für eine Seite eine andere als die " +"voreingestellte Vorlage `page.tmpl` zu verwenden." + +#. type: Plain text +msgid "" +"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 "" +"Der Seiteninhalt wird in die Vorlage eingefügt, die Vorlage steuert also das " +"allgemeine Erscheinungsbild der Seite. Im Gegensatz dazu erlaubt die " +"[[ikiwiki/directive/template]]-Anweisung, Vorlagen _in_ den Text einer Seite " +"einzufügen." + +#. type: Plain text +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 "" +"Diese Anweisung kann nur auf Vorlagen zurückgreifen, die bereits durch den " +"Systemadministrator installiert wurden, typischerweise im Verzeichnis " +"`/usr/share/ikiwiki/templates`. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n" +msgstr "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/paste.de.po b/po/underlays/directives/ikiwiki/directive/paste.de.po new file mode 100644 index 000000000..390d6e9ec --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/paste.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/paste page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-13 23:32+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/ping.de.po b/po/underlays/directives/ikiwiki/directive/ping.de.po new file mode 100644 index 000000000..9276d6902 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/ping.de.po @@ -0,0 +1,69 @@ +# German translation of directives/ikiwiki/directive/ping page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:06+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `ping` directive is supplied by the [[!iki plugins/pinger desc=pinger]] " +"plugin." +msgstr "" +"Die `ping`-Anweisung wird durch die [[!iki plugins/pinger " +"desc=pinger]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung erlaubt es ikiwiki so zu konfigurieren, dass eine bestimmte " +"URL jedes mal aufgerufen wird, wenn das Wiki aktualisiert wird. Dies kann " +"in Kombination mit der [[!iki plugins/pingee desc=pingee]]-Erweiterung dazu " +"verwendet werden, ein eng gekoppeltes Netzwerk mit gespiegelten oder " +"abgeleiteten Wikis einzurichten. Durch das Anpingen kann bei jeder Änderung " +"der Spiegel oder das abgeleitete Wiki aktuell gehalten werden." + +#. type: Plain text +#, no-wrap +msgid "" +" \\[[!ping from=\"http://mywiki.com/\"\n" +" to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n" +msgstr "" +" \\[[!ping from=\"http://mywiki.com/\"\n" +" to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n" + +#. type: Plain text +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 "" +"Der Parameter `from` muss identisch zur URL des Wikis sein, dass den Ping " +"durchführt. Dies wird verwendet, um Schleifen zu verhindern." + +#. type: Plain text +msgid "" +"The \"to\" parameter is the url to ping. The example shows how to ping " +"another ikiwiki instance." +msgstr "" +"Der Parameter `to` ist die URL, die aufgerufen werden soll. Das Beispiel " +"zeigt, wie eine andere ikiwiki-Instanz angepingt werden kann." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/poll.de.po b/po/underlays/directives/ikiwiki/directive/poll.de.po new file mode 100644 index 000000000..680bc1887 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/poll.de.po @@ -0,0 +1,87 @@ +# German translation of directives/ikiwiki/directive/poll page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:06+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `poll` directive is supplied by the [[!iki plugins/poll desc=poll]] " +"plugin." +msgstr "" +"Die `poll`-Anweisung wird durch die [[!iki plugins/poll desc=poll]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows you to create online polls in the wiki. Here's an " +"example use:" +msgstr "" +"Diese Anweisung erlaubt es, Online-Umfragen im Wiki durchzuführen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n" +msgstr "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n" + +#. type: Plain text +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 "" +"Die Zahlen geben an, wie viele Benutzer für diese Möglichkeit gestimmt haben. " +"Wenn ein Benutzer seine Stimme abgibt, wird die Seite modifiziert und die " +"entsprechende Zahl hochgezählt." + +#. type: Plain text +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 "" +"Obwohl einige einfache Vorsichtsmaßnahmen getroffen wurden, damit Benutzer nicht " +"ausversehen mehrmals abstimmen, sollte diese Art Umfrage nicht als besonders " +"verlässlich angesehen werden; alle üblichen Bedenken bezüglich webbasierten " +"Abstimmungen treffen zu. Wenn die Seite mit der Abstimmung nicht zum Bearbeiten " +"gesperrt ist, können Benutzer sogar direkt die Zahlen verändern!" + +#. type: Plain text +msgid "Parameters:" +msgstr "Parameter:" + +#. type: Bullet: '* ' +msgid "" +"`open` - Whether voting is still open. Set to \"no\" to close the poll to " +"voting." +msgstr "" +"`open` - Ob die Abstimmung noch offen ist. Beim Wert `no` werden keine weiteren " +"Stimmen angenommen." + +#. type: Bullet: '* ' +msgid "`total` - Show total number of votes at bottom of poll. Default is \"yes\"." +msgstr "" +"`total` - Zeige die bisherige Anzahl der Stimmen unterhalb des " +"Abstimmungsformulars an. Voreingestellt ist `yes`." + +#. type: Bullet: '* ' +msgid "`percent` - Whether to display percents. Default is \"yes\"." +msgstr "" +"`percent` - Ob Prozentzahlen angezeigt werden sollen. Voreingestellt ist `yes`." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/polygen.de.po b/po/underlays/directives/ikiwiki/directive/polygen.de.po new file mode 100644 index 000000000..8acb98379 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/polygen.de.po @@ -0,0 +1,50 @@ +# German translation of directives/ikiwiki/directive/polygen page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:06+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `polygen` directive is supplied by the [[!iki plugins/polygen " +"desc=polygen]] plugin." +msgstr "" +"Die `polygen`-Anweisung wird durch die [[!iki plugins/polygen " +"desc=polygen]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows inserting text generated by polygen into a wiki page. " +"For example:" +msgstr "" +"Diese Anweisung erlaubt es, durch *polygen* erzeugten Text in eine " +"Wiki-Seite einzubinden. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!polygen grammar=\"genius\"]]\n" +msgstr "\t\\[[!polygen grammar=\"genius\"]]\n" + +#. type: Plain text +msgid "" +"It's also possible to specify a starting nonterminal for the grammar by " +"including `symbol=\"text\"` in the directive." +msgstr "" +"Es ist auch möglich, ein Start-Nichtterminal für die Grammatik anzugeben, " +"indem `symbol=\"text\"` mit in der Anweisung angegeben wird." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.de.po b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po new file mode 100644 index 000000000..e857d10fc --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po @@ -0,0 +1,149 @@ +# German translation of directives/ikiwiki/directive/postsparkline page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:07+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `postsparkline` directive is supplied by the [[!iki " +"plugins/postsparkline desc=postsparkline]] plugin." +msgstr "" +"Die `postsparkline`-Anweisung wird durch die [[!iki " +"plugins/postsparkline desc=postsparkline]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Diese Anweisung verwendet die [[!iki plugins/sparkline " +"desc=sparkline]]-Erweiterung, um eine [[sparkline]] mit Statistiken über " +"bestimmte Seiten anzuzeigen, etwa über Einträge in einem Blog." + +#. type: Title # +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, 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 "" +"\tIntervall der Einträge: \n" +"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n" +"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n" + +#. type: Plain text +#, 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 "" +"\tEinträge pro Monat in diesem Jahr: \n" +"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n" +"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n" + +#. type: Title # +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"All options aside from the `pages`, `max`, `formula`, `time`, and `color` " +"options are the same as in [[sparkline]] directive." +msgstr "" +"Alle Parameter außer `pages`, `max`, `formula`, `time` und `color` sind die " +"gleichen wie in der [[sparkline]]-Anweisung." + +#. type: Plain text +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 "" +"Es müssen keine Datenpunkte angegeben werden (auch wenn dies möglich ist). " +"Stattdessen werden die Datenpunkte ausgehend vom Erstellungsdatum der durch " +"`pages` angegebenen Seiten (eine [[ikiwiki/PageSpec]]) automatisch generiert." +" Es werden höchstens `max` Datenpunkte erzeugt." + +#. type: Plain text +msgid "" +"The `formula` parameter controls the formula used to generate data points. " +"Available formulae:" +msgstr "" +"Der Parameter `formula` steuert die Formel, mit der die Datenpunkte erzeugt " +"werden. Verfügbare Formeln:" + +#. type: Bullet: '* ' +msgid "" +"`interval` - The height of each point represents how long it has been since " +"the previous post." +msgstr "" +"`interval` - Die Höhe jedes Punkts steht für den zeitlichen Abstand zum " +"vorherigen Eintrag." + +#. type: Bullet: '* ' +msgid "" +"`perday` - Each point represents a day; the height represents how many posts " +"were made that day." +msgstr "" +"`perday` - Jeder Punkt entspricht einem Tag; die Höhe stellt die Anzahl der " +"an diesem Tag gemachten Einträge dar." + +#. type: Bullet: '* ' +msgid "" +"`permonth` - Each point represents a month; the height represents how many " +"posts were made that month." +msgstr "" +"`permonth` - Jeder Punkt entspricht einem Monat; die Höhe stellt die Anzahl " +"der in diesem Monat gemachten Einträge dar." + +#. type: Bullet: '* ' +msgid "" +"`peryear` - Each point represents a year; the height represents how many " +"posts were made that year." +msgstr "" +"`peryear` - Jeder Punkt entspricht einem Jahr; die Höhe stellt die Anzahl " +"der in diesem Jahr gemachten Einträge dar." + +#. type: Plain text +msgid "" +"The `time` parameter has a default value of \"ctime\", since formulae 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 "" +"Der Parameter `time` hat standardmäßig den Wert `ctime` und es werden die " +"Erstellungszeiten der Seiten verwendet. Sollen stattdessen die " +"Änderungszeiten verwendet werden, kann `mtime` angegeben werden." + +#. type: Plain text +msgid "" +"To change the color used to draw the sparkline, use the `color` parameter. " +"For example, \"color=red\"." +msgstr "" +"Die Farbe der sparkline kann mit dem Parameter `color` verändert werden, " +"etwa durch `color=red`." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/progress.de.po b/po/underlays/directives/ikiwiki/directive/progress.de.po new file mode 100644 index 000000000..5f10f9942 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/progress.de.po @@ -0,0 +1,68 @@ +# German translation of directives/ikiwiki/directive/progress page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:07+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `progress` directive is supplied by the [[!iki plugins/progress " +"desc=progress]] plugin." +msgstr "" +"Die `progress`-Anweisung wird durch die [[!iki plugins/progress " +"desc=progress]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive generates a progress bar." +msgstr "Diese Anweisung erzeugt einen Fortschrittsbalken." + +#. type: Plain text +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 "" +"Es gibt zwei mögliche Parameter-Mengen. Die erste besteht aus dem einzelnen " +"Parameter `percent`, der die Prozentzahl enthält, wie vollständig der " +"Fortschrittsbalken ist." + +#. type: Plain text +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 "" +"Die zweite mögliche Parameter-Menge ist ein Paar von [[ikiwiki/PageSpec]]s, " +"`totalpages` und `donepages`. Die Anweisung zählt dann jeweils die passenden " +"Seiten und zeigt an, welcher Anteil der Seiten fertig ist." + +#. type: Plain text +msgid "For example, to show what percentage of pages have discussion pages:" +msgstr "" +"Zum Beispiel kann man anzeigen, welcher Anteil der Seiten eine " +"Diskussionsseite haben:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!progress totalpages=\"* and !*/Discussion\" " +"donepages=\"*/Discussion\"]]\n" +msgstr "" +"\t\\[[!progress totalpages=\"* and !*/Discussion\" " +"donepages=\"*/Discussion\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/shortcut.de.po b/po/underlays/directives/ikiwiki/directive/shortcut.de.po new file mode 100644 index 000000000..50ffebc21 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/shortcut.de.po @@ -0,0 +1,46 @@ +# German translation of directives/ikiwiki/directive/shortcut page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:07+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `shortcut` directive is supplied by the [[!iki plugins/shortcut " +"desc=shortcut]] plugin." +msgstr "" +"Die `shortcut`-Anweisung wird durch die [[!iki plugins/shortcut " +"desc=shortcut]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows external links to commonly linked to sites to be made " +"more easily using shortcuts." +msgstr "" +"Diese Anweisung erlaubt es, Links auf häufig verwendete externe Seiten " +"einfacher zu setzen." + +#. type: Plain text +msgid "" +"The available shortcuts are defined on the [[shortcuts]] page in the " +"wiki. The `shortcut` directive can only be used on that page." +msgstr "" +"Die verfügbaren Abkürzungen werden im Wiki auf der Seite [[shortcuts]] " +"definiert. Die `shortcut`-Anweisung kann nur auf dieser Seite verwendet " +"werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.de.po b/po/underlays/directives/ikiwiki/directive/sparkline.de.po new file mode 100644 index 000000000..3223b8811 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/sparkline.de.po @@ -0,0 +1,178 @@ +# German translation of directives/ikiwiki/directive/sparkline page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:08+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `sparkline` directive is supplied by the [[!iki plugins/sparkline " +"desc=sparkline]] plugin." +msgstr "" +"Die `sparkline`-Anweisung wird durch die [[!iki plugins/sparkline " +"desc=sparkline]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows for embedding sparklines into wiki pages. A sparkline " +"is a small word-size graphic chart, that is designed to be displayed " +"alongside text." +msgstr "" +"Diese Anweisung erlaubt es, sparklines in Wiki-Seiten einzubetten. Eine " +"sparkline ist eine kleine Graphik, die so groß wie ein Wort ist und sich " +"deshalb zur Anzeige neben Text eignet." + +#. type: Title # +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, 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 "" +"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n" +"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n" + +#. type: Plain text +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 "" +"Dies erzeugt eine einfache Liniengrafik, die aus mehreren Punkten besteht. " +"Sie wird mit 40 Pixel Breite und 16 Pixel Höhe erzeugt. Der hohe Punkt auf " +"der Linie hat eine grüne Markierung, der niedrige eine rote." + +#. type: Plain text +#, 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 "" +"\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" + +#. type: Plain text +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 "" +"Dies ist ein komplexeres Beispiel, das eine Balkengrafik erzeugt. Die Balken " +"sind 2 Pixel breit und werden durch ein Pixel getrennt; die Grafik ist 14 " +"Pixel hoch. Die Breite für Balkengrafiken automatisch bestimmt. Punkte mit " +"negativen Werten haben abweichend vom voreingestellten Schwarz die Farbe rot." + +#. type: Title # +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +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 "" +"Die Form für Datenpunkte ist `x,y`, oder einfach nur `y`, wenn die x-Werte " +"unerheblich sind. Balkengrafiken können auch `(color)` hinzufügen, um eine " +"Farbe für den Balken anzugeben." + +#. type: Plain text +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 "" +"Die folgenden benannten Parameter werden erkannt. Die meisten entsprechen " +"denen der zugrundeliegenden sparkline-Bibliothek, die [in ihrem " +"Wiki](http://sparkline.wikispaces.com/usage) genauer beschrieben wird." + +#. type: Bullet: '* ' +msgid "`style` - Either \"line\" (the default) or \"bar\"." +msgstr "`style` - Entweder `line` (die Voreinstellung) oder `bar`." + +#. type: Bullet: '* ' +msgid "`width` - Width of the graph in pixels. Only needed for line graphs." +msgstr "" +"`width` - Die Breite der Grafik in Pixeln. Wird nur für Linien-Grafiken " +"benötigt." + +#. type: Bullet: '* ' +msgid "`height` - Height of the graph in pixels. Defaults to 16." +msgstr "`height` - Höhe des Grafen in Pixeln. Voreingestellt sind 16." + +#. type: Bullet: '* ' +msgid "`barwidth` - Width of bars in a bar graph. Default is 1 pixel." +msgstr "" +"`barwidth` - Breite der Balken in einer Balkengrafik. Voreingestellt ist 1 " +"Pixel." + +#. type: Bullet: '* ' +msgid "" +"`barspacing` - Spacing between bars in a bar graph, in pixels. Default is 1 " +"pixel." +msgstr "" +"`barspacing` - Abstand zwischen den Balken einer Balkengrafik in Pixeln. " +"Voreingestellt ist 1 Pixel." + +#. type: Bullet: '* ' +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 "" +"`ymin`, `ymax` - Minimaler und maximaler Wert für die y-Achse. Dies wird " +"normalerweise automatisch berechnet, kann aber auch explizit angegeben " +"werden, um mehrere verwandte Grafiken zu erhalten." + +#. type: Bullet: '* ' +msgid "" +"`featurepoint` - Adds a circular marker to a line graph, with optional " +"text. This can be used to label significant points." +msgstr "" +"`featurepoint` - Fügt eine kreisförmige Markierung zu einer Liniengrafik " +"hinzu, mit optionalem Text. So können bedeutsame Punkte beschriftet werden." + +#. type: Plain text +#, 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 "" +" Der Wert ist eine Komma-separierte Liste von Parametern, die den\n" +" hervorzuhebenden Punkt angeben: x-Wert, y-Wert, Farbname,\n" +" Kreisdurchmesser, Text (optional) und Platzierung des Textes (optional).\n" +" Beispiel: `featurepoint=\"3,5,blue,3\"`\n" + +#. type: Plain text +#, no-wrap +msgid "" +" Available values for the text location are: \"top\", \"right\", " +"\"bottom\", and\n" +" \"left\".\n" +msgstr "" +" Verfügbare Werte für die Platzierung des Textes sind `top`,\n" +" `right`, `bottom` und `left`.\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/table.de.po b/po/underlays/directives/ikiwiki/directive/table.de.po new file mode 100644 index 000000000..6aaeef79f --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/table.de.po @@ -0,0 +1,147 @@ +# German translation of directives/ikiwiki/directive/table page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:08+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `table` directive is supplied by the [[!iki plugins/table desc=table]] " +"plugin." +msgstr "" +"Die `table`-Anweisung wird durch die [[!iki plugins/table " +"desc=table]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive can build HTML tables from data in CSV (comma-separated " +"values) or DSV (delimiter-separated values) format." +msgstr "" +"Diese Anweisung kann HTML-Tabellen aus Daten im CSV-Format (Komma-separierte " +"Werte) oder DSV-Format (Trennzeichen-separierte Werte) erzeugen." + +#. type: Title ## +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#: +#, no-wrap +msgid "\t\\[[!table data=\"\"\"\n" +msgstr "\t\\[[!table data=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tCustomer|Amount\n" +"\tFulanito|134,34\n" +"\tMenganito|234,56\n" +"\tMenganito|234,56\n" +msgstr "" +"\tKunde|Betrag\n" +"\tFulanito|134,34\n" +"\tMenganito|234,56\n" +"\tMenganito|234,56\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!table class=\"book_record\" format=csv " +"file=\"data/books/record1\"]]\n" +msgstr "" +"\t\\[[!table class=\"book_record\" format=csv " +"file=\"data/books/record1\"]]\n" + +#. type: Plain text +msgid "In this second example the `record1` page should be similar to:" +msgstr "" +"Im zweiten Beispiel sollte die `record1`-Seite ähnlich wie das Folgende " +"aussehen:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\"Title\",\"Perl Best Practices\"\n" +"\t\"Author\",\"Damian Conway\"\n" +"\t\"Publisher\",\"O’Reilly\"\n" +msgstr "" +"\t\"Title\",\"Perl Best Practices\"\n" +"\t\"Author\",\"Damian Conway\"\n" +"\t\"Publisher\",\"O’Reilly\"\n" + +#. type: Plain text +msgid "" +"To make a cell span multiple columns, follow it with one or more empty " +"cells. For example:" +msgstr "" +"Um eine Zelle zu erhalten, die über mehrere Spalten geht, kann man die " +"folgenden Zellen leer lassen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\tleft||right|\n" +"\ta|b|c|d\n" +"\tthis cell spans 4 columns|||\n" +msgstr "" +"\tlinks||rechts|\n" +"\ta|b|c|d\n" +"\tdiese Zelle geht über 4 Spalten|||\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Bullet: '* ' +msgid "`data` - Values for the table." +msgstr "`data` - Werte für die Tabelle." + +#. type: Bullet: '* ' +msgid "`file` - A file in the wiki containing the data." +msgstr "`file` - Eine Datei im Wiki, die die Daten enthält." + +#. type: Bullet: '* ' +msgid "" +"`format` - The format of the data, either \"csv\", \"dsv\", or \"auto\" (the " +"default)." +msgstr "" +"`format` - Das Format der Daten, entweder `csv`, `dsv` oder `auto` " +"(letzteres ist voreingestellt)." + +#. type: Plain text +#, 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 "" +"* `delimiter` - Das Zeichen, durch das die Zellen getrennt werden.\n" +" Im DSV-Format ist der senkrechte Strich (`|`) voreingestellt, im\n" +" CSV-Format das Komma (`,`).\n" +"* `class` - Eine CSS-Klasse für das HTML-Element <table>.\n" +"* `header` - In der Voreinstellung, oder wenn `row` angegeben wird,\n" +" wird die erste Zeile der Daten als Tabellenüberschrift verwendet.\n" +" Mit `no` wird eine Tabelle ohne Überschrift erzeugt, mit `column`\n" +" wird die erste Spalte als Überschrift verwendet.\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/tag.de.po b/po/underlays/directives/ikiwiki/directive/tag.de.po new file mode 100644 index 000000000..b33c3bcb0 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/tag.de.po @@ -0,0 +1,112 @@ +# German translation of directives/ikiwiki/directive/tag page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:08+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag " +"desc=tag]] plugin." +msgstr "" +"Die `tag`- und `taglink`-Anweisungen werden durch die [[!iki plugins/tag " +"desc=tag]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "These directives allow tagging pages. List tags as follows:" +msgstr "" +"Diese Anweisungen erlauben es, Seiten mit einer Markierung (englisch *tag*) " +"zu versehen. Diese werden wie folgt angegeben:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!tag tech life linux]]\n" +msgstr "\t\\[[!tag tech life linux]]\n" + +#. type: Plain text +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 "" +"Die Markierungen verhalten sich genauso, wie wenn ein (versteckter) " +"[[ikiwiki/WikiLink]] für jede Markierung vorhanden wäre. Man kann also zum " +"Beispiel eine [[ikiwiki/PageSpec]] verwenden, um alle Seiten zu erfassen, " +"die eine bestimmte Markierung tragen. In Blogeinträgen werden die " +"Markierungen auch am Ende der markierten Seiten und in RSS- und Atom-Feeds " +"angezeigt." + +#. type: Plain text +msgid "" +"If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink " +"instead:" +msgstr "" +"Wenn gleichzeitig mit dem Tag ein sichtbarer [[ikiwiki/WikiLink]] erzeugt " +"werden soll, kann stattdessen `taglink` verwendet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!taglink foo]]\n" +"\t\\[[!taglink tagged_as_foo|foo]]\n" +msgstr "" +"\t\\[[!taglink foo]]\n" +"\t\\[[!taglink markiert_als_foo|foo]]\n" + +#. type: Plain text +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 "" +"Wenn im Wiki eine zu verwendende `tagbase` konfiguriert ist, tauchen die " +"Markierungen unterhalb dieses Verzeichnisses auf, etwa unter \"tags/\". Auf " +"diese Weise muss man nicht den kompletten Pfad zu den Markierungen angeben, " +"wenn man sie gruppieren und getrennt von den restlichen Seiten halten will." + +#. type: Plain text +msgid "" +"Bear in mind that specifying a tagbase means you will need to incorporate it " +"into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is " +"`tag`, you would match pages tagged \"foo\" with `link(tag/foo)`." +msgstr "" +"In der `link()`-[[ikiwiki/PageSpec]] muss diese `tagbase` allerdings " +"angegeben werden. Wenn zum Beispiel `tag` als `tagbase` verwendet wird, " +"können die mit \"foo\" markierten Seiten durch `link(tag/foo)` ausgewählt " +"werden." + +#. type: Plain text +msgid "" +"If you want to override the tagbase for a particular tag, you can use " +"something like this:" +msgstr "" +"Wenn für eine einzelne Markierung eine abweichende `tagbase` verwendet " +"werden soll, kann etwas wie das Folgende verwendet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!tag ./foo]]\n" +"\t\\[[!taglink /foo]]\n" +msgstr "" +"\t\\[[!tag ./foo]]\n" +"\t\\[[!taglink /foo]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/taglink.de.po b/po/underlays/directives/ikiwiki/directive/taglink.de.po new file mode 100644 index 000000000..4ae84ecdb --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/taglink.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/taglink page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 11:31+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/tag]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/tag]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/template.de.po b/po/underlays/directives/ikiwiki/directive/template.de.po new file mode 100644 index 000000000..faa2be614 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/template.de.po @@ -0,0 +1,71 @@ +# German translation of directives/ikiwiki/directive/template page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:09+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `template` directive is supplied by the [[!iki plugins/template " +"desc=template]] plugin." +msgstr "" +"Die `template`-Anweisung wird durch die [[!iki plugins/template " +"desc=template]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"[[Vorlagen|templates]] sind Dateien, die ausgefüllt und in Wiki-Seiten " +"eingefügt werden können, indem die template-Anweisung verwendet wird. Die " +"Anweisung hat einen `id`-Parameter, der die zu verwendende Vorlage " +"identifiziert. Die restlichen Parameter werden verwendet, um die Vorlage " +"auszufüllen." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my " +"note.\"\"\"]]\n" +msgstr "" +"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz " +"eingefügt werden soll.\"\"\"]]\n" + +#. type: Plain text +msgid "" +"This fills out the `note` template, filling in the `text` field with the " +"specified value, and inserts the result into the page." +msgstr "" +"Dies füllt die Vorlage `note` aus, wobei das Feld `text` mit dem angegebenen " +"Wert gefüllt wird, und fügt das Ergebnis in die Seite ein." + +#. type: Plain text +msgid "" +"For a list of available templates, and details about how to create more, see " +"the [[templates]] page." +msgstr "" +"Auf der [[Vorlagen|templates]]-Seite gibt es eine Liste der verfügbaren " +"Vorlagen und auch eine Anleitung, wie weitere angelegt werden können." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/testpagespec.de.po b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po new file mode 100644 index 000000000..f936d7ec3 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po @@ -0,0 +1,84 @@ +# German translation of directives/ikiwiki/directive/testpagespec page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:09+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `testpagespec` directive is supplied by the [[!iki plugins/testpagespec " +"desc=testpagespec]] plugin." +msgstr "" +"Die `testpagespec`-Anweisung wird durch die [[!iki plugins/testpagespec " +"desc=testpagespec]]-Erweiterung bereitgestellt." + +#. type: Plain text +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 "" +"Mit dieser Anweisung kann geprüft werden, ob eine [[ikiwiki/PageSpec]] auf eine " +"Seite passt. Sie zeigt außerdem an, welcher Teil das Passen oder Nicht-Passen " +"verursacht." + +#. type: Plain text +msgid "Example uses:" +msgstr "Beispiele zur Verwendung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n" +msgstr "" +"\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n" + +#. type: Plain text +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 "" +"Dies wird etwas wie \"no match: barpage does not match foopage\" anzeigen und " +"damit darauf hinweisen, welcher Teil der [[ikiwiki/PageSpec]] ein Passen " +"verhindert." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n" +msgstr "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n" + +#. type: Plain text +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 "" +"Dies wird etwas wie \"no match: bar* matches barpage\" anzeigen, weil der Teil " +"der das Passen verhindert negiert ist." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n" +msgstr "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n" + +#. type: Plain text +msgid "" +"This will print out something like \"match: barpage matches barpage\", " +"indicating the part of the [[ikiwiki/PageSpec]] that caused it to match." +msgstr "" +"Dies wird etwas wie \"match: barpage matches barpage\" anzeigen und damit " +"angeben, welcher Teil der [[ikiwiki/PageSpec]] passt." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/teximg.de.po b/po/underlays/directives/ikiwiki/directive/teximg.de.po new file mode 100644 index 000000000..fc2ffab47 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/teximg.de.po @@ -0,0 +1,84 @@ +# German translation of directives/ikiwiki/directive/teximg page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:09+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `teximg` directive is supplied by the [[!iki plugins/teximg " +"desc=teximg]] plugin." +msgstr "" +"Die `teximg`-Anweisung wird durch die [[!iki plugins/teximg " +"desc=teximg]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive renders LaTeX formulas into images." +msgstr "Diese Anweisung wandelt LaTeX-Formeln in Bilder um." + +#. type: Title ## +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, 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 "" +"\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" + +#. type: Plain text +msgid "To scale the image, use height=x:" +msgstr "" +"Um die Größe des Bilds zu verändern, kann `height=y` angegeben werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n" +msgstr "" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n" + +#. type: Plain text +msgid "" +"If no height is chosen 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 "" +"Wenn keine Höhe angegeben wird, wird 12 verwendet. Zulässige Höhen sind 8, " +"9, 10, 11, 12, 14, 17 und 20. Wird eine andere Höhe angegeben, wird " +"stattdessen die nächste zulässige verwendet." + +#. type: Plain text +msgid "To add an alt text to the image, use alt=\"text\":" +msgstr "" +"Um einen `alt`-Text zu dem Bild hinzuzufügen, kann `alt=\"Text\"` verwendet " +"werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n" +msgstr "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/toc.de.po b/po/underlays/directives/ikiwiki/directive/toc.de.po new file mode 100644 index 000000000..55906e0d0 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/toc.de.po @@ -0,0 +1,85 @@ +# German translation of directives/ikiwiki/directive/toc page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:10+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "The `toc` directive is supplied by the [[!iki plugins/toc desc=toc]] plugin." +msgstr "" +"Die `toc`-Anweisung wird durch die [[!iki plugins/toc desc=toc]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "Add a table of contents to a page:" +msgstr "Sie fügt ein Inhaltsverzeichnis in eine Seite ein:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc ]]\n" +msgstr "\t\\[[!toc ]]\n" + +#. type: Plain text +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 "" +"Das Inhaltsverzeichnis wird automatisch ausgehend von den Überschriften der Seite " +"erzeugt. In der Voreinstellung werden nur die größten Überschriften der Seite " +"angezeigt; mit dem Parameter `levels` kann aber die Anzahl der angezeigten " +"Überschriftsebenen gesteuert werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc levels=2]]\n" +msgstr "\t\\[[!toc levels=2]]\n" + +#. type: Plain text +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 "" +"Die `toc`-Anweisung verwendet die Ebene der ersten Überschrift als die oberste, " +"selbst wenn es weiter unten in der Datei höhere Überschriften gibt." + +#. type: Plain text +msgid "" +"To create a table of contents that only shows headers starting with a given " +"level, use the `startlevel` parameter. For example, to show only h2 and " +"smaller headers:" +msgstr "" +"Um in einem Inhaltsverzeichnis nur die Überschriften beginnend mit einer " +"bestimmten Ebene anzuzeigen, kann der `startlevel`-Parameter verwendet werden. " +"Zum Beispiel, um nur <h2>- und kleinere Überschriften anzuzeigen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc startlevel=2]]\n" +msgstr "\t\\[[!toc startlevel=2]]\n" + +#. type: Plain text +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 "" +"Das Inhaltsverzeichnis wird als nummerierte Liste erzeugt. Um eine ungeordnete " +"Liste zu erhalten, kann `list-style` im lokalen Stylesheet verändert werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/toggle.de.po b/po/underlays/directives/ikiwiki/directive/toggle.de.po new file mode 100644 index 000000000..5cb83aa8b --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/toggle.de.po @@ -0,0 +1,113 @@ +# German translation of directives/ikiwiki/directive/toggle page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:10+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `toggle` and `toggleable` directives are supplied by the [[!iki " +"plugins/toggle desc=toggle]] plugin." +msgstr "" +"Die `toggle`- und `toggleable`-Anweisungen werden durch die [[!iki " +"plugins/toggle desc=toggle]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"With these directives you can create links on pages that, when clicked, " +"toggle display of other parts of the page." +msgstr "" +"Mit diesen Anweisungen kann man auf Seiten Links erstellen, die beim " +"Anklicken andere Teile der Seite anzeigen." + +#. type: Plain text +msgid "" +"It uses javascript to accomplish this; browsers without javascript will " +"always see the full page content." +msgstr "" +"Um dies zu erreichen, wird Javascript verwendet; Browser ohne Javascript " +"sehen immer den kompletten Inhalt." + +#. type: Plain text +msgid "Example use:" +msgstr "Beispiel für die Benutzung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toggle id=\"ipsum\" text=\"show\"]]\n" +msgstr "\t\\[[!toggle id=\"ipsum\" text=\"anzeigen\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n" +msgstr "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n" + +#. type: Plain text +#, 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 "" +"\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" + +#. type: Plain text +#, no-wrap +msgid "\t[[!toggle id=\"ipsum\" text=\"hide\"]]\n" +msgstr "\t[[!toggle id=\"ipsum\" text=\"verbergen\"]]\n" + +#. type: Plain text +msgid "" +"Note that you can include wiki markup in the toggleable text, including even " +"additional toggles, as shown in the above example." +msgstr "" +"In dem umschaltbaren Text können beliebige Wiki-Formatierungen verwendet " +"werden, sogar wie im obigen Beispiel weitere `toggle`-Anweisungen." + +#. type: Plain text +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 "" +"Außerdem müssen die Definitionen von `toggle` und `toggleable` nicht " +"nebeneinander stehen, sondern können beliebig über die Seite verteilt werden." +" Es kann auch mehrere `toggle` geben, die das gleiche `toggleable` " +"umschalten." + +#. type: Plain text +msgid "" +"The id has a default value of \"default\", so can be omitted in simple " +"cases." +msgstr "" +"Als `id` ist \"default\" voreingestellt, sodass diese Angabe in einfachen " +"Fällen weggelassen werden kann." + +#. type: Plain text +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 "" +"Wenn ein `toggleable` zu Beginn angezeigt werden soll (um es dann verbergen " +"zu können), kann bei seiner Einrichtung der Parameter `open=yes` angegeben " +"werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/toggleable.de.po b/po/underlays/directives/ikiwiki/directive/toggleable.de.po new file mode 100644 index 000000000..03fe46ff3 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/toggleable.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/toggleable page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 11:52+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/toggle]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/toggle]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/version.de.po b/po/underlays/directives/ikiwiki/directive/version.de.po new file mode 100644 index 000000000..7080a1a43 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/version.de.po @@ -0,0 +1,50 @@ +# German translation of directives/ikiwiki/directive/version page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:11+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `version` directive is supplied by the [[!iki plugins/version " +"desc=version]] plugin." +msgstr "" +"Die `version`-Anweisung wird durch die [[!iki plugins/version " +"desc=version]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive allows inserting the version of ikiwiki onto a page." +msgstr "Diese Anweisung fügt die Version von ikiwiki in eine Seite ein." + +#. type: Plain text +msgid "" +"Whenever ikiwiki is upgraded to a new version, the page will be rebuilt, " +"updating the version number." +msgstr "" +"Immer wenn ikiwiki auf eine neue Version aktualisiert wird, wird diese " +"Seite erneuert, um die Versionsnummer zu aktualisieren." + +#. type: Plain text +msgid "Use is simple:" +msgstr "Die Verwendung ist einfach:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!version ]]\n" +msgstr "\t\\[[!version ]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/smiley/smileys.de.po b/po/underlays/smiley/smileys.de.po new file mode 100644 index 000000000..35ae5b9ed --- /dev/null +++ b/po/underlays/smiley/smileys.de.po @@ -0,0 +1,211 @@ +# German translation of smiley/smileys page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de> +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 20:57+0530\n" +"Last-Translator: Sebastian Kuhnert <mail@sebastian-kuhnert.de>\n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"This page is used to control what smileys are supported by the wiki. Just " +"write the text of a smiley to display it." +msgstr "" +"Diese Seite steuert, welche Smileys von ikiwiki unterstützt werden. " +"Schreibe einfach den Text eines Smileys in den Text, um es anzuzeigen." + +#. type: Bullet: '* ' +msgid "\\\\:)\t[[smileys/smile.png]]" +msgstr "\\\\:)\t[[smileys/smile.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-)\t[[smileys/smile.png]]" +msgstr "\\\\:-)\t[[smileys/smile.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:D\t[[smileys/biggrin.png]]" +msgstr "\\\\:D\t[[smileys/biggrin.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-D\t[[smileys/biggrin.png]]" +msgstr "\\\\:-D\t[[smileys/biggrin.png]]" + +#. type: Bullet: '* ' +msgid "\\\\B)\t[[smileys/smile2.png]]" +msgstr "\\\\B)\t[[smileys/smile2.png]]" + +#. type: Bullet: '* ' +msgid "\\\\B-)\t[[smileys/smile2.png]]" +msgstr "\\\\B-)\t[[smileys/smile2.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:))\t[[smileys/smile3.png]]" +msgstr "\\\\:))\t[[smileys/smile3.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-))\t[[smileys/smile3.png]]" +msgstr "\\\\:-))\t[[smileys/smile3.png]]" + +#. type: Bullet: '* ' +msgid "\\\\;)\t[[smileys/smile4.png]]" +msgstr "\\\\;)\t[[smileys/smile4.png]]" + +#. type: Bullet: '* ' +msgid "\\\\;-)\t[[smileys/smile4.png]]" +msgstr "\\\\;-)\t[[smileys/smile4.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:\\\t[[smileys/ohwell.png]]" +msgstr "\\\\:\\\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-\\\t[[smileys/ohwell.png]]" +msgstr "\\\\:-\\\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:/\t[[smileys/ohwell.png]]" +msgstr "\\\\:/\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-/\t[[smileys/ohwell.png]]" +msgstr "\\\\:-/\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:|\t[[smileys/neutral.png]]" +msgstr "\\\\:|\t[[smileys/neutral.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-|\t[[smileys/neutral.png]]" +msgstr "\\\\:-|\t[[smileys/neutral.png]]" + +#. type: Bullet: '* ' +msgid "\\\\>:>\t[[smileys/devil.png]]" +msgstr "\\\\>:>\t[[smileys/devil.png]]" + +#. type: Bullet: '* ' +msgid "\\\\X-(\t[[smileys/angry.png]]" +msgstr "\\\\X-(\t[[smileys/angry.png]]" + +#. type: Bullet: '* ' +msgid "\\\\<:(\t[[smileys/frown.png]]" +msgstr "\\\\<:(\t[[smileys/frown.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:(\t[[smileys/sad.png]]" +msgstr "\\\\:(\t[[smileys/sad.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-(\t[[smileys/sad.png]]" +msgstr "\\\\:-(\t[[smileys/sad.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-?\t[[smileys/tongue.png]]" +msgstr "\\\\:-?\t[[smileys/tongue.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-P\t[[smileys/tongue.png]]" +msgstr "\\\\:-P\t[[smileys/tongue.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:o\t[[smileys/redface.png]]" +msgstr "\\\\:o\t[[smileys/redface.png]]" + +#. type: Bullet: '* ' +msgid "\\\\|)\t[[smileys/tired.png]]" +msgstr "\\\\|)\t[[smileys/tired.png]]" + +#. type: Bullet: '* ' +msgid "\\\\|-)\t[[smileys/tired.png]]" +msgstr "\\\\|-)\t[[smileys/tired.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{OK}\t[[smileys/thumbs-up.png]]" +msgstr "\\\\{OK}\t[[smileys/thumbs-up.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{X}\t[[smileys/icon-error.png]]" +msgstr "\\\\{X}\t[[smileys/icon-error.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{i}\t[[smileys/icon-info.png]]" +msgstr "\\\\{i}\t[[smileys/icon-info.png]]" + +#. type: Bullet: '* ' +msgid "\\\\(./)\t[[smileys/checkmark.png]]" +msgstr "\\\\(./)\t[[smileys/checkmark.png]]" + +#. type: Bullet: '* ' +msgid "\\\\(!)\t[[smileys/idea.png]]" +msgstr "\\\\(!)\t[[smileys/idea.png]]" + +#. type: Bullet: '* ' +msgid "\\\\[!]\t[[smileys/attention.png]]" +msgstr "\\\\[!]\t[[smileys/attention.png]]" + +#. type: Bullet: '* ' +msgid "\\\\/!\\\t[[smileys/alert.png]]" +msgstr "\\\\/!\\\t[[smileys/alert.png]]" + +#. type: Bullet: '* ' +msgid "\\\\(?)\t[[smileys/question.png]]" +msgstr "\\\\(?)\t[[smileys/question.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{x}\t[[smileys/star_on.png]]" +msgstr "\\\\{x}\t[[smileys/star_on.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{*}\t[[smileys/star_on.png]]" +msgstr "\\\\{*}\t[[smileys/star_on.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{o}\t[[smileys/star_off.png]]" +msgstr "\\\\{o}\t[[smileys/star_off.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{1}\t[[smileys/prio1.png]]" +msgstr "\\\\{1}\t[[smileys/prio1.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{2}\t[[smileys/prio2.png]]" +msgstr "\\\\{2}\t[[smileys/prio2.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{3}\t[[smileys/prio3.png]]" +msgstr "\\\\{3}\t[[smileys/prio3.png]]" + +#. type: Plain text +msgid "For example: {x} B) {x}" +msgstr "Zum Beispiel: {x} B) {x}" + +#. type: Plain text +msgid "" +"To change the supported smileys, just edit the lists on this page. Note " +"that the format is important; each list item should start with the text that " +"is turned into the smiley, escaped so that users can see what produces it, " +"followed by a [[ikiwiki/WikiLink]] to the image to display." +msgstr "" +"Um die unterstützten Simleys zu verändern, bearbeite einfach diese Seite. " +"Beachte dass das Format wichtig ist: Jeder Eintrag in der Liste sollte mit " +"dem Text zum Anzeige des Smileys beginnen (geschützt sodass Benutzer " +"sehen können, wodurch ein Smiley erzeugt wird), gefolgt von einem " +"[[ikiwiki/WikiLink]] auf das anzuzeigende Bild." + +#. type: Plain text +msgid "" +"/!\\ Bear in mind that the link to the image needs to be written in a way " +"that will work if it's copied to other pages on the wiki. So be sure to " +"include the smileys directory in the path to the file." +msgstr "" +"/!\\ Denke daran, dass der Link auf das Bild so geschrieben sein muss, dass " +"er auch dann funktioniert, wenn er in andere Teile des Wikis kopiert wird. " +"Stelle also sicher, dass das Verzeichnis der Smiley-Datei mit angegeben wird." + + diff --git a/po/vi.po b/po/vi.po index 9fccf87b5..5f968ccb3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-04-03 14:18-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lÆ°u." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 msgid "Error" msgstr "Lỗi" @@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 msgid "done" msgstr "xong" @@ -146,35 +146,35 @@ msgstr "xong" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Lỗi gá»­i thÆ°" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Lỗi gá»­i thÆ°" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -182,7 +182,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " @@ -197,12 +197,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -210,7 +210,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -246,7 +246,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" @@ -258,137 +258,146 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "đang gỡ bỏ trang cÅ© %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "đang sá»­a %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "chÆ°a xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "mẫu không xá»­ lý được:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,113 +407,113 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "chÆ°a cài đặt polygen" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --" "atom »" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gá»­i gói tin ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s bị %s khoá nên không thể sá»­a được" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "" @@ -512,19 +521,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "chÆ°a thá»±c hiện getctime" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Lấy OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." @@ -533,31 +542,39 @@ msgstr "Mọi trang được liên kết với trang khác." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Gặp lỗi khi tạo tài khoản." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Lỗi gá»­i thÆ°" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -588,119 +605,119 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gá»­i gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "đang sá»­a %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "bỏ phiếu" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Tổng số phiếu :" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "chÆ°a cài đặt polygen" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -768,12 +785,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -781,82 +798,82 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s bị %s khoá nên không thể sá»­a được" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "chÆ°a xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -871,21 +888,21 @@ msgstr "lỗi ghi %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:184 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:221 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "lối tắt thiếu tên hay tham số url" @@ -893,7 +910,7 @@ msgstr "lối tắt thiếu tên hay tham số url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to <i>%s</i>" msgstr "lối tắt %s chỉ tới %s" @@ -903,121 +920,123 @@ msgstr "lối tắt %s chỉ tới %s" msgid "failed to parse any smileys" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:47 #, perl-format msgid "template %s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:66 #, fuzzy msgid "failed to process:" msgstr "mẫu không xá»­ lý được:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:124 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:105 +#, perl-format +msgid "%s plugin:" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:274 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:290 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1079,32 +1098,42 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s" msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "không thể đọc %s: %s" + +#: ../IkiWiki/Setup.pm:46 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "lỗi biên dịch %s" + +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1123,13 +1152,13 @@ msgid "wrapper filename not specified" msgstr "chÆ°a xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:159 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:179 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1142,19 +1171,23 @@ msgstr "cách sá»­ dụng: ikiwiki [tùy chọn] nguồn đích" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:95 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:102 +msgid "usage: --set-yaml var=value" +msgstr "" + +#: ../ikiwiki.in:156 msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:219 msgid "rebuilding wiki.." msgstr "đang xây dá»±ng lại wiki.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:222 msgid "refreshing wiki.." msgstr "đang làm tÆ°Æ¡i wiki.." @@ -1162,38 +1195,38 @@ msgstr "đang làm tÆ°Æ¡i wiki.." msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:530 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:576 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:605 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1278 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xá»­ lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1901 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:2044 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2055 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2074 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" diff --git a/t/calculate_changed_links.t b/t/calculate_changed_links.t new file mode 100755 index 000000000..bf6e2af45 --- /dev/null +++ b/t/calculate_changed_links.t @@ -0,0 +1,58 @@ +#!/usr/bin/perl +package IkiWiki; + +use warnings; +use strict; +use Test::More tests => 5; + +BEGIN { use_ok("IkiWiki"); } +BEGIN { use_ok("IkiWiki::Render"); } +%config=IkiWiki::defaultconfig(); +$config{srcdir}=$config{destdir}="/dev/null"; + +%oldrenderedfiles=%pagectime=(); +%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks= +%destsources=%renderedfiles=%pagecase=%pagestate=(); + +IkiWiki::checkconfig(); + +foreach my $page (qw(tags/a tags/b Reorder Add Remove TypeAdd TypeRemove)) { + $pagesources{$page} = "$page.mdwn"; + $pagemtime{$page} = $pagectime{$page} = 1000000; +} + +$oldlinks{Reorder} = [qw{tags/a tags/b}]; +$links{Reorder} = [qw{tags/b tags/a}]; + +$oldlinks{Add} = [qw{tags/b}]; +$links{Add} = [qw{tags/a tags/b}]; + +$oldlinks{Remove} = [qw{tags/a}]; +$links{Remove} = []; + +$oldlinks{TypeAdd} = [qw{tags/a tags/b}]; +$links{TypeAdd} = [qw{tags/a tags/b}]; +# This causes TypeAdd to be rebuilt, but isn't a backlink change, so it doesn't +# cause tags/b to be rebuilt. +$oldtypedlinks{TypeAdd}{tag} = { "tags/a" => 1 }; +$typedlinks{TypeAdd}{tag} = { "tags/a" => 1, "tags/b" => 1 }; + +$oldlinks{TypeRemove} = [qw{tags/a tags/b}]; +$links{TypeRemove} = [qw{tags/a tags/b}]; +# This causes TypeRemove to be rebuilt, but isn't a backlink change, so it +# doesn't cause tags/b to be rebuilt. +$oldtypedlinks{TypeRemove}{tag} = { "tags/a" => 1 }; +$typedlinks{TypeRemove}{tag} = { "tags/a" => 1, "tags/b" => 1 }; + +my $oldlink_targets = calculate_old_links([keys %pagesources], []); +is_deeply($oldlink_targets, { + Reorder => { "tags/a" => "tags/a", "tags/b" => "tags/b" }, + Add => { "tags/b" => "tags/b" }, + Remove => { "tags/a" => "tags/a" }, + TypeAdd => { "tags/a" => "tags/a", "tags/b" => "tags/b" }, + TypeRemove => { "tags/a" => "tags/a", "tags/b" => "tags/b" }, + }); +my ($backlinkchanged, $linkchangers) = calculate_changed_links([keys %pagesources], [], $oldlink_targets); + +is_deeply($backlinkchanged, { "tags/a" => 1 }); +is_deeply($linkchangers, { add => 1, remove => 1, typeadd => 1, typeremove => 1 }); diff --git a/t/file_pruned.t b/t/file_pruned.t index 00542d580..f9c1c257e 100755 --- a/t/file_pruned.t +++ b/t/file_pruned.t @@ -1,12 +1,13 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 26; +use Test::More tests => 27; BEGIN { use_ok("IkiWiki"); } %config=IkiWiki::defaultconfig(); +ok(IkiWiki::file_pruned("src/.htaccess", "src")); ok(IkiWiki::file_pruned("src/.ikiwiki/", "src")); ok(IkiWiki::file_pruned("src/.ikiwiki/index", "src")); ok(IkiWiki::file_pruned("src/CVS/foo", "src")); diff --git a/t/index.t b/t/index.t index 2f23524a7..44273059d 100755 --- a/t/index.t +++ b/t/index.t @@ -4,7 +4,7 @@ use strict; use IkiWiki; package IkiWiki; # use internal variables -use Test::More tests => 27; +use Test::More tests => 31; $config{wikistatedir}="/tmp/ikiwiki-test.$$"; system "rm -rf $config{wikistatedir}"; @@ -31,6 +31,7 @@ $renderedfiles{"bar"}=["bar.html", "bar.rss", "sparkline-foo.gif"]; $renderedfiles{"bar.png"}=["bar.png"]; $links{"Foo"}=["bar.png"]; $links{"bar"}=["Foo", "new-page"]; +$typedlinks{"bar"}={tag => {"Foo" => 1}}; $links{"bar.png"}=[]; $depends{"Foo"}={}; $depends{"bar"}={"foo*" => 1}; @@ -45,7 +46,7 @@ ok(-s "$config{wikistatedir}/indexdb", "index file created"); # Clear state. %oldrenderedfiles=%pagectime=(); -%pagesources=%pagemtime=%oldlinks=%links=%depends= +%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks= %destsources=%renderedfiles=%pagecase=%pagestate=(); ok(loadindex(), "load index"); @@ -104,10 +105,16 @@ is_deeply(\%destsources, { "sparkline-foo.gif" => "bar", "bar.png" => "bar.png", }, "%destsources generated correctly"); +is_deeply(\%typedlinks, { + bar => {tag => {"Foo" => 1}}, +}, "%typedlinks loaded correctly"); +is_deeply(\%oldtypedlinks, { + bar => {tag => {"Foo" => 1}}, +}, "%oldtypedlinks loaded correctly"); # Clear state. %oldrenderedfiles=%pagectime=(); -%pagesources=%pagemtime=%oldlinks=%links=%depends= +%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks= %destsources=%renderedfiles=%pagecase=%pagestate=(); # When state is loaded for a wiki rebuild, only ctime and oldrenderedfiles @@ -140,5 +147,9 @@ is_deeply(\%pagecase, { }, "%pagecase generated correctly"); is_deeply(\%destsources, { }, "%destsources generated correctly"); +is_deeply(\%typedlinks, { +}, "%typedlinks cleared correctly"); +is_deeply(\%oldtypedlinks, { +}, "%oldtypedlinks cleared correctly"); system "rm -rf $config{wikistatedir}"; diff --git a/t/openiduser.t b/t/openiduser.t index 52d879484..caabbcefc 100755 --- a/t/openiduser.t +++ b/t/openiduser.t @@ -10,7 +10,7 @@ BEGIN { eval q{use Test::More skip_all => "Net::OpenID::VerifiedIdentity not available"}; } else { - eval q{use Test::More tests => 9}; + eval q{use Test::More tests => 11}; } use_ok("IkiWiki::Plugin::openid"); } @@ -28,6 +28,11 @@ $^W=1; is(IkiWiki::openiduser('http://yam655.livejournal.com/'), 'yam655 [livejournal.com]'); is(IkiWiki::openiduser('http://id.mayfirst.org/jamie/'), 'jamie [id.mayfirst.org]'); +# yahoo has an anchor in the url +is(IkiWiki::openiduser('https://me.yahoo.com/joeyhess#35f22'), 'joeyhess [me.yahoo.com]'); +# google urls are horrendous, but the worst bit is after a ?, so can be dropped +is(IkiWiki::openiduser('https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo'), 'id [www.google.com/accounts/o8]'); + # and some less typical ones taken from the ikiwiki commit history is(IkiWiki::openiduser('http://thm.id.fedoraproject.org/'), 'thm [id.fedoraproject.org]'); diff --git a/t/pagespec_match.t b/t/pagespec_match.t index b96947407..ade9bca5a 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 64; +use Test::More tests => 75; BEGIN { use_ok("IkiWiki"); } @@ -40,11 +40,21 @@ ok(! pagespec_match("foo", "foo and bar"), "foo and bar"); ok(pagespec_match("{f}oo", "{*}*"), "curly match"); ok(! pagespec_match("foo", "{*}*"), "curly !match"); +ok(pagespec_match("somepage", "user(frodo)", user => "frodo")); +ok(pagespec_match("somepage", "user(frodo)", user => "Frodo")); +ok(! pagespec_match("somepage", "user(frodo)", user => "Sam")); +ok(pagespec_match("somepage", "user(*o)", user => "Bilbo")); +ok(pagespec_match("somepage", "user(*o)", user => "frodo")); +ok(! pagespec_match("somepage", "user(*o)", user => "Sam")); +ok(pagespec_match("somepage", "user(http://*.myopenid.com/)", user => "http://foo.myopenid.com/")); +ok(pagespec_match("somepage", "user(*://*)", user => "http://foo.myopenid.com/")); + # The link and backlink stuff needs this. $config{userdir}=""; $links{foo}=[qw{bar baz}]; $links{bar}=[]; $links{baz}=[]; +$links{meh}=[]; $links{"bugs/foo"}=[qw{bugs/done}]; $links{"bugs/done"}=[]; $links{"bugs/bar"}=[qw{done}]; @@ -73,6 +83,7 @@ ok(! pagespec_match("bar", ""), "empty pagespec should match nothing"); ok(! pagespec_match("bar", " "), "blank pagespec should match nothing"); ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success"); ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success"); +ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success"); $IkiWiki::pagectime{foo}=1154532692; # Wed Aug 2 11:26 EDT 2006 $IkiWiki::pagectime{bar}=1154532695; # after @@ -113,3 +124,7 @@ $i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences; is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR"); $i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences; is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation"); +$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences; +is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation"); +$i=pagespec_match("meh", "!link(done)")->influences; +is(join(",", sort keys %$i), 'meh', "a negated, failing link test is successful, so the page is a link influence"); diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t index dd5dcc5b0..05dc012fe 100755 --- a/t/pagespec_match_list.t +++ b/t/pagespec_match_list.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 88; +use Test::More tests => 94; BEGIN { use_ok("IkiWiki"); } @@ -9,6 +9,12 @@ BEGIN { use_ok("IkiWiki"); } $config{srcdir}=$config{destdir}="/dev/null"; IkiWiki::checkconfig(); +{ + package IkiWiki::SortSpec; + + sub cmp_path { $a cmp $b } +} + %pagesources=( foo => "foo.mdwn", foo2 => "foo2.mdwn", @@ -18,6 +24,13 @@ IkiWiki::checkconfig(); "post/2" => "post/2.mdwn", "post/3" => "post/3.mdwn", ); +$IkiWiki::pagectime{foo} = 2; +$IkiWiki::pagectime{foo2} = 2; +$IkiWiki::pagectime{foo3} = 1; +$IkiWiki::pagectime{bar} = 3; +$IkiWiki::pagectime{"post/1"} = 6; +$IkiWiki::pagectime{"post/2"} = 6; +$IkiWiki::pagectime{"post/3"} = 6; $links{foo}=[qw{post/1 post/2}]; $links{foo2}=[qw{bar}]; $links{foo3}=[qw{bar}]; @@ -25,15 +38,24 @@ $links{foo3}=[qw{bar}]; is_deeply([pagespec_match_list("foo", "bar")], ["bar"]); is_deeply([sort(pagespec_match_list("foo", "* and !post/*"))], ["bar", "foo", "foo2", "foo3"]); is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]); +is_deeply([pagespec_match_list("foo", "post/*", sort => "title")], + ["post/1", "post/2", "post/3"]); is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)], ["post/3", "post/2", "post/1"]); is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)], ["post/1", "post/2"]); is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)], ["post/1", "post/2", "post/3"]); +is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50, reverse => 1)], + ["post/3", "post/2", "post/1"]); is_deeply([pagespec_match_list("foo", "post/*", sort => "title", filter => sub { $_[0] =~ /3/}) ], ["post/1", "post/2"]); +is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)], + ["bar", "foo"]); +is_deeply([pagespec_match_list("foo", "foo* or bar*", + sort => "-age title")], # oldest first, break ties by title + ["foo3", "foo", "foo2", "bar"]); my $r=eval { pagespec_match_list("foo", "beep") }; ok(eval { pagespec_match_list("foo", "beep") } == 0); ok(! $@, "does not fail with error when unable to match anything"); @@ -110,3 +132,14 @@ foreach my $spec ("nosuchpage or link(bar)", "link(bar) or nosuchpage", %IkiWiki::depends_simple=(); %IkiWiki::depends=(); } + +my @ps; +foreach my $p (100..500) { + $IkiWiki::pagectime{"p/$p"} = $p; + $pagesources{"p/$p"} = "p/$p.mdwn"; + unshift @ps, "p/$p"; +} +is_deeply([pagespec_match_list("foo", "p/*", sort => "age")], + [@ps]); +is_deeply([pagespec_match_list("foo", "p/*", sort => "age", num => 20)], + [@ps[0..19]]); diff --git a/t/preprocess.t b/t/preprocess.t index e5026ed64..7bb9878d0 100755 --- a/t/preprocess.t +++ b/t/preprocess.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 21; +use Test::More tests => 31; BEGIN { use_ok("IkiWiki"); } @@ -26,6 +26,16 @@ is(IkiWiki::preprocess("foo", "foo", "[[foo ]]", 0, 0), "foo()", "simple"); is(IkiWiki::preprocess("foo", "foo", "[[!foo ]]", 0, 0), "foo()", "prefixed"); is(IkiWiki::preprocess("foo", "foo", "[[!foo]]", 0, 0), "[[!foo]]", "prefixed, no space"); is(IkiWiki::preprocess("foo", "foo", "[[foo a=1]]", 0, 0), "foo(a => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="1"]]}, 0, 0), "foo(a => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""1"""]]}, 0, 0), "foo(a => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a=""]]}, 0, 0), "foo(a)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b="1"]]}, 0, 0), "foo(a, b => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a=""""""]]}, 0, 0), "foo(a)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b="1"]]}, 0, 0), "foo(a, b => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b="""1"""]]}, 0, 0), "foo(a, b => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b=""""""]]}, 0, 0), "foo(a, b)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b=""""""]]}, 0, 0), "foo(a, b)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b="""1"""]]}, 0, 0), "foo(a, b => 1)"); is(IkiWiki::preprocess("foo", "foo", "[[foo a=\"1 2 3 4\"]]", 0, 0), "foo(a => 1 2 3 4)"); is(IkiWiki::preprocess("foo", "foo", "[[foo ]] then [[foo a=2]]", 0, 0), "foo() then foo(a => 2)"); diff --git a/t/tag.t b/t/tag.t new file mode 100755 index 000000000..fe547d85b --- /dev/null +++ b/t/tag.t @@ -0,0 +1,39 @@ +#!/usr/bin/perl +package IkiWiki; + +use warnings; +use strict; +use Test::More tests => 7; + +BEGIN { use_ok("IkiWiki"); } +BEGIN { use_ok("IkiWiki::Plugin::tag"); } + +ok(! system("rm -rf t/tmp; mkdir t/tmp")); + +$config{userdir} = "users"; +$config{tagbase} = "tags"; + +%oldrenderedfiles=%pagectime=(); +%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks= +%destsources=%renderedfiles=%pagecase=%pagestate=(); + +foreach my $page (qw(tags/numbers tags/letters one two alpha beta)) { + $pagesources{$page} = "$page.mdwn"; + $pagemtime{$page} = $pagectime{$page} = 1000000; +} + +$links{one}=[qw(tags/numbers alpha tags/letters)]; +$links{two}=[qw(tags/numbers)]; +$links{alpha}=[qw(tags/letters one)]; +$links{beta}=[qw(tags/letters)]; +$typedlinks{one}={tag => {"tags/numbers" => 1 }}; +$typedlinks{two}={tag => {"tags/numbers" => 1 }}; +$typedlinks{alpha}={tag => {"tags/letters" => 1 }}; +$typedlinks{beta}={tag => {"tags/letters" => 1 }}; + +ok(pagespec_match("one", "tagged(numbers)")); +ok(!pagespec_match("two", "tagged(alpha)")); +ok(pagespec_match("one", "link(tags/numbers)")); +ok(pagespec_match("one", "link(alpha)")); + +1; diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl index 768695a2c..87cbee9e0 100644 --- a/templates/atomitem.tmpl +++ b/templates/atomitem.tmpl @@ -1,48 +1,48 @@ <entry> <title><TMPL_VAR TITLE> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + " type="text/html" /> - - + + " type="application/atom+xml" /> - + diff --git a/templates/atompage.tmpl b/templates/atompage.tmpl index dcb89ab5c..fc0088ae8 100644 --- a/templates/atompage.tmpl +++ b/templates/atompage.tmpl @@ -6,31 +6,31 @@ - + - + - - - - - - - - + + + + - - - - - + + + + + + + + + - + - + ikiwiki diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl index 37ad78c5c..23cd95430 100644 --- a/templates/calendarmonth.tmpl +++ b/templates/calendarmonth.tmpl @@ -1,3 +1,5 @@ +[[!sidebar content=""" [[!calendar type=month month= year= pages=""]] +"""]] [[!inline pages="creation_month() and creation_year() and " show=0 feeds=no reverse=yes]] diff --git a/templates/change.tmpl b/templates/change.tmpl index 0e61a80f4..c9f6ce42b 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -27,7 +27,7 @@
Commit type:
Date: - +
diff --git a/templates/page.tmpl b/templates/page.tmpl index 968066a19..7e850a56b 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -3,6 +3,7 @@ + <TMPL_VAR TITLE> @@ -91,7 +92,7 @@
-