diff options
53 files changed, 1299 insertions, 610 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 2190f008c..08a3d7875 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2608,7 +2608,12 @@ sub match_created_after ($$;@) { } sub match_creation_day ($$;@) { - if ((localtime($IkiWiki::pagectime{shift()}))[3] == shift) { + my $page=shift; + my $d=shift; + if ($d !~ /^\d+$/) { + return IkiWiki::ErrorReason->new("invalid day $d"); + } + if ((localtime($IkiWiki::pagectime{$page}))[3] == $d) { return IkiWiki::SuccessReason->new('creation_day matched'); } else { @@ -2617,7 +2622,12 @@ sub match_creation_day ($$;@) { } sub match_creation_month ($$;@) { - if ((localtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift) { + my $page=shift; + my $m=shift; + if ($m !~ /^\d+$/) { + return IkiWiki::ErrorReason->new("invalid month $m"); + } + if ((localtime($IkiWiki::pagectime{$page}))[4] + 1 == $m) { return IkiWiki::SuccessReason->new('creation_month matched'); } else { @@ -2626,7 +2636,12 @@ sub match_creation_month ($$;@) { } sub match_creation_year ($$;@) { - if ((localtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift) { + my $page=shift; + my $y=shift; + if ($y !~ /^\d+$/) { + return IkiWiki::ErrorReason->new("invalid year $y"); + } + if ((localtime($IkiWiki::pagectime{$page}))[5] + 1900 == $y) { return IkiWiki::SuccessReason->new('creation_year matched'); } else { diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index a78058ffe..3b0a7b314 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -148,6 +148,7 @@ sub match_mimetype ($$;@) { if (! defined $mimetype) { open(my $file_h, "-|", "file", "-bi", $file); $mimetype=<$file_h>; + chomp $mimetype; close $file_h; } if (! defined $mimetype || $mimetype !~s /;.*//) { diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm index d54e71131..b596bc0a1 100644 --- a/IkiWiki/Plugin/format.pm +++ b/IkiWiki/Plugin/format.pm @@ -29,22 +29,24 @@ sub preprocess (@) { if (! defined $format || ! defined $text) { error(gettext("must specify format and text")); } + + # Other plugins can register htmlizeformat hooks to add support + # for page types not suitable for htmlize, or that need special + # processing when included via format. Try them until one succeeds. + my $ret; + IkiWiki::run_hooks(htmlizeformat => sub { + $ret=shift->($format, $text) + unless defined $ret; + }); + + if (defined $ret) { + return $ret; + } elsif (exists $IkiWiki::hooks{htmlize}{$format}) { return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text); } else { - # Other plugins can register htmlizefallback - # hooks to add support for page types - # not suitable for htmlize. Try them until - # one succeeds. - my $ret; - IkiWiki::run_hooks(htmlizefallback => sub { - $ret=shift->($format, $text) - unless defined $ret; - }); - return $ret if defined $ret; - error(sprintf(gettext("unsupported page format %s"), $format)); } } diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index e89813253..f5101d904 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -9,7 +9,7 @@ use open qw{:utf8 :std}; my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes -my $no_chdir=0; +my $git_dir=undef; sub import { hook(type => "checkconfig", id => "git", call => \&checkconfig); @@ -164,9 +164,13 @@ sub safe_git (&@) { if (!$pid) { # In child. # Git commands want to be in wc. - if (! $no_chdir) { + if (! defined $git_dir) { chdir $config{srcdir} - or error("Cannot chdir to $config{srcdir}: $!"); + or error("cannot chdir to $config{srcdir}: $!"); + } + else { + chdir $git_dir + or error("cannot chdir to $git_dir: $!"); } exec @cmdline or error("Cannot exec '@cmdline': $!"); } @@ -721,14 +725,13 @@ sub rcs_getmtime ($) { } { -my $git_root; - +my $ret; sub git_find_root { # The wiki may not be the only thing in the git repo. # Determine if it is in a subdirectory by examining the srcdir, # and its parents, looking for the .git directory. - return $git_root if defined $git_root; + return @$ret if defined $ret; my $subdir=""; my $dir=$config{srcdir}; @@ -740,7 +743,8 @@ sub git_find_root { } } - return $git_root=$subdir; + $ret=[$subdir, $dir]; + return @$ret; } } @@ -748,7 +752,7 @@ sub git_find_root { sub git_parse_changes { my @changes = @_; - my $subdir = git_find_root(); + my ($subdir, $rootdir) = git_find_root(); my @rets; foreach my $ci (@changes) { foreach my $detail (@{ $ci->{'details'} }) { @@ -794,8 +798,8 @@ sub git_parse_changes { die $@ if $@; my $fh; ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") - . "git show $detail->{sha1_to} > '$path'"; + my $cmd = "cd $git_dir && ". + "git show $detail->{sha1_to} > '$path'"; if (system($cmd) != 0) { error("failed writing temp file '$path'."); } @@ -825,10 +829,12 @@ sub rcs_receive () { # Avoid chdir when running git here, because the changes # are in the master git repo, not the srcdir repo. + # (Also, if a subdir is involved, we don't want to chdir to + # it and only see changes in it.) # The pre-receive hook already puts us in the right place. - $no_chdir=1; + $git_dir="."; push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); - $no_chdir=0; + $git_dir=undef; } return reverse @rets; @@ -838,7 +844,24 @@ sub rcs_preprevert ($) { my $rev=shift; my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint - return git_parse_changes(git_commit_info($sha1, 1)); + # Examine changes from root of git repo, not from any subdir, + # in order to see all changes. + my ($subdir, $rootdir) = git_find_root(); + $git_dir=$rootdir; + my @commits=git_commit_info($sha1, 1); + $git_dir=undef; + + if (! @commits) { + error "unknown commit"; # just in case + } + + # git revert will fail on merge commits. Add a nice message. + if (exists $commits[0]->{parents} && + @{$commits[0]->{parents}} > 1) { + error gettext("you are not allowed to revert a merge"); + } + + return git_parse_changes(@commits); } sub rcs_revert ($) { diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index d4ade0a7b..872537c72 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -10,8 +10,8 @@ sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); # this hook is used by the format plugin - hook(type => "htmlizefallback", id => "highlight", call => - \&htmlizefallback); + hook(type => "htmlizeformat", id => "highlight", + call => \&htmlizeformat, last => 1); } sub getsetup () { @@ -74,12 +74,13 @@ sub checkconfig () { }, longname => sprintf(gettext("Source code: %s"), $file), @opts, + last => 1, ); } } } -sub htmlizefallback { +sub htmlizeformat { my $format=lc shift; my $langfile=ext2langfile($format); diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 2375ead89..bd527c8c8 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -156,10 +156,7 @@ sub preprocess (@) { $imgurl="$config{url}/$imglink"; } - if (exists $params{class}) { - $params{class}.=" img"; - } - else { + if (! exists $params{class}) { $params{class}="img"; } diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 95fbcee76..75bf2f458 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -252,9 +252,20 @@ sub get_changed_files ($$) { my @ret; my %seen = (); - + + # we need to strip off the relative path to the source dir + # because monotone outputs all file paths absolute according + # to the workspace root + my $rel_src_dir = $config{'srcdir'}; + $rel_src_dir =~ s/^\Q$config{'mtnrootdir'}\E\/?//; + $rel_src_dir .= "/" if length $rel_src_dir; + while ($changes =~ m/\s*(add_file|patch|delete|rename)\s"(.*?)(?<!\\)"\n/sg) { my $file = $2; + # ignore all file changes outside the source dir + next unless $file =~ m/^\Q$rel_src_dir\E/; + $file =~ s/^\Q$rel_src_dir\E//; + # don't add the same file multiple times if (! $seen{$file}) { push @ret, $file; diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm index 0d9a0b35b..fcfb68be9 100644 --- a/IkiWiki/Plugin/txt.pm +++ b/IkiWiki/Plugin/txt.pm @@ -17,6 +17,7 @@ sub import { hook(type => "getsetup", id => "txt", call => \&getsetup); hook(type => "filter", id => "txt", call => \&filter); hook(type => "htmlize", id => "txt", call => \&htmlize); + hook(type => "htmlizeformat", id => "txt", call => \&htmlizeformat); eval q{use URI::Find}; if (! $@) { @@ -46,25 +47,42 @@ sub filter (@) { will_render($params{page}, 'robots.txt'); writefile('robots.txt', $config{destdir}, $content); } - - encode_entities($content, "<>&"); - if ($findurl) { - my $finder = URI::Find->new(sub { - my ($uri, $orig_uri) = @_; - return qq|<a href="$uri">$orig_uri</a>|; - }); - $finder->find(\$content); - } - $content = "<pre>" . $content . "</pre>"; + return txt2html($content); } return $content; } +sub txt2html ($) { + my $content=shift; + + encode_entities($content, "<>&"); + if ($findurl) { + my $finder = URI::Find->new(sub { + my ($uri, $orig_uri) = @_; + return qq|<a href="$uri">$orig_uri</a>|; + }); + $finder->find(\$content); + } + return "<pre>" . $content . "</pre>"; +} + # We need this to register the .txt file extension sub htmlize (@) { my %params=@_; return $params{content}; } +sub htmlizeformat ($$) { + my $format=shift; + my $content=shift; + + if ($format eq 'txt') { + return txt2html($content); + } + else { + return; + } +} + 1 diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 11b4428e3..0ab18997c 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -219,7 +219,8 @@ sub showfields ($$$@) { options => [ [ 1 => $description ] ], fieldset => $section, ); - if (! $form->submitted) { + if (! $form->submitted || + ($info{advanced} && $form->submitted eq 'Advanced Mode')) { $form->field(name => $name, value => $value); } } @@ -295,6 +296,7 @@ sub showform ($$) { $form->field(name => "do", type => "hidden", value => "setup", force => 1); $form->field(name => "rebuild_asked", type => "hidden"); + $form->field(name => "showadvanced", type => "hidden"); if ($form->submitted eq 'Basic Mode') { $form->field(name => "showadvanced", type => "hidden", diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 225f2b9ab..c73adfbbb 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -73,7 +73,7 @@ sub test () { }) || error("failed adding user"); } - check_canchange( + IkiWiki::check_canchange( cgi => $cgi, session => $session, changes => [IkiWiki::rcs_receive()] diff --git a/auto-blog.setup b/auto-blog.setup index 980074ec3..0eb83ded6 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 opendiscussion blogspam calendar sidebar}], + add_plugins => [qw{goodstuff websetup comments blogspam calendar sidebar}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, @@ -49,6 +49,6 @@ IkiWiki::Setup::Automator->import( archive_pagespec => "page(posts/*) and !*/Discussion", global_sidebars => 0, discussion => 0, - locked_pages => "*", + locked_pages => "* and !postcomment(*)", tagbase => "tags", ) diff --git a/debian/changelog b/debian/changelog index 53bee5df6..f6ca122a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,19 @@ -ikiwiki (3.20100927) UNRELEASED; urgency=low +ikiwiki (3.20101024) UNRELEASED; urgency=low + + * txt: Fix display when used inside a format directive. + * highlight: Ensure that other, more-specific format plugins, + like txt are used in preference to this one in case of ties. + + -- Joey Hess <joeyh@debian.org> Mon, 25 Oct 2010 22:30:29 -0400 + +ikiwiki (3.20101023) unstable; urgency=low + + * Fix typo that broke anonymous git push. + * Fix web reversion when the srcdir is in a subdir of the git repo. + + -- Joey Hess <joeyh@debian.org> Sat, 23 Oct 2010 16:36:50 -0400 + +ikiwiki (3.20101019) unstable; urgency=low * Fix test suite failure on other side of date line. * htmltidy: Allow configuring tidy parameters in setup file. @@ -10,8 +25,16 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Thanks to Peter Gammie for his assistance with the web-based reversion feature. * actiontabs: More consistent styling of Hn tags. - - -- Joey Hess <joeyh@debian.org> Wed, 29 Sep 2010 11:58:23 -0400 + * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. + * monotone: Fix recentchanges page when the srcdir is not at the top + of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments. + + -- Joey Hess <joeyh@debian.org> Tue, 19 Oct 2010 02:32:23 -0400 ikiwiki (3.20100926) unstable; urgency=low diff --git a/doc/bugs/More_permission_checking.mdwn b/doc/bugs/More_permission_checking.mdwn new file mode 100644 index 000000000..e56cda98b --- /dev/null +++ b/doc/bugs/More_permission_checking.mdwn @@ -0,0 +1,9 @@ +I'm often confused about permissions and I wish ikiwiki could stamp it's foot down and ensure all the permissions are correctly (canonically?) setup. + +I keep ending up having to `sudo chown -R :www-data` and `sudo chmod -R g+w` on srcdir, destdir. I'm never quite sure what is the best practice for the srcdirs' `/srv/git/` is. Currently everything looks like `hendry:www-data` with ug+rw. + +I think I've triggered these problems by (not thinking and) running `ikiwiki --rebuild --setup /home/hendry/.ikiwiki/mywiki.setup` as my user. + +I don't know if there can be some lookup with `/etc/ikiwiki/wikilist`. Though shouldn't everything be under the `www-data` group in reality? + +Also when I use `sudo ikiwiki -setup /etc/ikiwiki/auto.setup`, I think I create a ton of problems for myself since everything is created as the root user, right? And `/etc/ikiwiki/wikilist` doesn't seem to have the latest created wiki added. I have to reluctantly manually do this. diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn index 10ba15066..e7797765f 100644 --- a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -27,3 +27,5 @@ I would prefer if the `img` class were only added if no class attribute is passed. If you keep the current behaviour, please document it. + +> [[done]] --[[Joey]] diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn new file mode 100644 index 000000000..35f624f78 --- /dev/null +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -0,0 +1,5 @@ +The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir +in a subdirectory of the repository. It must be at the top. Git has +special code to handle this case. --[[Joey]] + +[[done]] diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn new file mode 100644 index 000000000..6f18cfcba --- /dev/null +++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn @@ -0,0 +1,14 @@ +I created [[sandbox/revert me]] and then tried the revert button on +[[recentchanges]], but I was not allowed to revert it. The specific error +was + + Error: you are not allowed to change sandbox/revert_me.mdwn + +I've just tried reading through the revert code, and I haven't figured out +what permission I am lacking. Perhaps the error message could be a little +clearer on that. The error might have been thrown by git_parse_changes in +git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon + +[[fixed|done]] --[[Joey]] + +: Brilliant, many thanks. -- [[Jon]] diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn new file mode 100644 index 000000000..8d6700651 --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn @@ -0,0 +1,7 @@ +I have been mucking about with ikiwiki for two whole days now. + +I like many things about it. Even though I've been spending most of my time wrestling with css I did manage to write a whole lot of blog posts and love what ikiwiki is doing for the "revise" part of my writing cycle. And I like the idea of integrating the wiki and the blog into one unifying architecture.... + +But... I would like very much to have different page templates for blogging and wiki-ing, some way of specifying that for stuff in the "/posts" directory I'd rather use blogpost.tmpl rather than page.tmpl. I just spent a few minutes looking at the perl for this (I assume Render.pm) and my mind dumped core... + +(generically, some way to specify output formatting on a subdirectory basis would be good) diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment new file mode 100644 index 000000000..e92f4107d --- /dev/null +++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk" + nickname="Javier" + subject="comment 1" + date="2010-10-21T15:00:50Z" + content=""" +You can do what you want with the [[ikiwiki/directive/pagetemplate]] directive, but in a slightly cumbersome way, because you have to say what template you want in every page that differs from the default. + +See also: [[templates]] + +And, a perhaps more proper solution to your problem, although I don't fully understand the way of tackling it, in [[todo/multiple_template_directories]]. + +If you could create a proper page in this wiki, centralizing all the knowledge dispersed in those pages, it would be nice ;) + +--[[jerojasro]] +"""]] diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn new file mode 100644 index 000000000..2860d0d17 --- /dev/null +++ b/doc/forum/Discussion_PageSpec__63__.mdwn @@ -0,0 +1,3 @@ +I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion? + +> Not currently, sorry. --[[Joey]] diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn new file mode 100644 index 000000000..fcffe690f --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn @@ -0,0 +1,3 @@ +Map Plugin, would like to add ?updated to all links created. + +When I edit a page and then click that page in a map in a sidebar Safari always shows me a cached page. diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment new file mode 100644 index 000000000..ce1a78584 --- /dev/null +++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="justint" + ip="24.182.207.250" + subject="skip it" + date="2010-10-13T05:30:50Z" + content=""" +skip it, I added + + <meta http-equiv=\"expires\" value=\"Thu, 16 Mar 2000 11:00:00 GMT\" /> + <meta http-equiv=\"pragma\" content=\"no-cache\" /> + +to my page.tmpl and the problem went away. +"""]] diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn new file mode 100644 index 000000000..6b2fd6df0 --- /dev/null +++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn @@ -0,0 +1,5 @@ +I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, but at best I'm currently restricted to copying over and using whatever is in the indexdb with this approach: + + perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*" + +I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn index 6c50fa32e..9e3ae54df 100644 --- a/doc/ikiwiki/directive/template.mdwn +++ b/doc/ikiwiki/directive/template.mdwn @@ -34,11 +34,15 @@ large chunks of marked up text to be embedded into a 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, +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`; +By default, these are searched for in `/usr/share/ikiwiki/templates`, the `templatedir` setting can be used to make another directory be searched -first.) +first. When referring to templates outside the wiki source directory, the "id" +parameter is not interpreted as a pagespec, and you must include the full filename +of the template page, including the ".tmpl" extension. E.g.: + + \[[!template id=blogpost.tmpl]] 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 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 6aec561ae..fe1af4c15 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 2f70c67b7..2836d96e5 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -154,7 +154,7 @@ Personal sites and blogs * [Ertug Karamatli](http://pages.karamatli.com) * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day. * [Daniel Wayne Armstrong](http://circuidipity.com/) -* [Mukund](https://www.mukund.org/) +* [Mukund](https://mukund.org/) * [Nicolas Schodet](http://ni.fr.eu.org/) * [weakish](http://weakish.github.com) * [Thomas Kane](http://planetkane.org/) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 025a07802..05991ff72 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]] +[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]] diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn deleted file mode 100644 index be85cb949..000000000 --- a/doc/news/version_3.20100804.mdwn +++ /dev/null @@ -1,14 +0,0 @@ -ikiwiki 3.20100804 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * template: Fix dependency tracking. Broken in version 3.20100427. - * po: The po\_slave\_languages setting is now a list, so the order of - translated languages can be controlled. (intrigeri) - * git: Fix gitweb historyurl examples so "diff to current" links work. - (Thanks jrayhawk) - * meta: Allow syntax closer to html meta to be used. - * Add new disable hook, allowing plugins to perform cleanup after they - have been disabled. - * Use Digest::SHA built into perl rather than external Digest::SHA1 - to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040) - * Fixes a bug that prevented matching deleted pages when using the page() - PageSpec."""]]
\ No newline at end of file diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn deleted file mode 100644 index 1073933a1..000000000 --- a/doc/news/version_3.20100815.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -ikiwiki 3.20100815 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Fix po test suite to not assume ikiwiki's underlay is already installed. - Closes: #[593047](http://bugs.debian.org/593047)"""]]
\ No newline at end of file diff --git a/doc/news/version_3.20101019.mdwn b/doc/news/version_3.20101019.mdwn new file mode 100644 index 000000000..86c302e25 --- /dev/null +++ b/doc/news/version_3.20101019.mdwn @@ -0,0 +1,20 @@ +ikiwiki 3.20101019 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) + * Updated French program translation. Closes: #[598918](http://bugs.debian.org/598918) + * git: Added new rcs\_revert and rcs\_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. + * actiontabs: More consistent styling of Hn tags. + * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. + * monotone: Fix recentchanges page when the srcdir is not at the top + of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments."""]]
\ No newline at end of file diff --git a/doc/news/version_3.20101023.mdwn b/doc/news/version_3.20101023.mdwn new file mode 100644 index 000000000..44bed6be6 --- /dev/null +++ b/doc/news/version_3.20101023.mdwn @@ -0,0 +1,4 @@ +ikiwiki 3.20101023 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Fix typo that broke anonymous git push. + * Fix web reversion when the srcdir is in a subdir of the git repo."""]]
\ No newline at end of file diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn index 1a9844577..77005a6a1 100644 --- a/doc/plugins/aggregate/discussion.mdwn +++ b/doc/plugins/aggregate/discussion.mdwn @@ -89,3 +89,30 @@ New bug: new posts aren't getting displayed (or cached for aggregation). After f >>> mind having a copy to investigate. --[[Joey]] >>>> Didn't think of that, will keep a copy if there's a next time. -- [[schmonz]] + +----- + +In a corporate environment where feeds are generally behind +authentication, I need to prime the aggregator's `LWP::UserAgent` +with some cookies. What I've done is write a custom plugin to populate +`$config{cookies}` with an `HTTP::Cookies` object, plus this diff: + + --- /var/tmp/pkg/lib/perl5/vendor_perl/5.10.0/IkiWiki/Plugin/aggregate.pm 2010-06-24 13:03:33.000000000 -0400 + +++ aggregate.pm 2010-06-24 13:04:09.000000000 -0400 + @@ -488,7 +488,11 @@ + } + $feed->{feedurl}=pop @urls; + } + - my $res=URI::Fetch->fetch($feed->{feedurl}); + + my $res=URI::Fetch->fetch($feed->{feedurl}, + + UserAgent => LWP::UserAgent->new( + + cookie_jar => $config{cookies}, + + ), + + ); + if (! $res) { + $feed->{message}=URI::Fetch->errstr; + $feed->{error}=1; + +It works, but I have to remember to apply the diff whenever I update +ikiwiki. Can you provide a more elegant means of allowing cookies and/or +the user agent to be programmatically manipulated? --[[schmonz]] diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index 7149cc163..2622abc88 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -9,3 +9,6 @@ inside `/usr/share/ikiwiki/themes/`. A theme provides, via the underlay, an enhanced version of the regular [[style.css]]. This leaves [[local.css]] free for you to further customise. Themes can also provide header and background images. + +You can set the theme via the **theme** option in your config file (after +enabling the plugin). Refresh the wiki after changing it to see the changes. diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index a3a20fd78..c665e67f0 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -53,6 +53,7 @@ Bulleted list * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]] * <http://www.gnu.org/> * [GNU](http://www.gnu.org/) +* <a href="http://kitenet.net/~joey/">Joey's blog</a> ---- diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn new file mode 100644 index 000000000..a955185ef --- /dev/null +++ b/doc/sandbox/hey.mdwn @@ -0,0 +1 @@ +* Hello diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn new file mode 100644 index 000000000..2b1cd2f94 --- /dev/null +++ b/doc/sandbox/revert_me.mdwn @@ -0,0 +1 @@ +this looks good diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index d67a9131b..4a7163eae 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,6 +6,10 @@ ---- +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15 + +---- + The u32 page is excellent, but I wonder if documenting the procedure here would be worthwhile. Who knows, the remote site might disappear. But also there are some variations on the approach that might be useful: diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn new file mode 100644 index 000000000..8b649156d --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn @@ -0,0 +1,184 @@ +These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a three year old machine with a lot of stuff on it so it took quite a while, YMMV. + +The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick. + + +## installing git: + +cd /opt/ikiwiki/install + +curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O + +tar xzvf git-(latest version).tar.gz + +cd git-(latest version) + +./configure --prefix=/usr/local + +make prefix=/usr/local all + +sudo make install + + +git config --global user.name "firstname lastname" + +git config --global user.email "email here" + +git config --global color.ui "auto" + + +curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /usr/local/share/man/ + + +## installing ikiwiki: +I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely. +I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error. + +cd .. + +git clone git://git.ikiwiki.info/ + +cd git.ikiwiki.info/ + +perl Makefile.PL LIB=/Library/Perl/5.10.0 + +make + +sudo make install + +when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang. + + +## using git from inside a git folder: + +start with git clone, then learn to do the git dance like this. + +git pull + +make your changes to your clone + +git commit -a -m "message here" + +git push + + +When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend. + +## installing gitweb + +cd ../git-1.7.3.1/gitweb + +make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" + +cp gitweb.cgi /Library/WebServer/CGI-Executables/ + +cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/ + +cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/ + + +sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi + +sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png + +sudo chmod 2755 /Library/WebServer/Documents/git-logo.png + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.css + +sudo chmod 2755 /Library/WebServer/Documents/gitweb.js + + +## installing xapian: + +download xapian and omega + +I needed pcre: sudo ports install pcre + +./configure + +make + +sudo make install + + +## installing omega: + +I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back. + +./configure + +make + +sudo make install + + +## installing Search::Xapian from CPAN + +for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source. + +perl Makefile.PL + +make + +make test + +sudo make install + +it installed without issue so I'm baffled why it didn't install from command line. + + + ## setup file + _!/usr/bin/perl + _ Ikiwiki setup automator. + + _ This setup file causes ikiwiki to create a wiki, check it into revision + _ control, generate a setup file for the new wiki, and set everything up. + + _ Just run: ikiwiki -setup /etc/ikiwiki/auto.setup + + _By default, it asks a few questions, and confines itself to the user's home + _directory. You can edit it to change what it asks questions about, or to + _modify the values to use site-specific settings. + require IkiWiki::Setup::Automator; + + our $wikiname="your wiki"; + our $wikiname_short="yourwiki"; + our $rcs="git"; + our $admin="your name"; + use Net::Domain q{hostfqdn}; + our $domain="your.domain"; + + IkiWiki::Setup::Automator->import( + wikiname => $wikiname, + adminuser => [$admin], + rcs => $rcs, + srcdir => "/opt/ikiwiki/$wikiname_short", + destdir => "/Library/WebServer/Documents/$wikiname_short", + repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "/opt/ikiwiki/$wikiname_short.setup", + url => "http://$domain/$wikiname_short", + cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi", + adminemail => "your\@email.com", + add_plugins => [qw{goodstuff websetup}], + disable_plugins => [qw{}], + libdir => "/opt/ikiwiki/.ikiwiki", + rss => 1, + atom => 1, + syslog => 1, + ) + + +## turning on search plugin: + +I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory". +I did a "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega". + +Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing. + + + diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn new file mode 100644 index 000000000..ae3969879 --- /dev/null +++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn @@ -0,0 +1 @@ +If you want do a bunch of manual labor, this is good, but most people probably want to get ikiwiki via a package system. My Mac laptop's ikiwiki is installed from pkgsrc. --[[schmonz]] diff --git a/doc/users/anarcat.wiki b/doc/users/anarcat.wiki new file mode 100644 index 000000000..7ef474ed6 --- /dev/null +++ b/doc/users/anarcat.wiki @@ -0,0 +1 @@ +Hello! I'm anarcat. See [[https://wiki.koumbit.net/TheAnarcat]] to know more about me. diff --git a/ikiwiki.spec b/ikiwiki.spec index 5cd072750..7653ac671 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100926 +Version: 3.20101023 Release: 1%{?dist} Summary: A wiki compiler @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -130,6 +130,11 @@ msgstr "данните от източника предизвикаха греш msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "грешка при обработване на шаблона" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -256,7 +261,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -335,12 +340,6 @@ msgstr "не е указан файл на обвивката" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "грешка при обработване на шаблона" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -369,21 +368,30 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "крешка при компилиране на файла %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -413,7 +421,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" @@ -468,12 +476,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "шаблонът „%s” не е намерен" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -509,17 +517,17 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -800,6 +808,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -1000,11 +1018,6 @@ msgstr "създаване на нова страницa „%s”" msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "шаблонът „%s” не е намерен" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1029,26 +1042,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,11 +1071,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "пропускане на невалидното име на файл „%s”" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1178,13 +1186,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1237,21 +1245,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "пропускане на невалидното име на файл „%s”" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "шаблонът „%s” не е намерен" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1276,6 +1294,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "шаблонът „%s” не е намерен" + #~ msgid "You need to log in first." #~ msgstr "Първо трябва да влезете." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -129,6 +129,11 @@ msgstr "kanál shodil XML::Feed!" msgid "creating new page %s" msgstr "vytvářím novou stránku %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "nepodařilo se zpracovat:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "mažu bucket..." @@ -256,7 +261,7 @@ msgstr "Přidán komentář" msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" @@ -334,12 +339,6 @@ msgstr "nebyl zadán parametr match" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "nepodařilo se zpracovat:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "musíte zadat formát a text" @@ -366,21 +365,31 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, 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:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "nejste oprávněni měnit %s" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "nelze zkompilovat %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +418,7 @@ 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" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" @@ -458,12 +467,12 @@ msgstr "parametry %s a %s nelze použít zároveň" msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "šablona %s nebyla nalezena" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -495,15 +504,15 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -790,6 +799,16 @@ msgstr "neplatná procentuální hodnota %s" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "potvrďte odstranění %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff oříznut)" @@ -980,11 +999,6 @@ msgstr "vytvářím novou stránku %s" msgid "missing id parameter" msgstr "chybí parametr id" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s nenalezen" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "chybí TeXový kód" @@ -1008,20 +1022,20 @@ msgstr "moduly" msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../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:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1029,7 +1043,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1041,11 +1055,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "chybné jméno souboru %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1163,13 +1172,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:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1221,21 +1230,31 @@ msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "chybné jméno souboru %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "šablona %s nebyla nalezena" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" @@ -1260,6 +1279,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "%s not found" +#~ msgstr "%s nenalezen" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n" "Language-Team: None\n" @@ -133,6 +133,10 @@ msgstr "fødning fik XML::Feed til at bryde sammen!" msgid "creating new page %s" msgstr "opretter ny side %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "beandling af skabelon mislykkedes:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "sletter bundt.." @@ -259,7 +263,7 @@ msgstr "Tilføjede en kommentar" msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" @@ -336,11 +340,6 @@ msgstr "sammenligning ikke angivet" msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "beandling af skabelon mislykkedes:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "skal angive format og tekst" @@ -367,21 +366,31 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, 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:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Du har ikke lov til at ændre %s" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "kompilering af %s mislykkedes" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +421,7 @@ msgstr "" "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel " "gennemkørsel" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy kunne ikke afkode dette html" @@ -461,12 +470,12 @@ msgstr "parametrene %s og %s kan ikke anvendes sammen" msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "skabelon %s ikke fundet" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "beandling af skabelon mislykkedes:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -500,15 +509,15 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -795,6 +804,16 @@ msgstr "ugyldig procentværdi %s" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "bekræft at %s bliver fjernet" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff trunkeret)" @@ -985,11 +1004,6 @@ msgstr "opretter mærkatside %s" msgid "missing id parameter" msgstr "manglende id-parameter" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s ikke fundet" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "manglende tex-kode" @@ -1013,22 +1027,22 @@ msgstr "%s udvidelser" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../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:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1036,7 +1050,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../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." @@ -1046,11 +1060,6 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "dårligt filnavn %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1168,13 +1177,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1226,21 +1235,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "dårligt filnavn %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "skabelon %s ikke fundet" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1265,5 +1284,8 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" +#~ msgid "%s not found" +#~ msgstr "%s ikke fundet" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "gendanner alle sider for at korrigere meta titler" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -130,6 +130,11 @@ msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" msgid "creating new page %s" msgstr "erstelle neue Seite %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "Fehler beim Ablauf:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." @@ -259,7 +264,7 @@ msgstr "Kommentar hinzugefügt" msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" @@ -336,12 +341,6 @@ msgstr "Übereinstimmung nicht angegeben" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "Fehler beim Ablauf:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "Format und Text müssen spezifiziert werden" @@ -368,21 +367,31 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, 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:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Sie dürfen %s nicht verändern" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "erzeugen von %s fehlgeschlagen" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -413,7 +422,7 @@ msgstr "" "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass " "through" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy konnte dieses HTML nicht auswerten" @@ -464,12 +473,12 @@ msgstr "die Parameter %s und %s können nicht zusammen benutzt werden" msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "Vorlage %s nicht gefunden" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -504,15 +513,15 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -804,6 +813,16 @@ msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " "benötigt" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "bestätigen Sie die Entfernung von %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff wurde gekürzt)" @@ -994,11 +1013,6 @@ msgstr "erstelle neue Seite %s" msgid "missing id parameter" msgstr "fehlender Parameter id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "Vorlage (feed) nicht gefunden" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "fehlender TeX-Code" @@ -1022,22 +1036,22 @@ msgstr "%s-Erweiterungen" msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../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:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1045,7 +1059,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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,11 +1072,6 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "fehlerhafter Dateiname %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1183,13 +1192,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1244,21 +1253,31 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "fehlerhafter Dateiname %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "Vorlage %s nicht gefunden" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1283,6 +1302,10 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "Vorlage (feed) nicht gefunden" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -135,6 +135,11 @@ msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" msgid "creating new page %s" msgstr "creando nueva página %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "se ha producido un error fatal mientras procesaba la plantilla:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "borrando el directorio.." @@ -265,7 +270,7 @@ msgstr "Añadir un comentario" msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" @@ -343,12 +348,6 @@ msgstr "falta indicar la coincidencia de páginas (match)" msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "se ha producido un error fatal mientras procesaba la plantilla:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "se deben especificar tanto el formato como el texto" @@ -376,21 +375,31 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, 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:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "No puede cambiar %s" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "ha fallado la compilación del programa %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -421,7 +430,7 @@ msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" @@ -473,12 +482,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "no he encontrado la plantilla %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -512,15 +521,15 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -805,6 +814,16 @@ msgstr "%s es un valor erróneo para un porcentaje" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "confirme el borrado de %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Lista de diferencias truncada)" @@ -999,11 +1018,6 @@ msgstr "creando nueva página %s" msgid "missing id parameter" msgstr "falta el parámetro \"id\"" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "fuente de datos no encontrada" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "falta el código tex" @@ -1027,22 +1041,22 @@ msgstr "complementos" msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../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:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1050,7 +1064,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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1062,11 +1076,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "no puedo determinar el identificador de un usuario no fiable como %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "el nombre de archivo %s es erróneo" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1188,13 +1197,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, 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:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1250,21 +1259,31 @@ msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "el nombre de archivo %s es erróneo" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "no he encontrado la plantilla %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1292,6 +1311,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "fuente de datos no encontrada" + #~ msgid "You need to log in first." #~ msgstr "Antes es necesario identificarse." @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -131,6 +131,10 @@ msgstr "Plantage du flux XML::Feed !" msgid "creating new page %s" msgstr "Création de la nouvelle page %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "Échec du traitementdu modèle :" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." @@ -256,7 +260,7 @@ msgstr "Commentaire ajouté" msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" @@ -333,11 +337,6 @@ msgstr "correspondance non indiquée" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "Échec du traitementdu modèle :" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "le format et le texte doivent être indiqués" @@ -364,21 +363,31 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, 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:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "Vous n'êtes pas autorisé à modifier %s" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "Échec de la compilation de %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +418,7 @@ msgstr "" "Avertissement : le module perl « highlight » n'est pas disponible. " "Continuation malgré tout." -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy n'a pas pu analyser cette page html" @@ -460,12 +469,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "Modèle de page %s introuvable" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "Échec du traitementdu modèle :" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -498,15 +507,15 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "sort=meta demande un paramètre." @@ -801,6 +810,16 @@ msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est " "nécessaire." +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "Suppression de %s confirmée" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" @@ -991,11 +1010,6 @@ msgstr "Création de la nouvelle page %s" msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s introuvable" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "Il manque le code TeX" @@ -1019,22 +1033,22 @@ msgstr "Greffons %s" msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 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:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../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:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1056,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../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." @@ -1053,11 +1067,6 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "Nom de fichier incorrect %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1085,7 +1094,8 @@ msgstr "%s peut être associé à plusieurs pages source." #: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "recherche de %s pour les dates de modification et de création des fichiers..." +msgstr "" +"recherche de %s pour les dates de modification et de création des fichiers..." #: ../IkiWiki/Render.pm:446 #, perl-format @@ -1180,13 +1190,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:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1238,21 +1248,31 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s 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:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "Nom de fichier incorrect %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "Modèle de page %s introuvable" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages : %s" @@ -1277,6 +1297,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "%s not found" +#~ msgstr "%s introuvable" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "" #~ "Reconstruction de toutes les pages pour corriger les titres (greffon " @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -128,6 +128,11 @@ msgstr "ફીડ ભાંગી ગયું XML::Feed!" msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "ક્રિયા કરવામાં નિષ્ફળ:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -254,7 +259,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -333,12 +338,6 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "ક્રિયા કરવામાં નિષ્ફળ:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -367,21 +366,30 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -410,7 +418,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" @@ -463,12 +471,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "ટેમ્પલેટ %s મળ્યું નહી" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -499,17 +507,17 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -791,6 +799,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -986,11 +1004,6 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "ટેમ્પલેટ %s મળ્યું નહી" - #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1016,26 +1029,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1045,11 +1058,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1165,13 +1173,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1222,21 +1230,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "ટેમ્પલેટ %s મળ્યું નહી" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1261,6 +1279,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "%s not found" +#~ msgstr "ટેમ્પલેટ %s મળ્યું નહી" + #~ msgid "You need to log in first." #~ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 17c313ba8..fa65b6f93 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-26 23:04-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -129,6 +129,10 @@ msgstr "" msgid "creating new page %s" msgstr "" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -252,7 +256,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -329,11 +333,6 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -360,21 +359,30 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, perl-format +msgid "Failed to revert commit %s" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -403,7 +411,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "" @@ -452,12 +460,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 #, perl-format -msgid "template %s not found" +msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -773,6 +781,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -963,11 +981,6 @@ msgstr "" msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -991,26 +1004,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1020,11 +1033,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1197,21 +1205,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -128,6 +128,11 @@ msgstr "il notiziario ha fatto andare in crash XML::Feed." msgid "creating new page %s" msgstr "creazione nuova pagina %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "errore nell'elaborazione:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "eliminazione contenitore..." @@ -255,7 +260,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -333,12 +338,6 @@ msgstr "corrispondenza non specificata" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "errore nell'elaborazione:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "occorre specificare formato e testo" @@ -365,21 +364,31 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, 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:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" +#: ../IkiWiki/Plugin/git.pm:861 +#, fuzzy +msgid "you are not allowed to revert a merge" +msgstr "non è permesso modificare %s" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "errore nel compilare %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +418,7 @@ msgid "" msgstr "" "attenzione: modulo perl highlight non trovato, verrà passato inalterato" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" @@ -460,12 +469,12 @@ msgstr "i parametri %s e %s non possono essere usati insieme" msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "modello %s non trovato" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -498,15 +507,15 @@ msgstr "" msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -801,6 +810,16 @@ msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " "\"donepages\"" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "conferma rimozione di %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff troncato)" @@ -991,11 +1010,6 @@ msgstr "creazione nuova pagina %s" msgid "missing id parameter" msgstr "parametro id mancante" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "notiziario non trovato" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "codice tex mancante" @@ -1019,22 +1033,22 @@ msgstr "plugin" msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../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:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1056,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../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." @@ -1052,11 +1066,6 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." msgid "cannot determine id of untrusted committer %s" msgstr "impossibile determinare l'id del committer non fidato %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "nome file %s scorretto" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1175,13 +1184,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1233,21 +1242,31 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "nome file %s scorretto" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "modello %s non trovato" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -1272,6 +1291,10 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "notiziario non trovato" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -132,6 +132,11 @@ msgstr "awaria kanału RSS w module XML::Feed!" msgid "creating new page %s" msgstr "tworzenie nowej strony %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "awaria w trakcie przetwarzania:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -258,7 +263,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -337,12 +342,6 @@ msgstr "nieokreślona nazwa pliku osłony" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "awaria w trakcie przetwarzania:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -371,21 +370,30 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "awaria w trakcie kompilowania %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -415,7 +423,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" @@ -470,12 +478,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "nieznaleziony szablon %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -512,17 +520,17 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -804,6 +812,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -1007,11 +1025,6 @@ msgstr "tworzenie nowej strony %s" msgid "missing id parameter" msgstr "brakujący parametr id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "nie znaleziono %s" - #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1037,26 +1050,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1066,11 +1079,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "pomijanie nieprawidłowej nazwy pliku %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1186,13 +1194,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1245,21 +1253,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "pomijanie nieprawidłowej nazwy pliku %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "nieznaleziony szablon %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1284,6 +1302,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "nie znaleziono %s" + #~ msgid "You need to log in first." #~ msgstr "Proszę najpierw zalogować się." @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -129,6 +129,11 @@ msgstr "kanalen kraschade XML::Feed!" msgid "creating new page %s" msgstr "skapar nya sidan %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "misslyckades med att behandla mall:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -255,7 +260,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -334,12 +339,6 @@ msgstr "filnamn för wrapper har inte angivits" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "misslyckades med att behandla mall:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -368,21 +367,30 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "misslyckades med att kompilera %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +420,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" @@ -465,12 +473,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "mallen %s hittades inte" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -505,17 +513,17 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -796,6 +804,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -995,11 +1013,6 @@ msgstr "skapar nya sidan %s" msgid "missing id parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "mallen %s hittades inte" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1024,26 +1037,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1053,11 +1066,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "hoppar över felaktigt filnamn %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1173,13 +1181,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1230,21 +1238,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "hoppar över felaktigt filnamn %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "mallen %s hittades inte" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1269,6 +1287,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "mallen %s hittades inte" + #~ msgid "You need to log in first." #~ msgstr "Du måste logga in först." @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -125,6 +125,10 @@ msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -248,7 +252,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -325,11 +329,6 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -356,21 +355,30 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, perl-format +msgid "Failed to revert commit %s" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -399,7 +407,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "" @@ -448,12 +456,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 #, perl-format -msgid "template %s not found" +msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -484,15 +492,15 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -769,6 +777,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -959,11 +977,6 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "özet akışı bulunamadı" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -987,26 +1000,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1016,11 +1029,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1136,13 +1144,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1193,21 +1201,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "" @@ -1232,5 +1250,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "özet akışı bulunamadı" + #~ msgid "You need to log in first." #~ msgstr "Önce sisteme giriş yapmanız gerekiyor." @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-23 17:21-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" @@ -130,6 +130,11 @@ msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." msgid "creating new page %s" msgstr "đang tạo trang mới %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "mẫu không xử lý được:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -256,7 +261,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -334,12 +339,6 @@ msgstr "chưa xác định tên tập tin bộ bao bọc" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "mẫu không xử lý được:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -368,21 +367,30 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:782 +#: ../IkiWiki/Plugin/git.pm:786 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:790 msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:861 +msgid "you are not allowed to revert a merge" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:877 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "lỗi biên dịch %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +420,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy 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" @@ -467,12 +475,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "không tìm thấy mẫu %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 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" @@ -505,17 +513,17 @@ msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » ( msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -796,6 +804,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -995,11 +1013,6 @@ msgstr "đang tạo trang mới %s" msgid "missing id parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "không tìm thấy mẫu %s" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1024,26 +1037,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../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:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1053,11 +1066,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "đang bỏ qua tên tập tin sai %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1173,13 +1181,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:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1231,21 +1239,31 @@ msgstr "" 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:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "đang bỏ qua tên tập tin sai %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "không tìm thấy mẫu %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1270,6 +1288,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "không tìm thấy mẫu %s" + #~ msgid "You need to log in first." #~ msgstr "Trước tiên bạn cần phải đăng nhập." |