diff -Nru ikiwiki-3.20100122ubuntu1/auto-blog.setup ikiwiki-3.20100212ubuntu1/auto-blog.setup --- ikiwiki-3.20100122ubuntu1/auto-blog.setup 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/auto-blog.setup 2010-02-12 04:53:17.000000000 +0100 @@ -36,7 +36,7 @@ cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments blogspam}], + add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, @@ -47,4 +47,5 @@ comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", discussion => 0, + locked_pages => "*", ) diff -Nru ikiwiki-3.20100122ubuntu1/CHANGELOG ikiwiki-3.20100212ubuntu1/CHANGELOG --- ikiwiki-3.20100122ubuntu1/CHANGELOG 2010-02-13 11:40:23.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/CHANGELOG 2010-03-02 11:10:14.000000000 +0100 @@ -1,6 +1,44 @@ +ikiwiki (3.20100212ubuntu1) lucid; urgency=low + + * Merge from debian unstable: (LP: #530568) + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Leo Iannacone Tue, 02 Mar 2010 11:05:28 +0100 + +ikiwiki (3.20100212) unstable; urgency=low + + * template: Preprocess parameters before htmlizing. + * img: Fix a bug that could taint @links with undef values. + * setup automator: Configure Term::Readline to use bold for prompt, rather + than default underline. Closes: #517656 + * Allow jumping directly into account registration process by going to + ikiwiki.cgi?do=register + * Improve display of openid in preferences page. + * Add link to userpage (or creation link) to top of preferences page. + * opendiscussion: This plugin will also now allow posting comments + to otherwise locked-down sites. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default, and enable opendiscussion so others can comment. + * Fix color and format plugins to appear in the websetup interface. + * amazon_s3: Fix to support the EU S3 datacenter, which is more picky + about attempts to create already existing buckets. + * httpauth: When cgiauthurl is configured, httpauth can now be used + alongside other authentication methods (like openid or anonok). Rather + than always redirect to the cgiauthurl for authentication, there is now + a button on the login form to use it. + * httpauth: Add httpauth_pagespec setting that can be used to limit + pages to only being edited via users authed with httpauth. + * Allow globs to be used in user() pagespecs. + * Group related plugins into sections in the setup file, and drop + unused rcs plugins from the setup file. + + -- Joey Hess Fri, 12 Feb 2010 16:45:50 -0500 + ikiwiki (3.20100122ubuntu1) lucid; urgency=low - * Merge from debian unstable: + * Merge from debian unstable: (LP: #520530) - Drop wdg-html-validator from Build-Depends field. The xmlns set in the generated elements causes /usr/bin/validate to attempt to download a file from w3.org. This doesn't work without Internet access. diff -Nru ikiwiki-3.20100122ubuntu1/debian/changelog ikiwiki-3.20100212ubuntu1/debian/changelog --- ikiwiki-3.20100122ubuntu1/debian/changelog 2010-02-13 11:44:43.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/debian/changelog 2010-03-02 11:10:14.000000000 +0100 @@ -1,3 +1,41 @@ +ikiwiki (3.20100212ubuntu1) lucid; urgency=low + + * Merge from debian unstable: (LP: #530568) + - Drop wdg-html-validator from Build-Depends field. The xmlns set in the + generated elements causes /usr/bin/validate to attempt to download + a file from w3.org. This doesn't work without Internet access. + + -- Leo Iannacone Tue, 02 Mar 2010 11:05:28 +0100 + +ikiwiki (3.20100212) unstable; urgency=low + + * template: Preprocess parameters before htmlizing. + * img: Fix a bug that could taint @links with undef values. + * setup automator: Configure Term::Readline to use bold for prompt, rather + than default underline. Closes: #517656 + * Allow jumping directly into account registration process by going to + ikiwiki.cgi?do=register + * Improve display of openid in preferences page. + * Add link to userpage (or creation link) to top of preferences page. + * opendiscussion: This plugin will also now allow posting comments + to otherwise locked-down sites. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default, and enable opendiscussion so others can comment. + * Fix color and format plugins to appear in the websetup interface. + * amazon_s3: Fix to support the EU S3 datacenter, which is more picky + about attempts to create already existing buckets. + * httpauth: When cgiauthurl is configured, httpauth can now be used + alongside other authentication methods (like openid or anonok). Rather + than always redirect to the cgiauthurl for authentication, there is now + a button on the login form to use it. + * httpauth: Add httpauth_pagespec setting that can be used to limit + pages to only being edited via users authed with httpauth. + * Allow globs to be used in user() pagespecs. + * Group related plugins into sections in the setup file, and drop + unused rcs plugins from the setup file. + + -- Joey Hess Fri, 12 Feb 2010 16:45:50 -0500 + ikiwiki (3.20100122ubuntu1) lucid; urgency=low * Merge from debian unstable: (LP: #520530) diff -Nru ikiwiki-3.20100122ubuntu1/debian/control ikiwiki-3.20100212ubuntu1/debian/control --- ikiwiki-3.20100122ubuntu1/debian/control 2010-02-13 11:40:23.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/debian/control 2010-03-02 11:04:16.000000000 +0100 @@ -5,13 +5,13 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, - libhtml-scrubber-perl, + libhtml-scrubber-perl, libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34), libfile-chdir-perl Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki diff -Nru ikiwiki-3.20100122ubuntu1/doc/bugs/anonok_vs._httpauth.mdwn ikiwiki-3.20100212ubuntu1/doc/bugs/anonok_vs._httpauth.mdwn --- ikiwiki-3.20100122ubuntu1/doc/bugs/anonok_vs._httpauth.mdwn 2010-01-19 00:00:21.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/bugs/anonok_vs._httpauth.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -58,3 +58,61 @@ >> On reflection, I've stopped being bothered by the >> redirect-to-signin-page approach. (It only needs to happen once per >> browser session, anyway.) Can we try that? --[[schmonz]] + +Here is an attempt. With this httpauth will only redirect to the +`cgiauth_url` when a page is edited, and it will defer to other plugins +like anonok first. I have not tested this. --[[Joey]] + +

+diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
+index 127c321..a18f8ca 100644
+--- a/IkiWiki/Plugin/httpauth.pm
++++ b/IkiWiki/Plugin/httpauth.pm
+@@ -9,6 +9,8 @@ use IkiWiki 3.00;
+ sub import {
+ 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+ 	hook(type => "auth", id => "httpauth", call => \&auth);
++	hook(type => "canedit", id => "httpauth", call => \&canedit,
++		last => 1);
+ }
+ 
+ sub getsetup () {
+@@ -33,9 +35,21 @@ sub auth ($$) {
+ 	if (defined $cgi->remote_user()) {
+ 		$session->param("name", $cgi->remote_user());
+ 	}
+-	elsif (defined $config{cgiauthurl}) {
+-		IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+-		exit;
++}
++
++sub canedit ($$$) {
++	my $page=shift;
++	my $cgi=shift;
++	my $session=shift;
++
++	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
++		return sub {
++			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
++			exit;
++		};
++	}
++	else {
++		return undef;
+ 	}
+ }
+ 
+

+ +> With `anonok` enabled, this works for anonymous editing of an +> existing Discussion page. auth is still needed to create one. --[[schmonz]] + +>> Refreshed above patch to fix that. --[[Joey]] + +>> Remaining issue: This patch will work with anonok, but not openid or +>> passwordauth, both of which want to display a login page at the same +>> time that httpauth is redirecting to the cgiauthurl. As mentioned above, +>> the only way to deal with that would be to add a link to the signin page +>> that does the httpauth signin. --[[Joey]] + +>>> That's dealt with in final version. [[done]] --[[Joey]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/forum/Error:_bad_page_name.mdwn ikiwiki-3.20100212ubuntu1/doc/forum/Error:_bad_page_name.mdwn --- ikiwiki-3.20100122ubuntu1/doc/forum/Error:_bad_page_name.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/forum/Error:_bad_page_name.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,46 @@ +I'm trying to use ikiwiki for the first time. In the start, I had problems +with installing the package, because I don't have a root account on my +server. + +When I solved this, I finally set up my wiki, but whenever I try to edit a +page, I get an error: “Error: bad page name”. + +What am I doing wrong? The wiki is at +, the setupfile I used at +. + +> This means that one of the checks that ikiwiki uses to prevent +> editing files with strange or insecure names has fired incorrectly. +> Your setup file seems fine. +> We can figure out what is going wrong through a series of tests: +> +> * Test if your perl has a problem with matching alphanumerics: +> `perl -le 'print int "index"=~/^([-[:alnum:]+\/.:_]+)$/'` +> * Check if something is breaking pruning of disallowed files: +> `perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")'` +> --[[Joey]] + +>>Both seem to run fine: + + onderka@atrey:~$ perl -le 'print int "index"=~/^([-[:alnum:]+\/.:_]+)$/' + 1 + onderka@atrey:~$ perl -le 'use IkiWiki; %config=IkiWiki::defaultconfig(); print ! IkiWiki::file_pruned("index")' + 1 + +>>> Try installing this [instrumented +>>> version](http://kitenet.net/~joey/tmp/editpage.pm) of +>>> `IkiWiki/Plugin/editpage.pm`, which will add some debugging info +>>> to the error message. --[[Joey]] + +>>>>When I tried to `make` ikiwiki with this file, I got the error + + ../IkiWiki/Plugin/editpage.pm:101: invalid variable interpolation at "$" + +>>>>> Sorry about that, I've corrected the above file. --[[Joey]] + +>>>>>> Hmm, funny. Now that I reinstalled it with your changed file, it started working. I didn't remember how exactly did I install it the last time, so this time, it seems I did it correctly. Thank you very much for your help. + +>>>>>>> Well, this makes me suspect you installed an older version of +>>>>>>> ikiwiki and my file, which is from the latest version, included a +>>>>>>> fix for whatever bug you were seeing. If I were you, I'd ensure +>>>>>>> that I have a current version of ikiwiki installed. --[[Joey]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn ikiwiki-3.20100212ubuntu1/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn --- ikiwiki-3.20100122ubuntu1/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/forum/navigation_of_wiki_pages_on_local_filesystem_with_vim.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,127 @@ +**UPDATE** I have created a [[page|tips/follow_wikilinks_from_inside_vim]] in +the tips section about the plugin, how to get it, install it and use it. Check +that out. --[[jerojasro]] + +I wrote a vim function to help me navigate the wiki when I'm editing it. It extends the 'gf' (goto file) functionality. Once installed, you place the cursor on a wiki page name and press 'gf' (without the quotes); if the file exists, it gets loaded. + +This function takes into account the ikiwiki linking rules when deciding which file to go to. + +> 'gf' gets in the way when there are directories with the same name of a wiki page. The +> function below doesn't implement the linking rules properly (test the link (ignoring case), +> if there is no match ascend the dir. hierarchy and start over, until we reach the root of +> the wiki). I'm rewriting it to follow these rules properly +> +> I think the page for [[LinkingRules|ikiwiki/subpage/linkingrules]] should say that ikiwiki **ascends** +> the dir. hierarchy when looking for a wikilink, not that it **descends** it. Am I correct? --[[jerojasro]] + +>> Conventionally, the root directory is considered to be lower than other +>> directories, so I think the current wording is correct. --[[Joey]] + +let me know what you think + +> " NOTE: the root of the wiki is considered the first directory that contains a +> " .ikiwiki folder, except $HOME/.ikiwiki (the usual ikiwiki libdir) +> +> That's not going to work in all situations; for example, with an ikiwiki which uses git as the backend, the normal setup is that one has +> +> * a bare git repository +> * a git repository which ikiwiki builds the wiki from (which has a .ikiwiki directory in it) +> * an *additional* git repository cloned from the bare repository, which is used for making changes from the command-line rather than the web. It is this repository in which one would be editing files with vim, and *this* repository does not have a .ikiwiki directory in it. It does have a .git directory in the root, however, so I suppose you could use that as a method of detection of a root directory, but of course that would only work for git repositories. +> +> -- [[KathrynAndersen]] +> +>> You are completely right; all of my wikis are compiled both locally and +>> remotely, and so the local repo also has a `.ikiwiki` folder. And that's not the +>> "usual" setup. +>> +>> checking for a `.git` dir would not work when the wiki's source files aren't +>> located at the root of the repo. +>> +>> So, besides of doing a `touch .ikiwiki` at the root of the wiki in your local +>> repo, do you see any alternative? +>> +>> -- [[jerojasro]] + +well. I've rewritten the whole thing, to take into account: + + * file matching ignoring case (MyPage matches mypage.mdwn) + * checking all the way down (up) to the root of the wiki (if there is a link `\[[foo]]` on `a/b/page`), + try `a/b/page/foo`, then `a/b/foo`, and so on, up to `foo` + * the alternate name for a page: when looking for the file for `\[[foo]]`, try both `foo.mdwn` and `foo/index.mdwn` + +you can find the file [here](http://git.devnull.li/cgi-bin/gitweb.cgi?p=vim-jerojasro.git;a=blob;f=.vim/ftplugin/ikiwiki_nav.vim;hb=HEAD). To use it, place it in `$HOME/.vim/ftplugin`. After that, hitting `` (Enter) in normal mode over a wikilink will take you to that page, if it exists. + +the plugin has, as of now, two problems: + + * doesn't work with wikilinks that take more than one line (though this isn't really that bad) + * it assumes that the root of the wiki is the first directory down the filesystem hierarchy that + has a `.ikiwiki` folder on it. If your copy of the wiki doesn't have it, you must create it for + the plugin to work + +-- [[jerojasro]] + +> Interesting. I was at one point looking at "potwiki.vim", which implements a local wiki and follows CamelCase links, creating new files where necessary etc., to see if it could be adapted for ikiwiki (See [[tips/vim syntax highlighting/discussion]]). I didn't get anywhere. -- [[Jon]] + +>> when I wrote the plugin I also considered the possibility of creating files (and their dirs, if necessary) +>> from new wikilinks; the changes needed to get that working are fairly small -- [[jerojasro]] + +> Seems about ready for me to think about pulling it into ikiwiki +> alongside [[tips/vim_syntax_highlighting/ikiwiki.vim]]. If you'll +> please slap a license on it. :) --[[Joey]] +> +>> GPL version 2 or later (if that doesn't cause any problems here). I'll add it +>> to the file --[[jerojasro]] +>> +>>> I see you've put the plugin on vim.org. Do you think it makes sense to +>>> also include a copy in ikiwiki? --[[Joey]] +>>> +>>>> mmm, no. There would be two copies of it, and the git repo. I'd rather have +>>>> a unique place for the "official" version (vim.org), and another for the dev +>>>> version (its git repo). +>>>> +>>>> actually, I would also suggest to upload the [[`ikiwiki.vim`|tips/vim_syntax_highlighting]] file to vim.org --[[jerojasro]] +>>>>> +>>>>> If you have any interest in maintaining the syntax highlighting +>>>>> plugin and putting it there, I'd be fine with that. I think it needs +>>>>> some slight work to catch up with changes to ikiwiki's directives +>>>>> (!-prefixed now), and wikilinks (able to have spaces now). --[[Joey]] +>>>>> +>>>>>> I don't really know too much about syntax definitions in vim. But I'll give it a stab. I know it fails when there are 2 \[[my text|link]] wikilinks in the same page. +>>>>>> I'm not promising anything, though ;) --[[jerojasro]] +> +> Also, I have a possible other approach for finding ikiwiki's root. One +> could consider that any subdirectory of an ikiwiki wiki is itself +> a standalone wiki, though probably one missing a toplevel index page. +> The relative wikilinks work such that this assumption makes sense; +> you can build any subdirectory with ikiwiki and probably get something +> reasonable with links that work, etc. +> +> So, if that's the case, then one could say that the directory that the +> user considers to be the toplevel of their wiki is really also a subwiki, +> enclosed in a succession of parents that go all the way down to the root +> directory (or alternatively, to the user's home directory). I think that +> logically makes some sense. +> +> And if that's the case, you can resolve an absolute link by looking for +> the page closest to the root that matches the link. +> +>> I like your idea; it doesn't alter the matching of the relative links, and +>> should work fine with absolute links too. I'll implement it, though I see +>> some potential (but small) issues with it --[[jerojasro]] +> +> It may even make sense to change ikiwiki's own handling of "absolute" +> links to work that way. But even without changing ikiwiki, I think it +> would be a reasonable thing for vim to do. It would only fail in two +> unusual circumstances: +> +> 1. There is a file further down, outside what the user considers +> the wiki, that matches. Say a `$HOME/index.mdwn` +> 2. An absolute link is broken in that the page linked to does +> not exist in the root of the wiki. But it does exist in a subdir, +> and vim would go to that file. +> +> --[[Joey]] +> +>> your approach will add more noise when the plugin grows the page-creation +>> feature, since there will be no real root to limit the possible locations for +>> the new page. But it is far better than demanding for a `.ikiwiki` dir --[[jerojasro]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn ikiwiki-3.20100212ubuntu1/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn --- ikiwiki-3.20100122ubuntu1/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn 2010-01-22 21:53:55.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/forum/Render_more_than_one_dest_page_from_same_source_page.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -6,7 +6,9 @@ > This is done by calling `will_render()` and using `writefile()` to > generate the additional files. Probably in a format hook if you want > to generate html files. -> + +>> Thanks for the tip, I'll take a look at that. -- [[KathrynAndersen]] + > It's not possible for one source file to represent multiple wiki pages. > There is a 1:1 mapping between source filenames and page names. The > difference between wiki pages and output files is that you can use @@ -29,6 +31,8 @@ > whole files for printing when you can use these style sheet tricks. > --[[Joey]] +>>Fair enough. --[[KathrynAndersen]] + ##"en" and "en-us" versions of a page. My site is in non-US English. However, I want US-English people to find my site when they search for it when they use US spelling on certain search terms (such as "optimise" versus "optimize"). This requires a (crude) US-English version of the site where the spellings are changed automatically, and the LANG is "en-us" rather than "en". (No, don't tell me to use keywords; Google ignores keywords and has for a number of years). @@ -43,3 +47,5 @@ > Sounds like this could be considered a single page that generates two > html files, so could be handled per above. --[[Joey]] + +>>Thanks! --[[KathrynAndersen]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/forum/where_are_the_tags.mdwn ikiwiki-3.20100212ubuntu1/doc/forum/where_are_the_tags.mdwn --- ikiwiki-3.20100122ubuntu1/doc/forum/where_are_the_tags.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/forum/where_are_the_tags.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,9 @@ +Where is the tag cloud/tag listing of all the tags used in this wiki? I know we +have tags enabled. --[[jerojasro]] + +> This wiki does not use one global toplevel set of tags (`tagbase` is not +> set). +> +> There are tags used for the [[plugins]], and a tag cloud of those +> there. [[wishlist]] and [[patch]] are tags too, but I don't see the point +> of a tag cloud for such tags. --[[Joey]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/git.mdwn ikiwiki-3.20100212ubuntu1/doc/git.mdwn --- ikiwiki-3.20100122ubuntu1/doc/git.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/git.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -56,7 +56,9 @@ * [[ktf]] `git://github.com/ktf/ikiwiki.git` * [[tove]] `git://github.com/tove/ikiwiki.git` * [[GiuseppeBilotta]] `git://git.oblomov.eu/ikiwiki` - +* [[roktas]] `git://github.com/roktas/ikiwiki.git` +* [[davrieb|David_Riebenbauer]] `git://git.liegesta.at/git/ikiwiki` + ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary)) ## branches diff -Nru ikiwiki-3.20100122ubuntu1/doc/ikiwiki/directive/date.mdwn ikiwiki-3.20100212ubuntu1/doc/ikiwiki/directive/date.mdwn --- ikiwiki-3.20100122ubuntu1/doc/ikiwiki/directive/date.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/ikiwiki/directive/date.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -12,3 +12,5 @@ like: Updated \[[!date "Wed, 25 Nov 2009 01:11:55 -0500"]]: mumble mumble + +[[!meta robots="noindex, follow"]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/ikiwiki/directive/format.mdwn ikiwiki-3.20100212ubuntu1/doc/ikiwiki/directive/format.mdwn --- ikiwiki-3.20100122ubuntu1/doc/ikiwiki/directive/format.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/ikiwiki/directive/format.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -22,7 +22,7 @@ used to display syntax highlighted code. Many languages and formats are supported. For example: - \[[format perl """ + \[[!format perl """ print "hello, world\n"; """]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/ikiwiki/pagespec/po.mdwn ikiwiki-3.20100212ubuntu1/doc/ikiwiki/pagespec/po.mdwn --- ikiwiki-3.20100122ubuntu1/doc/ikiwiki/pagespec/po.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/ikiwiki/pagespec/po.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -14,3 +14,5 @@ Note that every non-po page is considered to be written in `po_master_language`, as specified in `ikiwiki.setup`. + +[[!meta robots="noindex, follow"]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn ikiwiki-3.20100212ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn --- ikiwiki-3.20100122ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/ikiwiki/pagespec/sorting.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -9,3 +9,5 @@ * `title_natural` - Only available if [[!cpan Sort::Naturally]] is installed. Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") + +[[!meta robots="noindex, follow"]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/ikiwiki/pagespec.mdwn ikiwiki-3.20100212ubuntu1/doc/ikiwiki/pagespec.mdwn --- ikiwiki-3.20100122ubuntu1/doc/ikiwiki/pagespec.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/ikiwiki/pagespec.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -44,7 +44,8 @@ metadata, matching the specified glob. * "`user(username)`" - tests whether a modification is being made by a user with the specified username. If openid is enabled, an openid can also - be put here. + be put here. Glob patterns can be used in the username. For example, + to match all openid users, use `user(*://*)` * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the diff -Nru ikiwiki-3.20100122ubuntu1/doc/ikiwikiusers.mdwn ikiwiki-3.20100212ubuntu1/doc/ikiwikiusers.mdwn --- ikiwiki-3.20100122ubuntu1/doc/ikiwikiusers.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/ikiwikiusers.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -42,7 +42,6 @@ * [The Walden Effect](http://www.waldeneffect.org/) * The support pages for [Trinity Centre for High Performance Computing](http://www.tchpc.tcd.ie/support/) * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/) -* [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.) * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) * [MIT Student Information Processing Board](http://sipb.mit.edu/) @@ -50,6 +49,7 @@ * [The XCB library](http://xcb.freedesktop.org/) * [The Philolexian Society of Columbia University](http://www.columbia.edu/cu/philo/) * [Fachschaft Informatik HU Berlin](http://fachschaft.informatik.hu-berlin.de/) +* [Wetknee Books](http://www.wetknee.com/) Personal sites and blogs ======================== @@ -81,7 +81,6 @@ * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/) * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall * [Ronan Le Hy's blog](http://bayesien.org), in French. -* . * [formorers blog and website](http://www.formorer.de/webwiki/) * [Mark Jaroski's blog](http://movemearound.org/) * I keep my personal project notes and specs in a private ikiwiki - it's the perfect tool for this task. - [the daniel](http://neoglam.com) @@ -131,6 +130,10 @@ * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang) * [Nico Schottelius' homepage](http://www.nico.schottelius.org) * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de) +* [Walden Effect](http://waldeneffect.org) +* [Avian Aqua Miser](http://www.avianaquamiser.com/) +* [Cosmic Cookout](http://www.cosmiccookout.com/) +* [Backyard Deer](http://www.backyarddeer.com/) Please feel free to add your own ikiwiki site! diff -Nru ikiwiki-3.20100122ubuntu1/doc/news/version_3.20091031.mdwn ikiwiki-3.20100212ubuntu1/doc/news/version_3.20091031.mdwn --- ikiwiki-3.20100122ubuntu1/doc/news/version_3.20091031.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/news/version_3.20091031.mdwn 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -ikiwiki 3.20091031 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * po: Fix breakage caused by changes to render code. - * mdwn: Avoid trying to use multimarkdown if it is not installed. - * moderatedcomments: New plugin to allow comment moderation w/o relying - on blogspam.net. - * When redirecting to a page, ie, after editing, ensure that the - url is uri-encoded. Most browsers other than MSIE don't care, but it's - the right thing to do. - * Add a spec file to allow building rpm from the source package. - * google: Pass the whole wiki url to google, not just the domain, - so that search works correctly for wikis that are located in - subdirectories of domains."""]] \ Manca newline alla fine del file diff -Nru ikiwiki-3.20100122ubuntu1/doc/news/version_3.20100122.mdwn ikiwiki-3.20100212ubuntu1/doc/news/version_3.20100122.mdwn --- ikiwiki-3.20100122ubuntu1/doc/news/version_3.20100122.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/news/version_3.20100122.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,15 @@ +ikiwiki 3.20100122 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * inline: Avoid showing edit links if page editing is disabled. + (Sjoerd) + * signinedit: Auto-disable the plugin when all authentication methods + are disabled. + * comments: Fix permalinks for comments using new conflict-free filenames. + * img: Support alignment of images with captions. (Giuseppe Bilotta) + * websetup: Fix utf-8 problems. + * websetup: Fix bug in array change detection. + * linkmap: Simplify and improve browser compatibility by using an img, + not object tag. + * git: The new git-notes feature in git 1.6.6 changes git log output + in a way that broke ikiwiki's parser if notes are added to commits. + * po: Avoid crash when a page is empty."""]] \ Manca newline alla fine del file diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/404.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/404.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/404.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/404.mdwn 2010-02-12 09:31:08.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=404 author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin lets you use the IkiWiki CGI script as an Apache 404 handler, to give the behaviour of various other wiki engines where visiting a diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/aggregate.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/aggregate.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/aggregate.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/aggregate.mdwn 2010-02-12 09:34:19.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=aggregate author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin allows content from other feeds to be aggregated into the wiki. To specify feeds to aggregate, use the diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/autoindex.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/autoindex.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/autoindex.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/autoindex.mdwn 2010-02-12 09:34:29.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=autoindex core=0 author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin searches for [[SubPages|ikiwiki/subpage]] with a missing parent page, and generates the parent pages. The generated page content is diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/calendar.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/calendar.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/calendar.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/calendar.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=calendar author="[[ManojSrivastava]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]]. The directive displays a calendar, similar to the typical calendars shown on diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/color.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/color.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/color.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/color.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=color core=0 author="[[ptecza]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides a [[ikiwiki/directive/color]] [[ikiwiki/directive]]. The directive can be used to color a piece of text on a page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/comments.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/comments.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/comments.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/comments.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=comments author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin adds "blog-style" comments. Unlike the wiki-style freeform Discussion pages, these comments are posted by a simple form, cannot later @@ -14,8 +14,8 @@ The intention is that on a non-wiki site (like a blog) you can lock all pages for admin-only access, then allow otherwise unprivileged (or perhaps even anonymous) users to comment on posts. See the documentation of the -[[lockedit]] and [[anonok]] pages for details on locking down a wiki so -users can only post comments. +[[opendiscussion]], [[lockedit]] and [[anonok]] pages for details on locking +down a wiki so readers can only post comments. Individual comments are stored as internal-use pages named something like `page/comment_1`, `page/comment_2`, etc. These pages internally use a diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/conditional.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/conditional.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/conditional.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/conditional.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=conditional core=1 author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/special-purpose]] This plugin provides the [[ikiwiki/directive/if]] [[ikiwiki/directive]]. With this directive, you can make text be conditionally displayed on a page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/getfield/discussion.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/getfield/discussion.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/getfield/discussion.mdwn 2010-01-18 18:28:54.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/getfield/discussion.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -19,6 +19,7 @@ >>>>> What about using {{pagename#fieldname}}? The meaning of the hash in URLs sort of fits with what is needed here (reference to a 'named' thing within the page) and it won't conflict with actual hash usages (unless we expect different named parts of pages to define different values for the same field ...) >>>>> -- [[Oblomov]] >>>>>> That's a good one too. --[[simonraven]] +>>>>>>> Done! I used {{$*pagename*#*fieldname*}} for the format. -- [[users/KathrynAndersen]] > I'm also working on a "report" plugin, which will basically apply a template like [[ftemplate]] does, but to a list of pages given from a pagespec, rather than the current page. @@ -26,3 +27,6 @@ > -- [[users/KathrynAndersen]] >> Ooh, sounds nice :) . --[[SR|users/simonraven]] + +>>> I've now released the [[plugins/contrib/report]] plugin. I've been using it on my site; the holdup on releasing was because I hadn't yet written the docs for it. I hope you find it useful. +>>> -- [[users/KathrynAndersen]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/getfield.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/getfield.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/getfield.mdwn 2010-01-18 18:28:54.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/getfield.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -18,13 +18,13 @@ structured data are fields in that record. This can include the meta-data for that page, such as the page title. -This plugin is meant to be used in conjunction with the **field** plugin. +This plugin is meant to be used in conjunction with the [[field]] plugin. ### USAGE One can get the value of a field by using special markup in the page. This does not use directive markup, in order to make it easier to -use the markup inside other directives. There are two forms: +use the markup inside other directives. There are four forms: * {{$*fieldname*}} @@ -39,6 +39,26 @@

My Long and Complicated Title With Potential For Spelling Mistakes

+* {{$*pagename*#*fieldname*}} + + This queries the value of *fieldname* for the page *pagename*. + + For example: + + On PageFoo: + + \[[!meta title="I Am Page Foo"]] + + Stuff about Foo. + + On PageBar: + + For more info, see \[[{{$PageFoo#title}}|PageFoo]]. + + When PageBar is displayed: + + <p>For more info, see <a href="PageFoo">I Am Page Foo</a>.</p> + * {{+$*fieldname*+}} This queries the value of *fieldname* for the destination page; that is, @@ -68,17 +88,43 @@

I Am Page B

Stuff about A.

+* {{+$*pagename*#*fieldname*+}} + + This queries the value of *fieldname* for the page *pagename*; the + only difference between this and {{$*pagename*#*fieldname*}} is + that the full name of *pagename* is calculated relative to the + destination page rather than the source page. + + I can't really think of a reason why this should be needed, but + this format has been added for completeness. + +### No Value Found + +If no value is found for the given field, then the field name is returned. + +For example: + +On PageFoo: + + \[[!meta title="Foo"]] + My title is {{$title}}. + + My description is {{$description}}. + +When PageFoo is displayed: + +

My title is Foo.

+ +

My description is description.

+ +This is because "description" hasn't been defined for that page. + ### More Examples Listing all the sub-pages of the current page: \[[!map pages="{{$page}}/*"]] -### LIMITATIONS - -One cannot query the values of fields on pages other than the current -page or the destination page. - ## DOWNLOAD * browse at GitHub: diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/postal.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/postal.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/postal.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/postal.mdwn 2010-02-12 09:35:26.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=postal author="[[DavidBremner]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] The `postal` plugin allows users to send mail to a special address to comment on a page. It uses the [[mailbox]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/report.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/report.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/contrib/report.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/contrib/report.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,166 @@ +[[!template id=plugin name=report author="[[rubykat]]"]] +[[!tag type/meta type/format]] +[[!toc]] +## NAME + +IkiWiki::Plugin::report - Produce templated reports from page field data. + +## SYNOPSIS + + # activate the plugin + add_plugins => [qw{goodstuff report ....}], + + \[[!report template="blog_summary" + pages="blog/*" + sort="mtime"]] + +## DESCRIPTION + +This plugin provides the **report** directive. This enables one to report on +the structured data ("field" values) of multiple pages; the output is formatted +via a template. This depends on the "field" plugin. + +The pages to report on are selected by a PageSpec given by the "pages" +parameter. The template is given by the "template" parameter. +The template expects the data from a single page; it is applied +to each matching page separately, one after the other. + +Additional parameters can be used to fill out the template, in +addition to the "field" values. Passed-in values override the +"field" values. + +There are two places where template files can live. One, as with the +[[plugins/template]] plugin, is in the /templates directory on the wiki. These +templates are wiki pages, and can be edited from the web like other wiki +pages. + +The second place where template files can live is in the global +templates directory (the same place where the page.tmpl template lives). +This is a useful place to put template files if you want to prevent +them being edited from the web, and you don't want to have to make +them work as wiki pages. + +## OPTIONS + +**template**: The template to use for the report. + +**pages**: A PageSpec to determine the pages to report on. + +**sort**: How the matching pages should be sorted. Sorting criteria are separated by spaces. + +The possible values for sorting are: + +* **page**: Sort by the full page ID. +* **pagename**: Sort by the base page name. +* **pagename_natural**: Sort by the base page name, using Sort::Naturally if it is installed. +* **mtime**: Sort by the page modification time. +* **age**: Sort by the page creation time, newest first. + +Any other value is taken to be a field name to sort by. +If a sort value begins with a minus (-) then the order for that field is reversed. + +### Headers + +An additional option is the "headers" option. This is a space-separated +list of field names which are to be used as headers in the report. This +is a way of getting around one of the limitations of HTML::Template, that +is, not being able to do tests such as +"if this-header is not equal to previous-header". + +Instead, that logic is performed inside the plugin. The template is +given parameters "HEADER1", "HEADER2" and so on, for each header. +If the value of a header field is the same as the previous value, +then HEADER**N** is set to be empty, but if the value of the header +field is new, then HEADER**N** is given that value. + +#### Example + +Suppose you're writing a blog in which you record "moods", and you +want to display your blog posts by mood. + + \[[!report template="mood_summary" + pages="blog/*" + sort="Mood Date title" + headers="Mood"]] + +The "mood_summary" template might be like this: + + + ## + + ### + () \[[ + +### Advanced Options + +The following options are used to improve efficiency when dealing +with large numbers of pages; most people probably won't need them. + +**trail**: + +A page or pages to use as a "trail" page. When a trail page is used, +the matching pages are limited to (a subset of) the pages which that +page links to; the "pages" pagespec in this case, rather than selecting +pages from the entire wiki, will select pages from within the set of pages +given by the trail page. + +**doscan**: + +Whether this report should be called in "scan" mode; if it is, then +the pages which match the pagespec are added to the list of links from +this page. This can be used by *another* report by setting this +page to be a "trail" page in *that* report. +It is not possible to use "trail" and "doscan" at the same time. +By default, "doscan" is false. + +## TEMPLATE PARAMETERS + +The templates are in HTML::Template format, just as [[plugins/template]] and +[[ftemplate]] are. The parameters passed in to the template are as follows: + +***fields***: + +The structured data from the current matching page. This includes +"title" and "description" if they are defined. + +***common values***: + +Values known for all pages: "page", "destpage". Also "basename" (the base name of the page). + +***passed-in values***: + +Any additional parameters to the report directive are passed to the +template; a parameter will override the matching "field" value. +For example, if you have a "Mood" field, and you pass Mood="bad" to +the report, then that will be the Mood which is given for the whole +report. + +Generally this is useful if one wishes to make a more generic +template and hide or show portions of it depending on what +values are passed in the report directive call. + +For example, one could have a "hide_mood" parameter which would hide +the "Mood" section of your template when it is true, which one could +use when the Mood is one of the headers. + +***headers***: + +See the section on Headers. + +***first and last***: + +If this is the first page-record in the report, then "first" is true. +If this is the last page-record in the report, then "last" is true. + +## PREREQUISITES + + IkiWiki + IkiWiki::Plugin::field + HTML::Template + Encode + +## DOWNLOAD + +* browse at GitHub: +* git repo at git://github.com/rubykat/ikiplugins.git diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/cutpaste.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/cutpaste.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/cutpaste.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/cutpaste.mdwn 2010-02-12 09:27:22.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=cutpaste author="[[Enrico]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/cut]], [[ikiwiki/directive/copy]] and [[ikiwiki/directive/paste]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/date.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/date.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/date.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/date.mdwn 2010-02-12 09:39:46.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=date author="[[Joey]]"]] -[[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/date]] [[ikiwiki/directive]], which provides a way to display an arbitrary date diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/ddate.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/ddate.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/ddate.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/ddate.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,6 +1,7 @@ [[!template id=plugin name=ddate author="[[Joey]]"]] [[!tag type/fun]] [[!tag type/date]] +[[!tag type/chrome]] Enables use of Discordian dates. `--timeformat` can be used to change the date format; see `ddate(1)`. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/editpage.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/editpage.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/editpage.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/editpage.mdwn 2010-02-12 09:49:24.000000000 +0100 @@ -1,4 +1,5 @@ [[!template id=plugin name=editpage core=1 author="[[Joey]]"]] +[[!tag type/web]] This plugin allows editing wiki pages in the web interface. It's enabled by default if [[cgi]] is enabled; disable it if you want cgi for other things diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/filecheck.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/filecheck.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/filecheck.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/filecheck.mdwn 2010-02-12 09:34:38.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=filecheck core=0 author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin enhances the regular [[ikiwiki/PageSpec]] syntax with some additional tests, for things like file size, mime type, and virus diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/format.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/format.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/format.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/format.mdwn 2010-02-12 09:32:36.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=format core=0 author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin allows mixing different page formats together, by embedding text formatted one way inside a page formatted another way. This is done diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/fortune.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/fortune.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/fortune.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/fortune.mdwn 2010-02-12 09:37:34.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=fortune author="[[Joey]]"]] [[!tag type/fun]] +[[!tag type/widget]] This plugin implements the [[ikiwiki/directive/fortune]] [[ikiwiki/directive]]. This directive uses the `fortune` program to insert a fortune into the page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/getsource.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/getsource.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/getsource.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/getsource.mdwn 2010-02-12 09:49:47.000000000 +0100 @@ -1,4 +1,5 @@ [[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]] +[[!tag type/web]] This plugin adds a "Source" link to the top of each page that uses the CGI to display the page's source. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/goto.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/goto.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/goto.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/goto.mdwn 2010-02-12 09:33:08.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=goto author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin adds a `do=goto` mode for the IkiWiki CGI script. It's mainly for internal use by the [[404]], [[comments]] and [[recentchanges]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/graphviz.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/graphviz.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/graphviz.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/graphviz.mdwn 2010-02-12 09:27:43.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=graphviz author="[[JoshTriplett]]"]] -[[!tag type/chrome type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/graph]] [[ikiwiki/directive]]. This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/haiku.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/haiku.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/haiku.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/haiku.mdwn 2010-02-12 09:37:11.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=haiku author="[[Joey]]"]] [[!tag type/fun]] +[[!tag type/widget]] This plugin provides a [[ikiwiki/directive/haiku]] [[ikiwiki/directive]]. The directive allows inserting a randomly generated haiku into a wiki page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/httpauth.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/httpauth.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/httpauth.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/httpauth.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -14,12 +14,22 @@ ## separate cgiauthurl To use httpauth for a wiki where the content is public, and where -the `ikiwiki.cgi` needs to be usable without authentication (for searching -and so on), you can configure a separate url that is used for -authentication, via the `cgiauthurl` option in the setup file. This -url will then be redirected to whenever authentication is needed. +the `ikiwiki.cgi` needs to be usable without authentication (for searching, +or logging in using other methods, and so on), you can configure a separate +url that is used for authentication, via the `cgiauthurl` option in the setup +file. This url will then be redirected to when a user chooses to log in using +httpauth. A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` into it. Then configure the web server to require authentication only for access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this symlink. + +## using only httpauth for some pages + +If you want to only use httpauth for editing some pages, while allowing +other authentication methods to be used for other pages, you can +configure `httpauth_pagespec` in the setup file. This makes Edit +links on pages that match the [[ikiwiki/PageSpec]] automatically use +the `cgiauthurl`, and prevents matching pages from being edited by +users authentication via other methods. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/img.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/img.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/img.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/img.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=img author="Christian Mock"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/img]] [[ikiwiki/directive]]. While ikiwiki supports inlining full-size images by making a diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/inline.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/inline.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/inline.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/inline.mdwn 2010-02-12 09:45:05.000000000 +0100 @@ -1,4 +1,5 @@ [[!template id=plugin name=inline core=1 author="[[Joey]]"]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/inline]] [[ikiwiki/directive]], which allows including one wiki page diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/linkmap.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/linkmap.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/linkmap.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/linkmap.mdwn 2010-02-12 09:40:02.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=linkmap author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] [[!tag type/slow]] This plugin provides the [[ikiwiki/directive/linkmap]] [[ikiwiki/directive]]. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/listdirectives.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/listdirectives.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/listdirectives.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/listdirectives.mdwn 2010-02-12 09:40:17.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=listdirectives author="Will"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/listdirectives]] [[ikiwiki/directive]], which inserts a list of currently available diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/lockedit.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/lockedit.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/lockedit.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/lockedit.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -12,14 +12,9 @@ 2006, or all pages that are linked to from the page named "locked". More usually though, you'll just list some names of pages to lock. -One handy thing to do if you're using ikiwiki for your blog is to lock -"* and !*/Discussion". This prevents others from adding to or modifying -posts in your blog, while still letting them comment via the Discussion -pages. - -Alternatively, if you're using the [[comments]] plugin, you can lock -"!postcomment(*)" to allow users to comment on pages, but not edit anything -else. +If you want to lock down a blog so only you can post to it, you can just +lock "*", and enable the [[opendiscussion]] plugin, so readers can still post +[[comments]]. Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]] can specify that some pages are not locked for some users. For example, diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/map.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/map.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/map.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/map.mdwn 2010-02-12 09:54:06.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=map author="Alessandro Dotti Contra"]] -[[!tag type/meta]] +[[!tag type/meta type/widget]] This plugin provides the [[ikiwiki/directive/map]] [[ikiwiki/directive]], which generates a hierarchical page map for the wiki. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/mirrorlist.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/mirrorlist.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/mirrorlist.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/mirrorlist.mdwn 2010-02-12 09:50:15.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=mirror author="[[Joey]]"]] -[[!tag type/special-purpose]] +[[!tag type/web]] This plugin allows adding links a list of mirrors to each page in the wiki. For each mirror, a name and an url should be specified. Pages are diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/more.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/more.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/more.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/more.mdwn 2010-02-12 09:27:53.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=more author="Ben"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/more]] [[ikiwiki/directive]], which is a way to have a "more" link on a post in a blog, that leads to the diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/opendiscussion.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/opendiscussion.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/opendiscussion.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/opendiscussion.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=opendiscussion author="[[Joey]]"]] [[!tag type/auth]] -This plugin allows editing of Discussion pages by anonymous users who have -not logged into the wiki. +This plugin allows editing of Discussion pages, and posting of comments, +even when the [[lockedit]] plugin has been configured to otherwise prevent +editing. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/orphans.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/orphans.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/orphans.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/orphans.mdwn 2010-02-12 09:40:32.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=orphans author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/orphans]] [[ikiwiki/directive]], which generates a list of possibly orphaned pages -- diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/pagecount.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/pagecount.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/pagecount.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/pagecount.mdwn 2010-02-12 09:40:42.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=pagecount author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/pagecount]] [[ikiwiki/directive]], which displays the number of pages diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/pagestats.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/pagestats.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/pagestats.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/pagestats.mdwn 2010-02-12 09:41:08.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=pagestats author="Enrico Zini"]] -[[!tag type/meta type/tags]] +[[!tag type/meta type/tags type/widget]] This plugin provides the [[ikiwiki/directive/pagestats]] [[ikiwiki/directive]], which can generate stats about how pages link to diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/parentlinks.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/parentlinks.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/parentlinks.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/parentlinks.mdwn 2010-02-12 09:46:06.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=parentlinks core=1 author="[[intrigeri]]"]] -[[!tag type/link]] +[[!tag type/link type/chrome]] This plugin generates the links to a page's parents that typically appear at the top of a wiki page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/poll.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/poll.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/poll.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/poll.mdwn 2010-02-12 09:31:49.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=poll author="[[Joey]]"]] -[[!tag type/web]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/poll]] [[ikiwiki/directive]], which allows inserting an online poll into a page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/polygen.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/polygen.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/polygen.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/polygen.mdwn 2010-02-12 09:37:27.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=polygen author="Enrico Zini"]] [[!tag type/fun]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/polygen]] [[ikiwiki/directive]], which allows inserting text generated by polygen into a wiki page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/postsparkline.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/postsparkline.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/postsparkline.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/postsparkline.mdwn 2010-02-12 09:58:53.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=postsparkline author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/postsparkline]] [[ikiwiki/directive]]. It uses the [[sparkline]] plugin to create a sparkline of diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/prettydate.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/prettydate.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/prettydate.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/prettydate.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=prettydate author="[[Joey]]"]] [[!tag type/date]] +[[!tag type/chrome]] Enabling this plugin changes the dates displayed on pages in the wiki to a format that is nice and easy to read. Examples: "late Wednesday evening, diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/progress.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/progress.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/progress.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/progress.mdwn 2010-02-12 09:39:07.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=progress author="[[Will]]"]] -[[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/progress]] [[ikiwiki/directive]], which generates a progress bar. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/recentchangesdiff.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/recentchangesdiff.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/recentchangesdiff.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/recentchangesdiff.mdwn 2010-02-12 09:51:10.000000000 +0100 @@ -1,4 +1,5 @@ [[!template id=plugin name=recentchangesdiff core=0 author="[[Joey]]"]] +[[!tag type/meta]] This plugin extends the [[recentchanges]] plugin, adding a diff for each change. The diffs are by default hidden from display on the recentchanges diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/recentchanges.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/recentchanges.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/recentchanges.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/recentchanges.mdwn 2010-02-12 09:51:19.000000000 +0100 @@ -1,4 +1,5 @@ [[!template id=plugin name=recentchanges core=1 author="[[Joey]]"]] +[[!tag type/meta]] This plugin examines the [[revision_control_system|rcs]] history and generates a page describing each recent change made to the wiki. These diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/relativedate.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/relativedate.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/relativedate.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/relativedate.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=relativedate author="[[Joey]]"]] [[!tag type/date]] +[[!tag type/chrome]] This plugin lets dates be displayed in relative form. Examples: "2 days ago", "1 month and 3 days ago", "30 minutes ago". Hovering over the date will diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/repolist.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/repolist.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/repolist.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/repolist.mdwn 2010-02-12 09:33:16.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=repolist author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/web]] This plugin allows you to configure ikiwiki with the location of [[rcs]] repositories for your wiki's source. This is done via the diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/rsync.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/rsync.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/rsync.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/rsync.mdwn 2010-02-12 09:51:36.000000000 +0100 @@ -1,4 +1,5 @@ [[!template id=plugin name=rsync author="[[schmonz]]"]] +[[!tag type/special-purpose]] This plugin allows ikiwiki to push generated pages to another host by running a command such as `rsync`. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/shortcut.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/shortcut.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/shortcut.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/shortcut.mdwn 2010-02-12 09:32:56.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=shortcut author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/shortcut]] [[ikiwiki/directive]]. It allows external links to commonly linked to sites to be made diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/sparkline.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/sparkline.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/sparkline.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/sparkline.mdwn 2010-02-12 09:29:06.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=sparkline author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/sparkline]] [[ikiwiki/directive]], which allows for easily embedding sparklines into diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/table.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/table.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/table.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/table.mdwn 2010-02-12 09:32:45.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=table author="[[VictorMoral]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/table]] [[ikiwiki/directive]]. It can build HTML tables from data in CSV (comma-separated values) diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/template.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/template.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/template.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/template.mdwn 2010-02-12 09:31:39.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=template author="[[Joey]]"]] -[[!tag type/format]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/template]] [[ikiwiki/directive]]. With this plugin, you can set up templates, and cause them to be filled out diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/testpagespec.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/testpagespec.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/testpagespec.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/testpagespec.mdwn 2010-02-12 09:34:49.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=testpagespec author="[[Joey]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] This plugin provides a [[ikiwiki/directive/testpagespec]] [[ikiwiki/directive]]. The directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/teximg.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/teximg.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/teximg.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/teximg.mdwn 2010-02-12 09:29:22.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=teximg author="[[PatrickWinnertz]]"]] -[[!tag type/chrome type/slow]] +[[!tag type/widget type/slow]] This plugin provides a [[ikiwiki/directive/teximg]] [[ikiwiki/directive]], that renders LaTeX formulas into images. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/toc.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/toc.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/toc.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/toc.mdwn 2010-02-12 09:29:31.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=toc author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/toc]] [[ikiwiki/directive]], which adds a table of contents to a page. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/toggle.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/toggle.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/toggle.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/toggle.mdwn 2010-02-12 09:29:43.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=toggle author="[[Joey]]"]] -[[!tag type/chrome]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/toggle]] and [[ikiwiki/directive/toggleable]] [[directives|ikiwiki/directive]]. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/type/chrome.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/type/chrome.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/type/chrome.mdwn 2010-01-09 21:26:43.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/type/chrome.mdwn 2010-02-12 09:25:50.000000000 +0100 @@ -1 +1 @@ -These plugins affect the look and feel of the wiki. +These plugins affect the look and feel of the overall wiki. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/type/useful.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/type/useful.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/type/useful.mdwn 2010-01-09 21:26:43.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/type/useful.mdwn 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -These plugins perform various miscellaneous useful functions. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/type/widget.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/type/widget.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/type/widget.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/type/widget.mdwn 2010-02-12 09:26:50.000000000 +0100 @@ -0,0 +1,2 @@ +These plugins allow inserting various things into pages via a +[[ikiwiki/directive]]. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/typography.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/typography.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/typography.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/typography.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=typography author="[[Roktas]]"]] -[[!tag type/format]] +[[!tag type/chrome]] This plugin, also known as [SmartyPants](http://daringfireball.net/projects/smartypants/), translates diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/underlay.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/underlay.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/underlay.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/underlay.mdwn 2010-02-12 09:34:58.000000000 +0100 @@ -1,17 +1,17 @@ [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]] -[[!tag type/useful]] +[[!tag type/special-purpose]] -This plugin adds an `add_underlays` option to the setup file. -Its value is a list of underlay directories whose content is added to the wiki. +This plugin adds an `add_underlays` option to the setup file. Its value is +a list of underlay directories whose content is added to the wiki. Multiple underlays are normally set up automatically by other plugins (for -instance, the images used by the [[plugins/smiley]] plugin), but they can also be -used as a way to pull in external files that you don't want in revision control, -like photos or software releases. +instance, the images used by the [[plugins/smiley]] plugin), but they can +also be used as a way to pull in external files that you don't want in +revision control, like photos or software releases. -Directories in `add_underlays` should usually be absolute. If relative, they're -interpreted as relative to the parent directory of the basewiki underlay, which -is probably not particularly useful in this context. +Directories in `add_underlays` should usually be absolute. If relative, +they're interpreted as relative to the parent directory of the basewiki +underlay, which is probably not particularly useful in this context. -- diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/version.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/version.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/version.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/version.mdwn 2010-02-12 09:39:24.000000000 +0100 @@ -1,5 +1,6 @@ [[!template id=plugin name=version author="[[Joey]]"]] [[!tag type/meta]] +[[!tag type/widget]] This plugin provides the [[ikiwiki/directive/version]] [[ikiwiki/directive]], which inserts the current version diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/wmd.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/wmd.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/wmd.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/wmd.mdwn 2010-02-12 09:27:09.000000000 +0100 @@ -1,5 +1,5 @@ [[!template id=plugin name=wmd author="[[Will]]"]] -[[!tag type/chrome]] +[[!tag type/web]] [WMD](http://wmd-editor.com/) is a What You See Is What You Mean editor for [[mdwn]]. This plugin makes WMD be used for editing pages in the wiki. diff -Nru ikiwiki-3.20100122ubuntu1/doc/plugins/write.mdwn ikiwiki-3.20100212ubuntu1/doc/plugins/write.mdwn --- ikiwiki-3.20100122ubuntu1/doc/plugins/write.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/plugins/write.mdwn 2010-02-12 21:53:47.000000000 +0100 @@ -3,8 +3,84 @@ it's not really hard. This page is a complete reference to everything a plugin might want to do. There is also a quick [[tutorial]]. +[[!template id="note" text=""" +Ikiwiki is a compiler + +One thing to keep in mind when writing a plugin is that ikiwiki is a wiki +*compiler*. So plugins influence pages when they are built, not when they +are loaded. A plugin that inserts the current time into a page, for +example, will insert the build time. + +Also, as a compiler, ikiwiki avoids rebuilding pages unless they have +changed, so a plugin that prints some random or changing thing on a page +will generate a static page that won't change until ikiwiki rebuilds the +page for some other reason, like the page being edited. + +The [[tutorial]] has some other examples of ways that ikiwiki being a +compiler may trip up the unwary. +"""]] + [[!toc levels=2]] +## Highlevel view of ikiwiki + +Ikiwiki mostly has two modes of operation. It can either be running +as a compiler, building or updating a wiki; or as a cgi program, providing +user interface for editing pages, etc. Almost everything ikiwiki does +is accomplished by calling various hooks provided by plugins. + +### compiler + +As a compiler, ikiwiki starts by calling the `refresh` hook. Then it checks +the wiki's source to find new or changed pages. The `needsbuild` hook is +then called to allow manipulation of the list of pages that need to be +built. + +Now that it knows what pages it needs to build, ikiwiki runs two +compile passes. First, it runs `scan` hooks, which collect metadata about +the pages. Then it runs a page rendering pipeline, by calling in turn these +hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`, +`pagetemplate`, `sanitize`, `format`. + +After all necessary pages are built, it calls the `change` hook. Finally, +if a page is was deleted, the `delete` hook is called, and the files that +page had previously produced are removed. + +### cgi + +The flow between hooks when ikiwiki is run as a cgi is best illustrated by +an example. + +Alice browses to a page and clicks Edit. + +* Ikiwiki is run as a cgi. It assigns Alice a session cookie, and, + by calling the `auth` hooks, sees that she is not yet logged in. +* The `sessioncgi` hooks are then called, and one of them, + from the [[editpage]] plugin, notices that the cgi has been told "do=edit". +* The [[editpage]] plugin calls the `canedit` hook to check if this + page edit is allowed. The [[signinedit]] plugin has a hook that says not: + Alice is not signed in. +* The [[signinedit]] plugin then launches the signin process. A signin + page is built by calling the `formbuilder_setup` hook. + +Alice signs in with her openid. + +* The [[openid]] plugin's `formbuilder` hook sees that an openid was + entered in the signin form, and redirects to Alice's openid provider. +* Alice's openid provider calls back to ikiwiki. The [[openid]] plugin + has an `auth` hook that finishes the openid signin process. +* Signin complete, ikiwiki returns to what Alice was doing before; editing + a page. +* Now all the `canedit` hooks are happy. The [[editpage]] plugin calls + `formbuilder_setup` to display the page editing form. + +Alice saves her change to the page. + +* The [[editpage]] plugin's `formbuilder` hook sees that the Save button + was pressed, and calls the `checkcontent` and `editcontent` hooks. + Then it saves the page to disk, and branches into the compiler part + of ikiwiki to refresh the wiki. + ## Types of plugins Most ikiwiki [[plugins]] are written in perl, like ikiwiki. This gives the @@ -31,16 +107,20 @@ explain how to write both sorts of plugins, albeit with an emphasis on perl plugins. -## Considerations +## Plugin interface -One thing to keep in mind when writing a plugin is that ikiwiki is a wiki -*compiler*. So plugins influence pages when they are built, not when they -are loaded. A plugin that inserts the current time into a page, for -example, will insert the build time. Also, as a compiler, ikiwiki avoids -rebuilding pages unless they have changed, so a plugin that prints some -random or changing thing on a page will generate a static page that won't -change until ikiwiki rebuilds the page for some other reason, like the page -being edited. +To import the ikiwiki plugin interface: + + use IkiWiki '3.00'; + +This will import several variables and functions into your plugin's +namespace. These variables and functions are the ones most plugins need, +and a special effort will be made to avoid changing them in incompatible +ways, and to document any changes that have to be made in the future. + +Note that IkiWiki also provides other variables and functions that are not +exported by default. No guarantee is made about these in the future, so if +it's not exported, the wise choice is to not use it. ## Registering plugins @@ -68,20 +148,21 @@ This allows for plugins to perform their own processing of command-line options and so add options to the ikiwiki command line. It's called during -command line processing, with @ARGV full of any options that ikiwiki was +command line processing, with `@ARGV` full of any options that ikiwiki was not able to process on its own. The function should process any options it -can, removing them from @ARGV, and probably recording the configuration -settings in %config. It should take care not to abort if it sees +can, removing them from `@ARGV`, and probably recording the configuration +settings in `%config`. It should take care not to abort if it sees an option it cannot process, and should just skip over those options and -leave them in @ARGV. +leave them in `@ARGV`. ### checkconfig hook(type => "checkconfig", id => "foo", call => \&checkconfig); This is useful if the plugin needs to check for or modify ikiwiki's -configuration. It's called early in the startup process. The -function is passed no values. It's ok for the function to call +configuration. It's called early in the startup process. `%config` +is populated at this point, but other state has not yet been loaded. +The function is passed no values. It's ok for the function to call `error()` if something isn't configured right. ### refresh @@ -455,7 +536,13 @@ describing the option. There can also be an item named "plugin", which describes the plugin as a whole. For example: - return + return + plugin => { + description => "description of this plugin", + safe => 1, + rebuild => 1, + section => "misc", + }, option_foo => { type => "boolean", description => "enable foo?", @@ -470,11 +557,6 @@ safe => 1, rebuild => 0, }, - plugin => { - description => "description of this plugin", - safe => 1, - rebuild => 1, - }, * `type` can be "boolean", "string", "integer", "pagespec", or "internal" (used for values that are not user-visible). The type is @@ -495,6 +577,9 @@ the plugin) will require a wiki rebuild, false if no rebuild is needed, and undef if a rebuild could be needed in some circumstances, but is not strictly required. +* `section` can optionally specify which section in the config file + the plugin fits in. The convention is to name the sections the + same as the tags used for [[plugins|plugin]] on this wiki. ### genwrapper @@ -503,28 +588,17 @@ This hook is used to inject C code (which it returns) into the `main` function of the ikiwiki wrapper when it is being generated. -## Plugin interface - -To import the ikiwiki plugin interface: - - use IkiWiki '3.00'; - -This will import several variables and functions into your plugin's -namespace. These variables and functions are the ones most plugins need, -and a special effort will be made to avoid changing them in incompatible -ways, and to document any changes that have to be made in the future. +## Exported variables -Note that IkiWiki also provides other variables and functions that are not -exported by default. No guarantee is made about these in the future, so if -it's not exported, the wise choice is to not use it. +Several variables are exported to your plugin when you `use IkiWiki;` -### %config +### `%config` A plugin can access the wiki's configuration via the `%config` hash. The best way to understand the contents of the hash is to look at your ikiwiki setup file, which sets the hash content to configure the wiki. -### %pagestate +### `%pagestate` The `%pagestate` hash can be used by plugins to save state that they will need next time ikiwiki is run. The hash holds per-page state, so to set a value, @@ -542,7 +616,7 @@ Note that page state does not persist across wiki rebuilds, only across wiki updates. -### %wikistate +### `%wikistate` The `%wikistate` hash can be used by a plugin to store persistant state that is not bound to any one page. To set a value, use @@ -551,23 +625,37 @@ "id" parameter passed to `hook()` when registering the plugin, so that the state can be dropped if the plugin is no longer used. -### Other variables +### `%links` + +The `%links` hash can be used to look up the names of each page that +a page links to. The name of the page is the key; the value is an array +reference. Do not modify this hash directly; call `add_link()`. + + $links{"foo"} = ["bar", "baz"]; -If your plugin needs to access data about other pages in the wiki. It can -use the following hashes, using a page name as the key: +### `%pagesources` -* `%links` lists the names of each page that a page links to, in an array - reference. -* `%destsources` contains the name of the source file used to create each - destination file. -* `%pagesources` contains the name of the source file for each page. +The `%pagesources` has can be used to look up the source filename +of a page. So the key is the page name, and the value is the source +filename. Do not modify this hash. -Also, the `%IkiWiki::version` variable contains the version number for the -ikiwiki program. + $pagesources{"foo"} = "foo.mdwn"; + +### `%destsources` + +The `%destsources` hash records the name of the source file used to +create each destination file. The key is the output filename (ie, +"foo/index.html"), and the value is the source filename that it was built +from (eg, "foo.mdwn"). Note that a single source file may create multiple +destination files. Do not modify this hash directly; call `will_render()`. + + $destsources{"foo/index.html"} = "foo.mdwn"; -### Library functions +## Library functions -#### `hook(@)` +Several functions are exported to your plugin when you `use IkiWiki;` + +### `hook(@)` Hook into ikiwiki's processing. See the discussion of hooks above. @@ -576,12 +664,12 @@ will not override any existing hook with the same id. This is useful if the id can be controled by the user. -#### `debug($)` +### `debug($)` Logs a debugging message. These are supressed unless verbose mode is turned on. -#### `error($;$)` +### `error($;$)` Aborts with an error message. If the second parameter is passed, it is a function that is called after the error message is printed, to do any final @@ -595,13 +683,13 @@ dying on bad input when building a page, as that will halt the entire wiki build and make the wiki unusable. -#### `template($;@)` +### `template($;@)` Creates and returns a [[!cpan HTML::Template]] object. The first parameter is the name of the file in the template directory. The optional remaining parameters are passed to `HTML::Template->new`. -#### `htmlpage($)` +### `htmlpage($)` Passed a page name, returns the base name that will be used for a the html page created from it. (Ie, it appends ".html".) @@ -609,23 +697,7 @@ Use this when constructing the filename of a html file. Use `urlto` when generating a link to a page. -### `deptype(@)` - -Use this function to generate ikiwiki's internal representation of a -dependency type from one or more of these keywords: - -* `content` is the default. Any change to the content - of a page triggers the dependency. -* `presence` is only triggered by a change to the presence - of a page. -* `links` is only triggered by a change to the links of a page. - This includes when a link is added, removed, or changes what - it points to due to other changes. It does not include the - addition or removal of a duplicate link. - -If multiple types are specified, they are combined. - -#### `pagespec_match_list($$;@)` +### `pagespec_match_list($$;@)` Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages in the wiki that match the [[ikiwiki/PageSpec]]. @@ -656,7 +728,7 @@ Any other named parameters are passed on to `pagespec_match`, to further limit the match. -#### `add_depends($$;$)` +### `add_depends($$;$)` Makes the specified page depend on the specified [[ikiwiki/PageSpec]]. @@ -664,7 +736,7 @@ page will be updated whenever anything matching the PageSpec is modified. This can be overridden by passing a `deptype` value as the third parameter. -#### `pagespec_match($$;@)` +### `pagespec_match($$;@)` Passed a page name, and [[ikiwiki/PageSpec]], returns a true value if the [[ikiwiki/PageSpec]] matches the page. @@ -678,7 +750,23 @@ PageSpec should match against. If not passed, relative PageSpecs will match relative to the top of the wiki. -#### `bestlink($$)` +### `deptype(@)` + +Use this function to generate ikiwiki's internal representation of a +dependency type from one or more of these keywords: + +* `content` is the default. Any change to the content + of a page triggers the dependency. +* `presence` is only triggered by a change to the presence + of a page. +* `links` is only triggered by a change to the links of a page. + This includes when a link is added, removed, or changes what + it points to due to other changes. It does not include the + addition or removal of a duplicate link. + +If multiple types are specified, they are combined. + +### `bestlink($$)` Given a page and the text of a link on the page, determine which existing page that link best points to. Prefers pages under a @@ -686,7 +774,7 @@ goes down the directory tree to the base looking for matching pages, as described in [[ikiwiki/SubPage/LinkingRules]]. -#### `htmllink($$$;@)` +### `htmllink($$$;@)` Many plugins need to generate html links and add them to a page. This is done by using the `htmllink` function. The usual way to call @@ -714,7 +802,7 @@ * class - set to add a css class to the link * title - set to add a title attribute to the link -#### `readfile($;$)` +### `readfile($;$)` Given a filename, reads and returns the entire file. @@ -723,7 +811,7 @@ A failure to read the file will result in it dying with an error. -#### `writefile($$$;$$)` +### `writefile($$$;$$)` Given a filename, a directory to put it in, and the file's content, writes a file. @@ -751,7 +839,7 @@ the srcdir or destdir, and any subdirectories of this are included in the filename parameter. -#### `will_render($$)` +### `will_render($$)` Given a page name and a destination file name (not including the base destination directory), register that the page will result in that file @@ -767,34 +855,34 @@ the page that rendered them goes away or is changed to no longer render them. will_render also does a few important security checks. -#### `pagetype($)` +### `pagetype($)` Given the name of a source file, returns the type of page it is, if it's a type that ikiwiki knowns how to htmlize. Otherwise, returns undef. -#### `pagename($)` +### `pagename($)` Given the name of a source file, returns the name of the wiki page that corresponds to that file. -#### `pagetitle($)` +### `pagetitle($)` Give the name of a wiki page, returns a version suitable to be displayed as the page's title. This is accomplished by de-escaping escaped characters in the page name. "_" is replaced with a space, and '__NN__' is replaced by the UTF character with code NN. -#### `titlepage($)` +### `titlepage($)` This performs the inverse of `pagetitle`, ie, it converts a page title into a wiki page name. -#### `linkpage($)` +### `linkpage($)` This converts text that could have been entered by the user as a [[ikiwiki/WikiLink]] into a wiki page name. -#### `srcfile($;$)` +### `srcfile($;$)` Given the name of a source file in the wiki, searches for the file in the source directory and the underlay directories (most recently added @@ -804,7 +892,7 @@ be found. The second parameter can be set to a true value to make it return undef instead. -#### `add_underlay($)` +### `add_underlay($)` Adds a directory to the set of underlay directories that ikiwiki will search for files. @@ -812,18 +900,18 @@ If the directory name is not absolute, ikiwiki will assume it is in the parent directory of the configured underlaydir. -#### `displaytime($;$)` +### `displaytime($;$)` Given a time, formats it for display. The optional second parameter is a strftime format to use to format the time. -#### `gettext` +### `gettext` This is the standard gettext function, although slightly optimised. -#### `urlto($$;$)` +### `urlto($$;$)` Construct a relative url to the first parameter from the page named by the second. The first parameter can be either a page name, or some other @@ -832,13 +920,13 @@ If the third parameter is passed and is true, an absolute url will be constructed instead of the default relative url. -#### `newpagefile($$)` +### `newpagefile($$)` This can be called when creating a new page, to determine what filename to save the page to. It's passed a page name, and its type, and returns the name of the file to create, relative to the srcdir. -#### `targetpage($$;$)` +### `targetpage($$;$)` Passed a page and an extension, returns the filename that page will be rendered to. @@ -847,7 +935,7 @@ filename of the page. For example, `targetpage("foo", "rss", "feed")` will yield something like `foo/feed.rss`. -#### `add_link($$)` +### `add_link($$)` This adds a link to `%links`, ensuring that duplicate links are not added. Pass it the page that contains the link, and the link text. diff -Nru ikiwiki-3.20100122ubuntu1/doc/tipjar.mdwn ikiwiki-3.20100212ubuntu1/doc/tipjar.mdwn --- ikiwiki-3.20100122ubuntu1/doc/tipjar.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/tipjar.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -15,6 +15,7 @@ * Mick Pollard * Nico Schottelius * Jon Dowland +* Amitai Schlair (Note that this page is locked to prevent anyone from tampering with the PayPal button. If you prefer your donation *not* be listed here, let [[Joey]] know.) diff -Nru ikiwiki-3.20100122ubuntu1/doc/tips/add_chatterbox_to_blog.mdwn ikiwiki-3.20100212ubuntu1/doc/tips/add_chatterbox_to_blog.mdwn --- ikiwiki-3.20100122ubuntu1/doc/tips/add_chatterbox_to_blog.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/tips/add_chatterbox_to_blog.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -18,4 +18,7 @@ show=5 feeds=no]] """]] +* To filter out `@-replies`, append "and !*@*" to the [[ikiwiki/PageSpec]]. + The same technique can be used for other filtering. + Note: Works best with ikiwiki 3.10 or better. diff -Nru ikiwiki-3.20100122ubuntu1/doc/tips/follow_wikilinks_from_inside_vim.mdwn ikiwiki-3.20100212ubuntu1/doc/tips/follow_wikilinks_from_inside_vim.mdwn --- ikiwiki-3.20100122ubuntu1/doc/tips/follow_wikilinks_from_inside_vim.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/tips/follow_wikilinks_from_inside_vim.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,47 @@ +The [ikiwiki-nav](http://www.vim.org/scripts/script.php?script_id=2968) plugin +for vim eases the editing of IkiWiki wikis, by letting you "follow" the +wikilinks on your file (page), by loading the file associated with a given +wikilink in vim. The plugin takes care of following the ikiwiki linking rules +to figure out which file a wikilink points to + +The plugin also includes commands (and mappings) to make the cursor jump to the +previous/next wikilink in the current file + +## Jumping to pages + +To open the file associated to a wikilink, place the cursor over its text, and +hit Enter (``). This functionality is also available through the +`:IkiJumpToPage` command + +## Moving to next/previous wikilink in current file + +`Ctrl-j` will move the cursor to the next wikilink. `Ctrl-k` will move it to the +previous wikilink. This functionality is also available through the +`:IkiNextWikiLink` command. This command takes one argument, the direction to +move into + + * `:IkiNextWikiLink 0` will look forward for the wikilink + * `:IkiNextWikiLink 1` will look backwards for the wikilink + +## Installation + +Copy the `ikiwiki_nav.vim` file to your `.vim/ftplugin` directory. + +## Current issues: + + * The plugin only works for wikilinks contained in a single text line; + multiline wikilinks are not (yet) seen as such + +## Notes + +The official releases of the plugin are in the +[vim.org script page](http://www.vim.org/scripts/script.php?script_id=2968) + +The latest version of this script can be found in the following location + + + +Any feedback you can provide is appreciated; the contact details can be found +inside the plugin + +[[!tag vim]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/tips/vim_syntax_highlighting.mdwn ikiwiki-3.20100212ubuntu1/doc/tips/vim_syntax_highlighting.mdwn --- ikiwiki-3.20100122ubuntu1/doc/tips/vim_syntax_highlighting.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/tips/vim_syntax_highlighting.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -1,4 +1,7 @@ [[ikiwiki.vim]] is a vim syntax highlighting file for ikiwiki -[[ikiwiki/markdown]] files. +[[ikiwiki/markdown]] files. Installation instructions are at the top of the file. + +See also: [[follow_wikilinks_from_inside_vim]] +[[!tag vim]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn ikiwiki-3.20100212ubuntu1/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn --- ikiwiki-3.20100122ubuntu1/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -4,7 +4,7 @@ Also see: and -[[!tag wishlist plugins/tag patch]] +[[!tag wishlist plugins/tag patch patch/core]] I would love to see this as well. -- dato @@ -123,3 +123,72 @@ } is not satisfied for the newly created tag page. I shall put debug msgs into Render.pm to find out better how it works. --Ivan Z. + +--- + +I've made another attempt at fixiing this + +The current progress can be found at my [git repository][gitweb] on branch +`autotag`: + + git://git.liegesta.at/git/ikiwiki + +[gitweb]: http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag (gitweb for branch autotag) + +It's not entirely finished yet, but already quite usable. Testing and comments +on code quality, implementation details, as well as other patches would be +appreciated. + +Here's what it does right now: + +* enabled by setting `tag_autocreate=1` in the configuration. +* Tag pages will be created in `tagbase` from the template `autotag.tmpl`. +* Will correctly render all links, and dependencies. Well, AFAIK. +* When a tag page is deleted it will automatically recreated from template. (I +consider this a feature, not a bug) +* Requires a rebuild on first use. +* Adds a function `add_autofile()` to the plugin API, to do all this. + +Todo/Bugs: + +* Will still create a page even if there's a page other than `$tag` under +`tagbase` satisfying the tag link. +* Call from `IkiWiki.pm` to `Render.pm`, which adds a module dependency in the +wrong direction. +* Add files to RCS. +* Unit tests. +* Proper documentation. + +--[[David_Riebenbauer]] + +> Starting review of this. Some of your commits are to very delicate, +> optimised, and security-sensitive ground, so I have to look at them very +> carefully. --[[Joey]] +> +> * In the refactoring in f3abeac919c4736429bd3362af6edf51ede8e7fe, +> you introduced at least 2 bugs, one a possible security hole. +> Now one part of the code tests `if ($file)` and the other +> caller tests `if ($f)`. These two tests both tested `if (! defined $f)` +> before. Notice that the variable needs to be the untainted variable +> for both. Also notice that `if ($f)` fails if `$f` contains `0`, +> which is a very common perl gotcha. +> * Your refactored code changes `-l $_ || -d _` to `-l $file || -d $file`. +> The latter makes one more stat system call; note the use of a +> bare `_` in the first to make perl reuse the stat buffer. +> * (As a matter of style, could you put a space after the commas in your +> perl?) +> +> I'd like to cherry-pick the above commit, once it's in shape, before +> looking at the rest in detail. So just a few other things that stood out. +> +> * Commit 4af4d26582f0c2b915d7102fb4a604b176385748 seems unnecessary. +> `srcfile($file, 1)` already is documented to return undef if the +> file does not exist. (But without the second parameter, it throws +> an error.) +> +> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 adds a line +> that is intented by a space, not a tab. +> +> * Commit f58f3e1bec41ccf9316f37b014ce0b373c8e49e1 says that auto-added +> files will be recreated if the user deletes them. That seems bad. +> `autoindex` goes to some trouble to not recreate deleted files. diff -Nru ikiwiki-3.20100122ubuntu1/doc/todo/http_bl_support.mdwn ikiwiki-3.20100212ubuntu1/doc/todo/http_bl_support.mdwn --- ikiwiki-3.20100122ubuntu1/doc/todo/http_bl_support.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/todo/http_bl_support.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,67 @@ +[Project Honeypot](http://projecthoneypot.org/) has an HTTP:BL API available to subscribed (it's free, accept donations) people/orgs. There's a basic perl package someone wrote, I'm including a copy here. + +[from here](http://projecthoneypot.org/board/read.php?f=10&i=112&t=112) + +> The [[plugins/blogspam]] service already checks urls against +> the surbl, and has its own IP blacklist. The best way to +> support the HTTP:BL may be to add a plugin +> [there](http://blogspam.repository.steve.org.uk/file/cc858e497cae/server/plugins/). +> --[[Joey]] + +

+package Honeypot;
+
+use Socket qw/inet_ntoa/;
+
+my $dns = 'dnsbl.httpbl.org';
+my %types = (
+0	=> 'Search Engine',
+1	=> 'Suspicious',
+2	=> 'Harvester',
+4	=> 'Comment Spammer'
+);
+sub query {
+my $key = shift || die 'You need a key for this, you get one at http://www.projecthoneypot.org';
+my $ip = shift || do {
+warn 'no IP for request in Honeypot::query().';
+return;
+};
+
+my @parts = reverse split /\./, $ip;
+my $lookup_name = join'.', $key, @parts, $dns;
+
+my $answer = gethostbyname ($lookup_name);
+return unless $answer;
+$answer = inet_ntoa($answer);
+my(undef, $days, $threat, $type) = split /\./, $answer;
+my @types;
+while(my($bit, $typename) = each %types) {
+push @types, $typename if $bit & $type;
+}
+return {
+days => $days,
+threat => $threat,
+type => join ',', @types
+};
+
+}
+1;
+

+ +From the page: + +> The usage is simple: + +> use Honeypot; +> my $key = 'XXXXXXX'; # your key +> my $ip = '....'; the IP you want to check +> my $q = Honeypot::query($key, $ip); + +> use Data::Dumper; +> print Dumper $q; + +Any chance of having this as a plugin? + +I could give it a go, too. Would be fun to try my hand at Perl. --[[simonraven]] + +[[!tag wishlist]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/todo/wrapperuser.mdwn ikiwiki-3.20100212ubuntu1/doc/todo/wrapperuser.mdwn --- ikiwiki-3.20100122ubuntu1/doc/todo/wrapperuser.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/todo/wrapperuser.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -0,0 +1,7 @@ +ikiwiki's .setup file can specify wrappergroup, and ikiwiki will set the group +of the wrappers accordingly. Having had people encounter difficulty before +when trying to do the same thing with users (for instance, making all wrappers +6755 ikiwiki:ikiwiki), I think it would help to have "wrapperuser". This could +only actually take effect if building the wrappers as root (not really the best +plan), but ikiwiki could at least warn if wrapperuser does not match the user +the wrapper will end up with. diff -Nru ikiwiki-3.20100122ubuntu1/doc/users/David_Riebenbauer.mdwn ikiwiki-3.20100212ubuntu1/doc/users/David_Riebenbauer.mdwn --- ikiwiki-3.20100122ubuntu1/doc/users/David_Riebenbauer.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/users/David_Riebenbauer.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -1,2 +1,8 @@ Runs ikiwiki on his [homepage](http://liegesta.at/) and can be reached through + +## Branches in his [[git]] repository ## + +* `autotag` +([browse](http://git.liegesta.at/?p=ikiwiki.git;a=shortlog;h=refs/heads/autotag)) +See [[todo/auto-create_tag_pages_according_to_a_template]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/users/Edward_Betts.mdwn ikiwiki-3.20100212ubuntu1/doc/users/Edward_Betts.mdwn --- ikiwiki-3.20100122ubuntu1/doc/users/Edward_Betts.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/users/Edward_Betts.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -1,9 +1,4 @@ My watchlist: -[[!inline archive="yes" sort="mtime" atom="yes" pages=" -todo/allow_wiki_syntax_in_commit_messages* -todo/shortcut_with_different_link_text* -todo/structured_page_data* -tips/convert_mediawiki_to_ikiwiki* -"]] +[[!inline archive="yes" sort="mtime" atom="yes" pages="todo/allow_wiki_syntax_in_commit_messages* or todo/shortcut_with_different_link_text* or todo/structured_page_data* or tips/convert_mediawiki_to_ikiwiki*"]] diff -Nru ikiwiki-3.20100122ubuntu1/doc/users/KathrynAndersen.mdwn ikiwiki-3.20100212ubuntu1/doc/users/KathrynAndersen.mdwn --- ikiwiki-3.20100122ubuntu1/doc/users/KathrynAndersen.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/doc/users/KathrynAndersen.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -1,6 +1,7 @@ * aka [[rubykat]] * Currently an active [PmWiki](http://www.pmwiki.org) user, but investigating changing over to ikiwiki (if I can write the plugins I need). * +* * Has written the following plugins: diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/404.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/404.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/404.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/404.pm 2010-02-12 10:17:43.000000000 +0100 @@ -21,6 +21,7 @@ # server admin action too safe => 0, rebuild => 0, + section => "web", } } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/amazon_s3.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/amazon_s3.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/amazon_s3.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/amazon_s3.pm 2010-02-12 12:31:36.000000000 +0100 @@ -133,6 +133,10 @@ } if (! $bucket) { + # Try to use existing bucket. + $bucket=$s3->bucket($config{amazon_s3_bucket}); + } + if (! $bucket) { error(gettext("Failed to create S3 bucket: "). $s3->err.": ".$s3->errstr."\n"); } @@ -178,7 +182,7 @@ # First, write the file to disk. my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer); - + my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file"); # Store the data in S3. diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/anonok.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/anonok.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/anonok.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/anonok.pm 2010-02-12 04:53:17.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, anonok_pagespec => { type => "pagespec", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/attachment.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/attachment.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/attachment.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/attachment.pm 2010-02-12 10:17:46.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => 0, + section => "web", }, allowed_attachments => { type => "pagespec", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/blogspam.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/blogspam.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/blogspam.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/blogspam.pm 2010-02-12 04:53:17.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, blogspam_pagespec => { type => 'pagespec', diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/bzr.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/bzr.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/bzr.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/bzr.pm 2010-02-12 04:53:17.000000000 +0100 @@ -36,6 +36,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, bzr_wrapper => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/calendar.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/calendar.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/calendar.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/calendar.pm 2010-02-12 12:22:14.000000000 +0100 @@ -38,6 +38,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, archivebase => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/color.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/color.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/color.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/color.pm 2010-02-12 12:22:16.000000000 +0100 @@ -10,6 +10,16 @@ sub import { hook(type => "preprocess", id => "color", call => \&preprocess); hook(type => "format", id => "color", call => \&format); + hook(type => "getsetup", id => "color", call => \&getsetup); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + section => "widget", + }, } sub preserve_style ($$$) { diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/comments.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/comments.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/comments.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/comments.pm 2010-02-12 10:17:49.000000000 +0100 @@ -38,6 +38,7 @@ plugin => { safe => 1, rebuild => 1, + section => "web", }, comments_pagespec => { type => 'pagespec', @@ -171,9 +172,8 @@ else { $commentauthorurl = IkiWiki::cgiurl( do => 'goto', - page => (length $config{userdir} - ? "$config{userdir}/$commentuser" - : "$commentuser")); + page => IkiWiki::userpage($commentuser) + ); $commentauthor = $commentuser; } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/conditional.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/conditional.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/conditional.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/conditional.pm 2010-02-12 12:29:47.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/creole.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/creole.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/creole.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/creole.pm 2010-02-12 06:51:06.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/cutpaste.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/cutpaste.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/cutpaste.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/cutpaste.pm 2010-02-12 12:22:19.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/cvs.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/cvs.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/cvs.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/cvs.pm 2010-02-12 04:53:17.000000000 +0100 @@ -85,6 +85,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, cvsrepo => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/darcs.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/darcs.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/darcs.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/darcs.pm 2010-02-12 04:53:17.000000000 +0100 @@ -92,6 +92,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, darcs_wrapper => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/date.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/date.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/date.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/date.pm 2010-02-12 12:22:21.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/editdiff.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/editdiff.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/editdiff.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/editdiff.pm 2010-02-12 10:17:52.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => 0, + section => "web", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/editpage.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/editpage.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/editpage.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/editpage.pm 2010-02-12 04:53:17.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => 1, + section => "core", }, } @@ -245,8 +246,9 @@ push @page_locs, $dir.$page; } - push @page_locs, "$config{userdir}/$page" - if length $config{userdir}; + my $userpage=IkiWiki::userpage($page); + push @page_locs, $userpage + if ! grep { $_ eq $userpage } @page_locs; } @page_locs = grep { @@ -271,8 +273,10 @@ check_canedit($_, $q, $session, 1) } @page_locs; if (! @editable_locs) { - # let it throw an error this time - map { check_canedit($_, $q, $session) } @page_locs; + # now let it throw an error, or prompt for + # login + map { check_canedit($_, $q, $session) } + ($best_loc, @page_locs); } my @page_types; diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/edittemplate.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/edittemplate.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/edittemplate.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/edittemplate.pm 2010-02-12 10:17:58.000000000 +0100 @@ -23,6 +23,7 @@ plugin => { safe => 1, rebuild => undef, + section => "web", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/format.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/format.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/format.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/format.pm 2010-02-12 12:22:25.000000000 +0100 @@ -7,6 +7,16 @@ sub import { hook(type => "preprocess", id => "format", call => \&preprocess); + hook(type => "getsetup", id => "format", call => \&getsetup); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + section => "widget", + }, } sub preprocess (@) { diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/fortune.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/fortune.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/fortune.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/fortune.pm 2010-02-12 12:22:27.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/getsource.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/getsource.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/getsource.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/getsource.pm 2010-02-12 10:18:00.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => 1, + section => "web", }, getsource_mimetype => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/git.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/git.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/git.pm 2010-01-20 05:38:56.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/git.pm 2010-02-12 04:53:17.000000000 +0100 @@ -68,6 +68,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, git_wrapper => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/google.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/google.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/google.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/google.pm 2010-02-12 10:18:02.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => 1, + section => "web", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/goto.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/goto.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/goto.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/goto.pm 2010-02-12 10:18:05.000000000 +0100 @@ -14,6 +14,7 @@ plugin => { safe => 1, rebuild => 0, + section => "web", } } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/graphviz.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/graphviz.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/graphviz.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/graphviz.pm 2010-02-12 12:22:30.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/haiku.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/haiku.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/haiku.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/haiku.pm 2010-02-12 12:22:33.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/highlight.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/highlight.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/highlight.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/highlight.pm 2010-02-12 06:28:22.000000000 +0100 @@ -23,6 +23,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, tohighlight => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/hnb.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/hnb.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/hnb.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/hnb.pm 2010-02-12 06:35:37.000000000 +0100 @@ -23,6 +23,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/html.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/html.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/html.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/html.pm 2010-02-12 06:35:58.000000000 +0100 @@ -21,6 +21,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/htmlscrubber.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/htmlscrubber.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/htmlscrubber.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/htmlscrubber.pm 2010-02-12 04:53:17.000000000 +0100 @@ -40,6 +40,7 @@ plugin => { safe => 1, rebuild => undef, + section => "core", }, htmlscrubber_skip => { type => "pagespec", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/httpauth.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/httpauth.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/httpauth.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/httpauth.pm 2010-02-12 04:53:17.000000000 +0100 @@ -9,6 +9,10 @@ sub import { hook(type => "getsetup", id => "httpauth", call => \&getsetup); hook(type => "auth", id => "httpauth", call => \&auth); + hook(type => "formbuilder_setup", id => "httpauth", + call => \&formbuilder_setup); + hook(type => "canedit", id => "httpauth", call => \&canedit, + first => 1); } sub getsetup () { @@ -16,6 +20,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, cgiauthurl => { type => "string", @@ -24,6 +29,23 @@ safe => 1, rebuild => 0, }, + httpauth_pagespec => { + type => "pagespec", + example => "!*/Discussion", + description => "PageSpec of pages where only httpauth will be used for authentication", + safe => 0, + rebuild => 0, + }, +} + +sub redir_cgiauthurl ($;@) { + my $cgi=shift; + + IkiWiki::redirect($cgi, + @_ > 1 ? IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_) + : $config{cgiauthurl}."?@_" + ); + exit; } sub auth ($$) { @@ -33,9 +55,53 @@ if (defined $cgi->remote_user()) { $session->param("name", $cgi->remote_user()); } - elsif (defined $config{cgiauthurl}) { - IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string()); - exit; +} + +sub formbuilder_setup (@) { + my %params=@_; + + my $form=$params{form}; + my $session=$params{session}; + my $cgi=$params{cgi}; + my $buttons=$params{buttons}; + + if ($form->title eq "signin" && + ! defined $cgi->remote_user() && defined $config{cgiauthurl}) { + my $button_text="Login with HTTP auth"; + push @$buttons, $button_text; + + if ($form->submitted && $form->submitted eq $button_text) { + # bounce thru cgiauthurl and then back to + # the stored postsignin action + redir_cgiauthurl($cgi, do => "postsignin"); + } + } +} + +sub test_httpauth_pagespec ($) { + my $page=shift; + + return ( + ); +} + +sub canedit ($$$) { + my $page=shift; + my $cgi=shift; + my $session=shift; + + if (! defined $cgi->remote_user() && + defined $config{httpauth_pagespec} && + length $config{httpauth_pagespec} && + defined $config{cgiauthurl} && + pagespec_match($page, $config{httpauth_pagespec})) { + return sub { + # bounce thru cgiauthurl and back to edit action + redir_cgiauthurl($cgi, $cgi->query_string()); + }; + } + else { + return undef; } } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/img.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/img.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/img.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/img.pm 2010-02-12 12:22:39.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } @@ -26,6 +27,10 @@ my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint my %params=@_; + if (! defined $image) { + error("bad image filename"); + } + if (exists $imgdefaults{$params{page}}) { foreach my $key (keys %{$imgdefaults{$params{page}}}) { if (! exists $params{$key}) { diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/inline.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/inline.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/inline.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/inline.pm 2010-02-12 04:53:17.000000000 +0100 @@ -49,6 +49,7 @@ plugin => { safe => 1, rebuild => undef, + section => "core", }, rss => { type => "boolean", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/linkmap.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/linkmap.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/linkmap.pm 2010-01-10 05:08:29.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/linkmap.pm 2010-02-12 12:22:45.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/link.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/link.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/link.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/link.pm 2010-02-12 04:53:17.000000000 +0100 @@ -20,6 +20,7 @@ plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/listdirectives.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/listdirectives.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/listdirectives.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/listdirectives.pm 2010-02-12 12:22:51.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, directive_description_dir => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/lockedit.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/lockedit.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/lockedit.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/lockedit.pm 2010-02-12 04:53:17.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, locked_pages => { type => "pagespec", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/map.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/map.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/map.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/map.pm 2010-02-12 12:22:54.000000000 +0100 @@ -21,6 +21,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/mdwn.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/mdwn.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/mdwn.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/mdwn.pm 2010-02-12 06:37:10.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, multimarkdown => { type => "boolean", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/mercurial.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/mercurial.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/mercurial.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/mercurial.pm 2010-02-12 04:53:17.000000000 +0100 @@ -36,6 +36,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, mercurial_wrapper => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/meta.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/meta.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/meta.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/meta.pm 2010-02-12 04:53:17.000000000 +0100 @@ -20,6 +20,7 @@ plugin => { safe => 1, rebuild => undef, + section => "core", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/mirrorlist.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/mirrorlist.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/mirrorlist.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/mirrorlist.pm 2010-02-12 10:18:09.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => 1, + section => "web", }, mirrorlist => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/moderatedcomments.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/moderatedcomments.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/moderatedcomments.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/moderatedcomments.pm 2010-02-12 04:53:17.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, moderate_users => { type => 'boolean', diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/monotone.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/monotone.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/monotone.pm 2010-01-18 18:34:11.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/monotone.pm 2010-02-12 04:53:17.000000000 +0100 @@ -68,6 +68,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, mtn_wrapper => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/more.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/more.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/more.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/more.pm 2010-02-12 12:22:56.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/norcs.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/norcs.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/norcs.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/norcs.pm 2010-02-12 10:21:10.000000000 +0100 @@ -25,6 +25,7 @@ plugin => { safe => 0, # rcs plugin rebuild => 0, + section => "rcs", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/opendiscussion.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/opendiscussion.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/opendiscussion.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/opendiscussion.pm 2010-02-12 04:53:17.000000000 +0100 @@ -7,7 +7,8 @@ sub import { hook(type => "getsetup", id => "opendiscussion", call => \&getsetup); - hook(type => "canedit", id => "opendiscussion", call => \&canedit); + hook(type => "canedit", id => "opendiscussion", call => \&canedit, + first => 1); } sub getsetup () { @@ -15,6 +16,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, } @@ -24,6 +26,7 @@ my $session=shift; return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i; + return "" if pagespec_match($page, "postcomment(*)"); return undef; } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/openid.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/openid.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/openid.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/openid.pm 2010-02-12 04:53:17.000000000 +0100 @@ -26,6 +26,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, openidsignup => { type => "string", @@ -56,7 +57,7 @@ # OpenID fieldset. $form->fieldsets("OpenID"); - $form->field( + $form->field( name => "openid_url", label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), fieldset => "OpenID", @@ -82,13 +83,13 @@ } } } - elsif ($form->title eq "preferences") { - if (! defined $form->field(name => "name")) { - $form->field(name => "OpenID", disabled => 1, - value => $session->param("name"), - size => 50, force => 1, - fieldset => "login"); - } + elsif ($form->title eq "preferences" && + IkiWiki::openiduser($session->param("name"))) { + $form->field(name => "openid_url", disabled => 1, + label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), + value => $session->param("name"), + size => 50, force => 1, + fieldset => "login"); } } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/orphans.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/orphans.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/orphans.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/orphans.pm 2010-02-12 12:22:58.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/otl.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/otl.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/otl.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/otl.pm 2010-02-12 06:37:22.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/pagecount.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/pagecount.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/pagecount.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/pagecount.pm 2010-02-12 12:23:02.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/pagestats.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/pagestats.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/pagestats.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/pagestats.pm 2010-02-12 12:23:05.000000000 +0100 @@ -27,6 +27,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/parentlinks.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/parentlinks.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/parentlinks.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/parentlinks.pm 2010-02-12 04:53:17.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/passwordauth.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/passwordauth.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/passwordauth.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/passwordauth.pm 2010-02-12 04:53:17.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, account_creation_password => { type => "string", @@ -104,11 +105,11 @@ my $session=$params{session}; my $cgi=$params{cgi}; - if ($form->title eq "signin" || $form->title eq "register") { + if ($form->title eq "signin" || $form->title eq "register" || $cgi->param("do") eq "register") { $form->field(name => "name", required => 0); $form->field(name => "password", type => "password", required => 0); - if ($form->submitted eq "Register" || $form->submitted eq "Create Account") { + if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $cgi->param("do") eq "register") { $form->field(name => "confirm_password", type => "password"); $form->field(name => "account_creation_password", type => "password") if (defined $config{account_creation_password} && @@ -207,19 +208,34 @@ } } elsif ($form->title eq "preferences") { - $form->field(name => "name", disabled => 1, - value => $session->param("name"), force => 1, - fieldset => "login"); - $form->field(name => "password", type => "password", - fieldset => "login", - validate => sub { - shift eq $form->field("confirm_password"); - }), - $form->field(name => "confirm_password", type => "password", - fieldset => "login", - validate => sub { - shift eq $form->field("password"); - }), + my $user=$session->param("name"); + if (! IkiWiki::openiduser($user)) { + $form->field(name => "name", disabled => 1, + value => $user, force => 1, + fieldset => "login"); + $form->field(name => "password", type => "password", + fieldset => "login", + validate => sub { + shift eq $form->field("confirm_password"); + }); + $form->field(name => "confirm_password", type => "password", + fieldset => "login", + validate => sub { + shift eq $form->field("password"); + }); + + my $userpage=IkiWiki::userpage($user); + if (exists $pagesources{$userpage}) { + $form->text(gettext("Your user page: "). + htmllink("", "", $userpage, + noimageinline => 1)); + } + else { + $form->text(" "edit", page => $userpage). + "\">".gettext("Create your user page").""); + } + } } } @@ -232,7 +248,7 @@ my $buttons=$params{buttons}; if ($form->title eq "signin" || $form->title eq "register") { - if ($form->submitted && $form->validate) { + if (($form->submitted && $form->validate) || $cgi->param("do") eq "register") { if ($form->submitted eq 'Login') { $session->param("name", $form->field("name")); IkiWiki::cgi_postsignin($cgi, $session); @@ -295,7 +311,7 @@ $form->field(name => "name", required => 0); push @$buttons, "Reset Password"; } - elsif ($form->submitted eq "Register") { + elsif ($form->submitted eq "Register" || $cgi->param("do") eq "register") { @$buttons="Create Account"; } } @@ -336,6 +352,14 @@ IkiWiki::cgi_prefs($q, $session); exit; } + elsif ($q->param("do") eq "register") { + # After registration, need to go somewhere, so show prefs page. + $session->param(postsignin => "do=prefs"); + # Due to do=register, this will run in registration-only + # mode. + IkiWiki::cgi_signin($q, $session); + exit; + } } sub auth ($$) { diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/poll.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/poll.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/poll.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/poll.pm 2010-02-12 12:23:08.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/polygen.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/polygen.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/polygen.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/polygen.pm 2010-02-12 12:23:10.000000000 +0100 @@ -20,6 +20,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/po.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/po.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/po.pm 2010-01-21 21:32:59.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/po.pm 2010-02-12 06:41:53.000000000 +0100 @@ -85,7 +85,8 @@ return plugin => { safe => 0, - rebuild => 1, + rebuild => 1, # format plugin + section => "format", }, po_master_language => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/postsparkline.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/postsparkline.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/postsparkline.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/postsparkline.pm 2010-02-12 12:23:12.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/progress.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/progress.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/progress.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/progress.pm 2010-02-12 12:23:15.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/rawhtml.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/rawhtml.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/rawhtml.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/rawhtml.pm 2010-02-12 06:40:54.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => 1, # changes file types + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/recentchanges.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/recentchanges.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/recentchanges.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/recentchanges.pm 2010-02-12 12:30:17.000000000 +0100 @@ -124,7 +124,7 @@ elsif (length $config{cgiurl}) { $change->{authorurl} = IkiWiki::cgiurl( do => "goto", - page => (length $config{userdir} ? "$config{userdir}/" : "").$change->{author}, + page => IkiWiki::userpage($change->{author}), ); } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/remove.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/remove.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/remove.pm 2010-01-18 18:09:40.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/remove.pm 2010-02-12 10:18:12.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => 0, + section => "web", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/rename.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/rename.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/rename.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/rename.pm 2010-02-12 10:18:16.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => 0, + section => "web", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/repolist.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/repolist.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/repolist.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/repolist.pm 2010-02-12 10:18:19.000000000 +0100 @@ -15,6 +15,7 @@ plugin => { safe => 1, rebuild => undef, + section => "web", }, repositories => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/search.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/search.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/search.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/search.pm 2010-02-12 10:18:23.000000000 +0100 @@ -20,6 +20,7 @@ plugin => { safe => 1, rebuild => 1, + section => "web", }, omega_cgi => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/shortcut.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/shortcut.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/shortcut.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/shortcut.pm 2010-02-12 12:23:20.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/signinedit.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/signinedit.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/signinedit.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/signinedit.pm 2010-02-12 04:53:17.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => 0, + section => "auth", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/sparkline.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/sparkline.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/sparkline.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/sparkline.pm 2010-02-12 12:23:24.000000000 +0100 @@ -24,6 +24,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/svn.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/svn.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/svn.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/svn.pm 2010-02-12 04:53:17.000000000 +0100 @@ -44,6 +44,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, svnrepo => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/table.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/table.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/table.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/table.pm 2010-02-12 12:23:27.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/template.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/template.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/template.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/template.pm 2010-02-12 12:23:41.000000000 +0100 @@ -19,12 +19,17 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } sub preprocess (@) { my %params=@_; + # This needs to run even in scan mode, in order to process + # links and other metadata included via the template. + my $scan=! defined wantarray; + if (! exists $params{id}) { error gettext("missing id parameter") } @@ -58,24 +63,23 @@ $params{basename}=IkiWiki::basename($params{page}); foreach my $param (keys %params) { + my $value=IkiWiki::preprocess($params{page}, $params{destpage}, + IkiWiki::filter($params{page}, $params{destpagea}, + $params{$param}), $scan); if ($template->query(name => $param)) { $template->param($param => IkiWiki::htmlize($params{page}, $params{destpage}, pagetype($pagesources{$params{page}}), - $params{$param})); + $value)); } if ($template->query(name => "raw_$param")) { - $template->param("raw_$param" => $params{$param}); + $template->param("raw_$param" => $value); } } - # This needs to run even in scan mode, in order to process - # links and other metadata includes via the template. - my $scan=! defined wantarray; - return IkiWiki::preprocess($params{page}, $params{destpage}, - IkiWiki::filter($params{page}, $params{destpage}, - $template->output), $scan); + IkiWiki::filter($params{page}, $params{destpage}, + $template->output), $scan); } 1 diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/teximg.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/teximg.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/teximg.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/teximg.pm 2010-02-12 12:23:49.000000000 +0100 @@ -31,6 +31,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, teximg_dvipng => { type => "boolean", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/textile.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/textile.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/textile.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/textile.pm 2010-02-12 06:37:31.000000000 +0100 @@ -19,6 +19,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/tla.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/tla.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/tla.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/tla.pm 2010-02-12 04:53:17.000000000 +0100 @@ -34,6 +34,7 @@ plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, tla_wrapper => { type => "string", diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/toc.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/toc.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/toc.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/toc.pm 2010-02-12 12:23:52.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/toggle.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/toggle.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/toggle.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/toggle.pm 2010-02-12 12:23:54.000000000 +0100 @@ -20,6 +20,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/txt.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/txt.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/txt.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/txt.pm 2010-02-12 06:37:44.000000000 +0100 @@ -29,6 +29,7 @@ plugin => { safe => 1, rebuild => 1, # format plugin + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/typography.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/typography.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/typography.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/typography.pm 2010-02-12 10:00:55.000000000 +0100 @@ -9,7 +9,7 @@ sub import { hook(type => "getopt", id => "typography", call => \&getopt); hook(type => "getsetup", id => "typography", call => \&getsetup); - IkiWiki::hook(type => "sanitize", id => "typography", call => \&sanitize); + hook(type => "sanitize", id => "typography", call => \&sanitize); } sub getopt () { diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/version.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/version.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/version.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/version.pm 2010-02-12 12:23:59.000000000 +0100 @@ -17,6 +17,7 @@ plugin => { safe => 1, rebuild => undef, + section => "widget", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/websetup.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/websetup.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/websetup.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/websetup.pm 2010-02-12 10:18:26.000000000 +0100 @@ -18,6 +18,7 @@ plugin => { safe => 1, rebuild => 0, + section => "web", }, websetup_force_plugins => { type => "string", @@ -66,6 +67,11 @@ while (@_) { my $key=shift; my %info=%{shift()}; + + if ($key eq 'plugin') { + %plugininfo=%info; + next; + } # skip internal settings next if defined $info{type} && $info{type} eq "internal"; @@ -78,15 +84,12 @@ # these are handled specially, so don't show next if $key eq 'add_plugins' || $key eq 'disable_plugins'; - if ($key eq 'plugin') { - %plugininfo=%info; - next; - } - push @show, $key, \%info; } - my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main"; + my $section=defined $plugin + ? sprintf(gettext("%s plugin:"), $plugininfo{section}).$plugin + : "main"; my %enabledfields; my $shownfields=0; @@ -97,6 +100,16 @@ @show=(); } + my $section_fieldset; + if (defined $plugin) { + # Define the combined fieldset for the plugin's section. + # This ensures that this fieldset comes first. + $section_fieldset=sprintf(gettext("%s plugins"), $plugininfo{section}); + $form->field(name => "placeholder.$plugininfo{section}", + type => "hidden", + fieldset => $section_fieldset); + } + # show plugin toggle if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) { my $name="enable.$plugin"; @@ -137,10 +150,13 @@ my $name=defined $plugin ? $plugin.".".$key : $section.".".$key; my $value=$config{$key}; + if (! defined $value) { + $value=""; + } - if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { - $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) } @{$value} : ""), - "", ""]; # blank items for expansion + if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') { + $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) } @{$value} : "")]; + push @$value, "", "" if $info{safe}; # blank items for expansion } else { $value=Encode::encode_utf8($value); @@ -203,11 +219,11 @@ $shownfields++; } - # if no fields were shown for the plugin, drop it into the - # plugins fieldset + # if no fields were shown for the plugin, drop it into a combined + # fieldset for its section if (defined $plugin && (! $plugin_forced || $config{websetup_advanced}) && ! $shownfields) { - $form->field(name => "enable.$plugin", fieldset => "plugins"); + $form->field(name => "enable.$plugin", fieldset => $section_fieldset); } return %enabledfields; @@ -258,7 +274,6 @@ params => $cgi, fieldsets => [ [main => gettext("main")], - [plugins => gettext("plugins")] ], action => $config{cgiurl}, template => {type => 'div'}, diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/wikitext.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/wikitext.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/wikitext.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/wikitext.pm 2010-02-12 06:38:00.000000000 +0100 @@ -16,6 +16,7 @@ plugin => { safe => 0, # format plugin rebuild => undef, + section => "format", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/wmd.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/wmd.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Plugin/wmd.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Plugin/wmd.pm 2010-02-12 10:18:42.000000000 +0100 @@ -17,6 +17,8 @@ return plugin => { safe => 1, + rebuild => 0, + section => "web", }, } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Setup/Automator.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Setup/Automator.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Setup/Automator.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Setup/Automator.pm 2010-02-12 04:53:17.000000000 +0100 @@ -15,6 +15,7 @@ my ($question, $default)=@_; my $r=Term::ReadLine->new("ikiwiki"); + $r->ornaments("md,me"); $r->readline(encode_utf8($question)." ", $default); } diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Setup/Standard.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Setup/Standard.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Setup/Standard.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Setup/Standard.pm 2010-02-12 10:09:53.000000000 +0100 @@ -90,10 +90,26 @@ # disable logging to syslog while dumping $config{syslog}=undef; + eval q{use Text::Wrap}; + die $@ if $@; + + my %section_plugins; push @ret, dumpvalues(\%setup, IkiWiki::getsetup()); foreach my $pair (IkiWiki::Setup::getsetup()) { my $plugin=$pair->[0]; my $setup=$pair->[1]; + my %s=@{$setup}; + my $section=$s{plugin}->{section}; + push @{$section_plugins{$section}}, $plugin; + if (@{$section_plugins{$section}} == 1) { + push @ret, "", "\t".("#" x 70), "\t# $section plugins", + sub { + wrap("\t# (", "\t# ", + join(", ", @{$section_plugins{$section}})).")" + }, + "\t".("#" x 70); + } + my @values=dumpvalues(\%setup, @{$setup}); if (@values) { push @ret, "", "\t# $plugin plugin", @values; @@ -111,7 +127,7 @@ "use IkiWiki::Setup::Standard {"; push @ret, "}"; - return @ret; + return map { ref $_ ? $_->() : $_ } @ret; } 1 diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki/Setup.pm ikiwiki-3.20100212ubuntu1/IkiWiki/Setup.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki/Setup.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki/Setup.pm 2010-02-12 12:28:49.000000000 +0100 @@ -77,7 +77,6 @@ sub getsetup () { # Gets all available setup data from all plugins. Returns an # ordered list of [plugin, setup] pairs. - my @ret; # disable logging to syslog while dumping, broken plugins may # whine when loaded @@ -85,27 +84,50 @@ $config{syslog}=undef; # Load all plugins, so that all setup options are available. - my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins()); - unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st + my @plugins=IkiWiki::listplugins(); foreach my $plugin (@plugins) { eval { IkiWiki::loadplugin($plugin) }; if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) { my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() }; } } - + + my %sections; foreach my $plugin (@plugins) { if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) { # use an array rather than a hash, to preserve order my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() }; next unless @s; - push @ret, [ $plugin, \@s ], + + # set default section value (note use of shared + # hashref between array and hash) + my %s=@s; + if (! exists $s{plugin} || ! $s{plugin}->{section}) { + $s{plugin}->{section}="other"; + } + + # only the selected rcs plugin is included + if ($config{rcs} && $plugin eq $config{rcs}) { + $s{plugin}->{section}="core"; + } + elsif ($s{plugin}->{section} eq "rcs") { + next; + } + + push @{$sections{$s{plugin}->{section}}}, [ $plugin, \@s ]; } } $config{syslog}=$syslog; - return @ret; + return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} } + sort { # core first, other last, otherwise alphabetical + ($b eq "core") <=> ($a eq "core") + || + ($a eq "other") <=> ($b eq "other") + || + $a cmp $b + } keys %sections; } sub dump ($) { diff -Nru ikiwiki-3.20100122ubuntu1/IkiWiki.pm ikiwiki-3.20100212ubuntu1/IkiWiki.pm --- ikiwiki-3.20100122ubuntu1/IkiWiki.pm 2010-01-10 05:02:38.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/IkiWiki.pm 2010-02-12 04:53:17.000000000 +0100 @@ -941,7 +941,12 @@ sub cgiurl (@) { my %params=@_; - return $config{cgiurl}."?". + my $cgiurl=$config{cgiurl}; + if (exists $params{cgiurl}) { + $cgiurl=$params{cgiurl}; + delete $params{cgiurl}; + } + return $cgiurl."?". join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params); } @@ -1090,6 +1095,11 @@ return "$linktext"; } +sub userpage ($) { + my $user=shift; + return length $config{userdir} ? "$config{userdir}/$user" : $user; +} + sub openiduser ($) { my $user=shift; @@ -1098,11 +1108,10 @@ my $display; if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) { - # this works in at least 2.x $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user); } else { - # this only works in 1.x + # backcompat with old version my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); $display=$oid->display; } @@ -1125,23 +1134,6 @@ return; } -sub userlink ($) { - my $user=shift; - - my $oiduser=eval { openiduser($user) }; - if (defined $oiduser) { - return "$oiduser"; - } - else { - eval q{use CGI 'escapeHTML'}; - error($@) if $@; - - return htmllink("", "", escapeHTML( - length $config{userdir} ? $config{userdir}."/".$user : $user - ), noimageinline => 1); - } -} - sub htmlize ($$$$) { my $page=shift; my $destpage=shift; @@ -2274,11 +2266,13 @@ my $user=shift; my %params=@_; + my $regexp=IkiWiki::glob2re($user); + if (! exists $params{user}) { return IkiWiki::ErrorReason->new("no user specified"); } - if (defined $params{user} && lc $params{user} eq lc $user) { + if (defined $params{user} && $params{user}=~/^$regexp$/i) { return IkiWiki::SuccessReason->new("user is $user"); } elsif (! defined $params{user}) { diff -Nru ikiwiki-3.20100122ubuntu1/ikiwiki.spec ikiwiki-3.20100212ubuntu1/ikiwiki.spec --- ikiwiki-3.20100122ubuntu1/ikiwiki.spec 2010-01-22 22:07:03.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/ikiwiki.spec 2010-02-12 22:50:17.000000000 +0100 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100122 +Version: 3.20100212 Release: 1%{?dist} Summary: A wiki compiler diff -Nru ikiwiki-3.20100122ubuntu1/plugins/rst ikiwiki-3.20100212ubuntu1/plugins/rst --- ikiwiki-3.20100122ubuntu1/plugins/rst 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/plugins/rst 2010-02-12 06:42:59.000000000 +0100 @@ -33,7 +33,7 @@ return dict((k, v) for k, v in zip(*[iter(args)]*2)) def getsetup(proxy, *kwargs): - return 'plugin', { 'safe' : 1, 'rebuild' : 1 } + return 'plugin', { 'safe' : 1, 'rebuild' : 1, 'section' : 'format' } import sys def debug(s): diff -Nru ikiwiki-3.20100122ubuntu1/po/bg.po ikiwiki-3.20100212ubuntu1/po/bg.po --- ikiwiki-3.20100122ubuntu1/po/bg.po 2010-01-22 22:04:53.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/bg.po 2010-02-12 22:48:24.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Грешка" @@ -146,35 +146,35 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -182,7 +182,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,12 +197,12 @@ msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -210,7 +210,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -246,7 +246,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -262,133 +262,133 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,116 +398,116 @@ msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Когато се използва „--rss” или „--atom” трябва да се укаже и " "местоположението на уикито посредством параметъра „--url”" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Огледала" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Огледало" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -515,19 +515,19 @@ msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "функцията „getctime” не е реализирана" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Получаване на OpenID номер" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." @@ -536,31 +536,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Акаунтът е създаден. Можете да влезете." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Грешка при създаване на акаунта." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -591,119 +599,119 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "гласуване" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Общо гласове:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -771,12 +779,12 @@ msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -784,83 +792,83 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -875,21 +883,21 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "препратката няма указани параметрите „name” или „url”" @@ -897,7 +905,7 @@ #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "препратката „%s” сочи към „%s”" @@ -907,121 +915,123 @@ msgid "failed to parse any smileys" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1095,20 +1105,20 @@ msgid "cannot read %s: %s" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1181,25 +1191,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/cs.po ikiwiki-3.20100212ubuntu1/po/cs.po --- ikiwiki-3.20100122ubuntu1/po/cs.po 2010-01-22 22:04:54.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/cs.po 2010-02-12 22:48:25.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -55,7 +55,7 @@ msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Chyba" @@ -145,32 +145,32 @@ msgid "Must specify %s" msgstr "Musíte zadat %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Nepodařilo se vytvořit S3 bucket:" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Nepodařilo se uložit soubor na S3:" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Nelze smazat soubor z S3:" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "stránka nazvaná %s již existuje" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "zakázáno proměnnou allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "chybné jméno souboru s přílohou" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "příloha nahrána" @@ -178,7 +178,7 @@ msgid "automatic index generation" msgstr "automatické vytváření indexu" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -195,12 +195,12 @@ msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "komentář musí mít obsah" @@ -208,7 +208,7 @@ msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "chybný název stránky" @@ -244,7 +244,7 @@ msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" @@ -260,127 +260,127 @@ msgid "Comments" msgstr "Komentáře" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametr %s je povinný" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "na této stránce nebyl zkopírován žádný text" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "na této stránce nebyl zkopírován žádný text s id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "odstraňuji starý náhled %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "nebyl zadán parametr template" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "nepodařilo se zpracovat" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "musíte zadat formát a text" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune selhal" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "chybějící stránka" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Stránka %s neexistuje." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "není stránkou" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" @@ -389,105 +389,105 @@ msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick není nainstalován" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "úprava stránky není povolena" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "chybí parametr pages" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "parametry %s a %s nelze použít zároveň" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "Stránka %s je zamknutá a nelze ji měnit" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Zrcadla" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Zrcadlo" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "schvalování komentářů" @@ -496,19 +496,19 @@ msgid "more" msgstr "více" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime není implementováno" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Přihlásit pomocí" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Získat OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." @@ -516,31 +516,39 @@ msgid "bad or missing template" msgstr "chybná nebo chybějící šablona" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Chyba při vytváření účtu." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Nepodařilo se odeslat email." -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Postup na resetování hesla vám byl odeslán na e-mail." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "chybné URL pro resetování hesla" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "resetování hesla bylo zamítnuto" @@ -570,40 +578,40 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -611,7 +619,7 @@ "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -619,76 +627,76 @@ "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " "stránku" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "hlasovat" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Celkem hlasů:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen není nainstalován" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "příkaz selhal" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "chybí vzorec" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "neznámý vzorec" @@ -756,12 +764,12 @@ msgid "at noon on %A" msgstr "%A o poledni" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "neplatná procentuální hodnota %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" @@ -769,81 +777,81 @@ msgid "(Diff truncated)" msgstr "(Diff oříznut)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s neexistuje" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s není souborem" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "potvrďte odstranění %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "odstraněno" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "jméno souboru nebylo změněno" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "neplatné jméno" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s již existuje" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s již na disku existuje" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "přejmenování %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Také přejmenovat podstránky a přílohy" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Najednou lze přejmenovat pouze jednu přílohu." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Vyberte přílohu, kterou chcete přejmenovat." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -858,28 +866,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "pro indexování %s je potřeba Digest::SHA1" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "hledání" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "Modul shortcut nebude pracovat bez %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "chybí parametr jméno nebo url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "zkratka %s odkazuje na %s" @@ -888,107 +896,109 @@ msgid "failed to parse any smileys" msgstr "nepodařilo se rozpoznat žádné smajlíky" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "chyba syntaktického rozboru" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "chybný průměr zvýrazněného bodu" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "chybné umístění zvýrazněného bodu" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "chybná výška" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "chybí parametr šířka (width)" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "chybná šířka" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "nepodařilo se spustit php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "nemohu najít soubor" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "neznámý formát dat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "prázdná data" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Stáhnout zdrojová data" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "zpracovávání selhalo na řádku %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "chybí parametr id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "šablona %s nebyla nalezena" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "chybí TeXový kód" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "z kódu se nepodařilo vygenerovat obrázek" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "modul" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "moduly" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "moduly" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -996,7 +1006,7 @@ "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1074,20 +1084,20 @@ msgid "cannot read %s: %s" msgstr "nemohu číst %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "nepodporovaný systém pro správu verzí: %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" @@ -1158,25 +1168,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/da.po ikiwiki-3.20100212ubuntu1/po/da.po --- ikiwiki-3.20100122ubuntu1/po/da.po 2010-01-22 22:04:55.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/da.po 2010-02-12 22:48:25.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Fejl" @@ -149,35 +149,35 @@ msgid "Must specify %s" msgstr "Skal angive %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Oprettelse af bundt i S3 mislykkedes: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Arkivering af fil i S3 mislykkedes: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "Sletning af fil fra S3 mislykkedes: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "der er allerede en side ved navn %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "vedhæftningsoplægning" @@ -185,7 +185,7 @@ msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -202,12 +202,12 @@ msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "kommentar skal have indhold" @@ -215,7 +215,7 @@ msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dårligt sidenavn" @@ -251,7 +251,7 @@ msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" @@ -267,128 +267,128 @@ msgid "Comments" msgstr "Kommentarer" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametren %s er krævet" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "ingen tekst blev kopieret i denne side" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "ingen tekst blev kopieret i denne side med id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "fjerner gammelt smugkig %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "skabelon %s ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "dannelsen mislykkedes" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "skal angive format og tekst" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "kan ikke få sider til at passe sammen: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -400,107 +400,107 @@ msgid "htmltidy failed to parse this html" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "læsning af %s mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Skal angive url til wiki med --url når --rss eller --atom anvendes" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "sideredigering er ikke tilladt" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s er låst og kan ikke redigeres" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Spejle" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spejl" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "kommentarkoderering" @@ -509,19 +509,19 @@ msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime ikke implementeret" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Log på med" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Skaf en OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Alle sider har henvisninger fra andre sider." @@ -529,32 +529,40 @@ msgid "bad or missing template" msgstr "dårlig eller manglende skabelon" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Konto korrekt oprettet. Nu kan du logge på." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Fejl ved kontooprettelse." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Afsendelse af mail mislykkedes" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "Ukorrekt adgangskodenumstillings-URL" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "adgangskodenulstilling afvist" @@ -584,12 +592,12 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -597,7 +605,7 @@ "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -605,21 +613,21 @@ "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -627,7 +635,7 @@ "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -635,75 +643,75 @@ "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "stem" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Samlede stemmer:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen ikke installeret" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "kommando fejlede" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "manglende formular" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "ukendt formular" @@ -771,12 +779,12 @@ msgid "at noon on %A" msgstr "midt på dagen %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "ugyldig procentværdi %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" @@ -784,81 +792,81 @@ msgid "(Diff truncated)" msgstr "(Diff trunkeret)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s eksisterer ikke" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s er ikke i srcdir, så kan ikke blive slettet" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s er ikke en fil" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "bekræft at %s bliver fjernet" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "fjernet" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s er ikke i srcdir, så kan ikke blive omdøbt" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "ingen ændring til filnavnet blev angivet" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "ugyldigt navn" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s eksisterer allerede" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s eksisterer allerede på disken" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "omdøb %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Omdøb også UnderSider og vedhæftninger" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Kun en vedhæftning kan blive omdøbt ad gangen." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Vælg vedhæftningen som skal omdøbes." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -873,28 +881,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "søg" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "genvejsudvidelsen vil ikke fungere uden %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "manglende navn eller url parameter" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "genvej %s viser til %s" @@ -903,109 +911,111 @@ msgid "failed to parse any smileys" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "afkodningsfejl" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "forkert featurepoint-parameter diameter" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "forkert featurepoint-parameter location" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "manglende værdier" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "forkert højdeværdi" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "manglende breddeparameter" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "forkert breddeværdi" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "php-kørsel mislykkedes" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "kan ikke finde fil" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "ukendt dataformat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "blanke data" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Direkte datanedlastning" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "afkodningsfejl på linje %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "manglende id-parameter" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "dannelsen mislykkedes:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "manglende tex-kode" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "udvidelse" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "udvidelser" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "udvidelser" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1013,7 +1023,7 @@ "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1089,20 +1099,20 @@ msgid "cannot read %s: %s" msgstr "kan ikke læse %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "revisionskontrolsystem %s ikke understøttet" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" @@ -1174,25 +1184,25 @@ msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/de.po ikiwiki-3.20100212ubuntu1/po/de.po --- ikiwiki-3.20100122ubuntu1/po/de.po 2010-01-22 22:04:55.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/de.po 2010-02-12 22:48:25.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Fehler" @@ -146,35 +146,35 @@ msgid "Must specify %s" msgstr "%s muss angegeben werden" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Konnte die Datei nicht in S3 speichern: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "Konnte die Datei nicht in S3 löschen: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "eine Seite mit dem Namen %s existiert bereits" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "durch allowed_attachements verboten" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "fehlerhafter Dateiname für Anhang" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "Anhang hochladen" @@ -182,7 +182,7 @@ msgid "automatic index generation" msgstr "automatische Index-Erstellung" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,12 +199,12 @@ msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "ein Kommentar sollte Inhalt haben" @@ -212,7 +212,7 @@ msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "fehlerhafter Seitenname" @@ -249,7 +249,7 @@ msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" @@ -265,128 +265,128 @@ msgid "Comments" msgstr "Kommentare" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "der Parameter %s wird benötigt" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "es wurde kein Text in diese Seite kopiert" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "es wurde kein Text in diese Seite mit der id %s kopiert" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "entferne alte Vorschau %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "bearbeite %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "Vorlage nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "Ablauf fehlgeschlagen" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "Format und Text müssen spezifiziert werden" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune fehlgeschlagen" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "Kann die Seiten nicht zuordnen: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,110 +398,110 @@ msgid "htmltidy failed to parse this html" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Die URL zum Wiki muss mit --url angegeben werden, wenn --rss oder --atom " "genutzt wird" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "bearbeiten der Seiten nicht erlaubt" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s ist gesperrt und kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht " "installiert" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Spiegel" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spiegel" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "Kommentar-Moderation" @@ -510,19 +510,19 @@ msgid "more" msgstr "mehr" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime ist nicht implementiert" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Anmelden mit" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Eine OpenID anfordern" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." @@ -531,33 +531,41 @@ msgid "bad or missing template" msgstr "fehlerhafte oder fehlende Vorlage" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Konto konnte nicht erstellt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "es gibt keine E-Mail Adresse, deshalb kann keine Anweisung zum Zurücksetzen " "des Passwortes zugeschickt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Es konnte keine E-Mail versandt werden" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "fehlerhafte URL zum Zurücksetzen des Passworts" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "zurücksetzen des Passworts abgelehnt" @@ -587,12 +595,12 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -600,7 +608,7 @@ "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -608,21 +616,21 @@ "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -630,7 +638,7 @@ "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -638,76 +646,76 @@ "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " "arbeiten" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "abstimmen" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Alle Stimmen:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen ist nicht installiert" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "Befehl fehlgeschlagen" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "fehlende Formel" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "unbekannte Formel" @@ -775,12 +783,12 @@ msgid "at noon on %A" msgstr "am Nachmittag des %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "unzulässiger Prozentwert %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " @@ -790,81 +798,81 @@ msgid "(Diff truncated)" msgstr "(Diff wurde gekürzt)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s existiert nicht" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s ist keine Datei" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "bestätigen Sie die Entfernung von %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "entfernt" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s ist nicht im srcdir und kann deshalb nicht umbenannt werden" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "es wurde keine Änderung des Dateinamens angegeben" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "unzulässiger Name" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s existiert bereits" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s existiert bereits auf der Festplatte" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "benenne %s um" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" @@ -879,28 +887,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "suchen" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "fehlender Name oder URL-Parameter" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "Tastenkürzel %s verweist nach %s" @@ -909,109 +917,111 @@ msgid "failed to parse any smileys" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "Auswertungsfehler" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "ungültiger featurepoint diameter" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "ungültige featurepoint location" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "fehlende Werte" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "ungültige Wert für height" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "fehlender Parameter für width" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "ungültige Wert für width" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "konnte PHP nicht ausführen" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "konnte Datei nicht finden" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "unbekanntes Datenformat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "keine Daten" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Direkter Daten-Download" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "Auswertungsfehler in Zeile %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "fehlender Parameter id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "Vorlage %s nicht gefunden" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "fehlender TeX-Code" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "Erweiterung" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "Erweiterungen" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "Erweiterungen" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1019,7 +1029,7 @@ "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1098,21 +1108,21 @@ msgid "cannot read %s: %s" msgstr "kann %s nicht lesen: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "nicht unterstütztes Versionskontrollsystem %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1188,25 +1198,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/es.po ikiwiki-3.20100212ubuntu1/po/es.po --- ikiwiki-3.20100122ubuntu1/po/es.po 2010-01-22 22:04:55.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/es.po 2010-02-12 22:48:25.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Error" @@ -151,35 +151,35 @@ msgid "Must specify %s" msgstr "Debe especificar %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Creación de directorio en S3 fallida: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "No puedo guardar el archivo en S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "No puedo borrar archivo en S3: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "ya existe una página de nombre %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "prohibido por la claúsula allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "enviado el adjunto" @@ -187,7 +187,7 @@ msgid "automatic index generation" msgstr "creación de índice automática" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -204,12 +204,12 @@ msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "Un comentario debe tener algún contenido" @@ -217,7 +217,7 @@ msgid "Anonymous" msgstr "Anónimo" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nombre de página erróneo" @@ -253,7 +253,7 @@ msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" @@ -269,128 +269,128 @@ msgid "Comments" msgstr "Comentarios" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "el parámetro %s es obligatorio" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "no se ha copiado ningún texto en esta página" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "eliminando la antigua previsualización %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "falta indicar la plantilla (template)" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "fallo en el proceso" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "se deben especificar tanto el formato como el texto" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "el programa fortune ha fallado" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "no encuentro páginas coincidentes: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -402,109 +402,109 @@ msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó " "--atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "no está permitida la modificación de páginas" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "La página %s está bloqueada y no puede modificarse" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar " "el programa /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Réplicas" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Réplica" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "aprobación de comentarios" @@ -513,19 +513,19 @@ msgid "more" msgstr "ver más" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "la funcionalidad getctime no está incluida" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Identificarse mediante " -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Consiga un identificador OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Todas las páginas están referenciadas entre sí." @@ -534,35 +534,43 @@ msgid "bad or missing template" msgstr "plantilla errónea ó no existente" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Error creando la cuenta de usuario." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "No tengo dirección de correo electrónica, así que no puedo enviar " "instrucciones para reiniciar la contraseña" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "No he podido enviar el mensaje de correo electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Las instrucciones para reiniciar la contraseña se le han enviado por correo " "electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "el url para reiniciar la contraseña es incorrecto" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "reinicio de contraseña denegado" @@ -592,118 +600,118 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Votar" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Recuento de votos:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "El complemento polygen no ha sido instalado" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "la ejecución del programa ha fallado" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "falta la fórmula" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "fórmula desconocida " @@ -771,12 +779,12 @@ msgid "at noon on %A" msgstr "el %A a media tarde" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "%s es un valor erróneo para un porcentaje" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" @@ -784,81 +792,81 @@ msgid "(Diff truncated)" msgstr "(Lista de diferencias truncada)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "borrado" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "no se ha indicado cambio alguno en el nombre del archivo" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "nombre no válido" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s ya existe" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s ya existe en el disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "cambiando de nombre %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -873,28 +881,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "se necesita la instalación de Digest::SHA1 para indexar %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "buscar" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "el complemento shortcut no funcionará si no existe la página %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "El atajo %s apunta a %s" @@ -903,113 +911,115 @@ msgid "failed to parse any smileys" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "error de análisis " -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "diámetro inválido " -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "localización errónea " -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "faltan valores" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "valor incorrecto para la altura" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "falta el parámetro que indica el ancho" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "valor incorrecto para el ancho" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "error fatal invocando el programa php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "no puedo encontrar el archivo" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "formato de datos desconocido" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "sin datos" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Enlace directo para descarga" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "error de análisis en la línea %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "falta el parámetro \"id\"" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "no he encontrado la plantilla %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "falta el código tex" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "complemento" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "complementos" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "complementos" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1027,7 @@ "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1097,20 +1107,20 @@ msgid "cannot read %s: %s" msgstr "no puedo leer el archivo %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "el sistema de control de versiones %s no está soportado" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1185,29 +1195,29 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/fr.po ikiwiki-3.20100212ubuntu1/po/fr.po --- ikiwiki-3.20100122ubuntu1/po/fr.po 2010-01-22 22:04:56.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/fr.po 2010-02-12 22:48:25.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Erreur" @@ -147,32 +147,32 @@ msgid "Must specify %s" msgstr "Vous devez spécifier %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Impossible de créer un compartiment S3 :" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Échec lors de la suppression du fichier sur S3 :" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "Il existe déjà une page nommée %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "Action interdite par allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "Envoi de la pièce jointe" @@ -180,7 +180,7 @@ msgid "automatic index generation" msgstr "Génération de l'index automatique" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,12 +197,12 @@ msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." @@ -210,7 +210,7 @@ msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "Nom de page incorrect" @@ -246,7 +246,7 @@ msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" @@ -262,127 +262,127 @@ msgid "Comments" msgstr "Commentaires" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "Le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "Aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "Suppression de l'ancienne prévisualisation %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "modèle (« template ») non indiqué" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "Échec du traitement" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "le format et le texte doivent être indiqués" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "Échec du lancement de « fortune »" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "Ce n'est pas une page." -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -394,108 +394,108 @@ msgid "htmltidy failed to parse this html" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss " "ou --atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "Modification de page interdite" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s est verrouillé et ne peut être modifié" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Miroirs" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Miroir" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "modération du commentaire" @@ -504,19 +504,19 @@ msgid "more" msgstr "lire la suite" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime n'est pas implémenté" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "S'identifier en tant que" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -524,35 +524,43 @@ msgid "bad or missing template" msgstr "Modèle de page incorrect ou manquant" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Erreur lors de la création du compte." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Aucune adresse indiquée. Impossible d'envoyer les instructions pour " "réinitialiser le mot de passe." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Impossible d'envoyer un courriel" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Vous avez reçu un message contenant les instructions pour réinitialiser le " "mot de passe" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "Adresse pour la réinitialisation du mot de passe incorrecte" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "réinitialisation du mot de passe refusée" @@ -584,12 +592,12 @@ "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -597,7 +605,7 @@ "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -605,23 +613,23 @@ "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -629,7 +637,7 @@ "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -637,76 +645,76 @@ "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " "des modifications." -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Voter" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Total des suffrages :" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen n'est pas installé" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "Échec de la commande" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "formule manquante" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "formule inconnue" @@ -774,12 +782,12 @@ msgid "at noon on %A" msgstr "%A, à midi" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "pourcentage %s illégal" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire." @@ -788,81 +796,81 @@ msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s n'existe pas" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "supprimé" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s n'est pas dans srcdir. Impossible de le renommer" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "Aucun changement dans le nom du fichier n'a été spécifié" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "Appellation interdite" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s existe déjà" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -877,28 +885,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "recherche" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "Il manque le paramètre nom ou URL." #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "Le raccourci %s pointe vers %s" @@ -907,109 +915,111 @@ msgid "failed to parse any smileys" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "Erreur d'analyse" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "Diamètre du point incorrect" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "Emplacement du point incorrect" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "Il manque des valeurs" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "Hauteur incorrecte" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "Le paramètre largeur manque" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "Largeur incorrecte" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "Échec du lancement de php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "Fichier introuvable" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "Format de données inconnu" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "Pas de données" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Téléchargement direct des données" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "Modèle de page %s introuvable" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "Échec du traitement :" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "greffon" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "Greffons" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "Greffons" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1027,7 @@ "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1094,22 +1104,22 @@ msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1184,25 +1194,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/gu.po ikiwiki-3.20100212ubuntu1/po/gu.po --- ikiwiki-3.20100122ubuntu1/po/gu.po 2010-01-22 22:04:56.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/gu.po 2010-02-12 22:48:26.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "ક્ષતિ" @@ -144,35 +144,35 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -180,7 +180,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -195,12 +195,12 @@ msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -208,7 +208,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -244,7 +244,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -260,132 +260,132 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -395,109 +395,109 @@ msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "મિરરો" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "મિરર" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -505,19 +505,19 @@ msgid "more" msgstr "વધુ" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime અમલમાં મૂકાયેલ નથી" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." @@ -526,31 +526,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "ખાતું બનાવવામાં ક્ષતિ." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -581,119 +589,119 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "મત" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "કુલ મત:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "ખોવાયેલ સૂત્ર" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "અજાણ્યું સૂત્ર" @@ -762,12 +770,12 @@ msgid "at noon on %A" msgstr "બપોરે %A પર" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -775,82 +783,82 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, fuzzy, perl-format msgid "%s is not a file" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -865,28 +873,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિકલ્પ" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "ટુંકોરસ્તો %s એ %s નો નિર્દેશ કરે છે" @@ -895,119 +903,121 @@ msgid "failed to parse any smileys" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "ઉકેલવામાં ક્ષતિ" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "ખરાબ લાક્ષણિકબિંદુ વ્યાસ" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "ખરાબ લાક્ષણિકબિંદુ સ્થિતિ" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "ખરાબ ઉંચાઇ કિંમત" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "ખોવાયેલ પહોળાઇ વિકલ્પ" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "ખરાબ પહોળાઇ કિંમત" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "php ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "ફાઇલ મળી શકી નહી" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "અજાણ્યો માહિતી પ્રકાર" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "ખાલી માહિતી" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "સીધી માહિતી ડાઉનલોડ" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 #, fuzzy msgid "missing tex code" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1081,20 +1091,20 @@ msgid "cannot read %s: %s" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1165,25 +1175,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/ikiwiki.pot ikiwiki-3.20100212ubuntu1/po/ikiwiki.pot --- ikiwiki-3.20100122ubuntu1/po/ikiwiki.pot 2010-01-22 22:04:53.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/ikiwiki.pot 2010-02-12 22:48:24.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "" @@ -144,32 +144,32 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -177,7 +177,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -192,12 +192,12 @@ msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -205,7 +205,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -241,7 +241,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -257,127 +257,127 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -386,104 +386,104 @@ msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -491,19 +491,19 @@ msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "" @@ -511,31 +511,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -565,117 +573,117 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -743,12 +751,12 @@ msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -756,81 +764,81 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -845,28 +853,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "" @@ -875,113 +883,115 @@ msgid "failed to parse any smileys" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1055,20 +1065,20 @@ msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1139,25 +1149,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "" diff -Nru ikiwiki-3.20100122ubuntu1/po/it.po ikiwiki-3.20100212ubuntu1/po/it.po --- ikiwiki-3.20100122ubuntu1/po/it.po 2010-01-22 22:04:57.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/it.po 2010-02-12 22:48:26.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -53,7 +53,7 @@ msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Errore" @@ -144,32 +144,32 @@ msgid "Must specify %s" msgstr "Occorre specificare %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Impossibile creare il contenitore S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Impossibile salvare il file sul S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Impossibile eliminare il file dal S3: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "esiste già una pagina chiamata %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "non permesso da allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "nome file dell'allegato non valido" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "carica allegato" @@ -177,7 +177,7 @@ msgid "automatic index generation" msgstr "generazione automatica dell'indice" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -194,12 +194,12 @@ msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "i commenti devono avere un contenuto" @@ -207,7 +207,7 @@ msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nome pagina non valido" @@ -243,7 +243,7 @@ msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -259,127 +259,127 @@ msgid "Comments" msgstr "Commenti" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametro %s necessario" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "nessun testo è stato copiato in questa pagina" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "nessun testo è stato copiato in questa pagina con l'id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "rimozione vecchia anteprima %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s non è una pagina modificabile" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "modifica %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "modello non specificato" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "errore nell'elaborazione" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "occorre specificare formato e testo" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "non è una pagina" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "errore nell'eseguire graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -390,107 +390,107 @@ msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "modifica della pagina non ammessa" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "parametro pagine mancante" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "i parametri %s e %s non possono essere usati insieme" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "impossibile eseguire dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s è bloccata e non può essere modificata" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Mirror" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Mirror" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "moderazione commento" @@ -499,19 +499,19 @@ msgid "more" msgstr "altro" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime non implementata" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Accedi tramite" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Ottieni un OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." @@ -519,34 +519,42 @@ msgid "bad or missing template" msgstr "modello errato o mancante" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Account creato con successo. È ora possibile effettuare l'accesso." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Errore nella creazione dell'account." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Nessun indirizzo email, impossibile inviare per email le istruzioni per " "reimpostare la password." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Impossibile spedire il messaggio" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Il messaggio con le istruzioni per reimpostare la password è stato inviato." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "url per il reset della password non corretto" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "reset della password non permesso" @@ -578,19 +586,19 @@ "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -598,21 +606,21 @@ "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -620,7 +628,7 @@ "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -628,76 +636,76 @@ "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " "modifiche" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "voto" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Voti totali:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen non è installato" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "errore nel comando" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "formula mancante" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "formula sconosciuta" @@ -765,12 +773,12 @@ msgid "at noon on %A" msgstr "%A a mezzogiorno" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "valore percentuale %s non ammesso" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " @@ -780,81 +788,81 @@ msgid "(Diff truncated)" msgstr "(Diff troncato)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s non esiste" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s non è in src, quindi non può essere eliminato" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s non è un file" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "conferma rimozione di %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "rimosso" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s non è in src, quindi non può essere rinominato" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "non è stata specificata nessuna modifica al nome del file" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "nome non valido" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s esiste già" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s già presente su disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "rinomina di %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Rinomina anche SottoPagine e allegati" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Si può rinominare un solo allegato alla volta." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Selezionare l'allegato da rinominare." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -869,28 +877,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "è necessario Digest::SHA1 per l'indice di %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "cerca" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "il plugin scorciatoia non può funzionare senza %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "parametro nome o url mancante" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "la scorciatoia %s punta a %s" @@ -899,109 +907,111 @@ msgid "failed to parse any smileys" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "errore nell'interpretazione" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "Diametro featurepoint non valido" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "Posizione featurepoint non valida" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "valori mancanti" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "valore altezza non valido" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "parametro larghezza mancante" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "valore larghezza non valido" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "impossibile eseguire php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "impossibile trovare il file" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "formato dati sconosiuto" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "nessun dato" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Scaricamento diretto dei dati" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "errore di interpretazione alla riga %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "parametro id mancante" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "modello %s non trovato" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "codice tex mancante" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" msgstr "plugin" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "plugin" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1009,7 +1019,7 @@ "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1085,20 +1095,20 @@ msgid "cannot read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "sistema di controllo di revisione %s non supportato" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "impossibile creare un repository tramite ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1170,25 +1180,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/pl.po ikiwiki-3.20100212ubuntu1/po/pl.po --- ikiwiki-3.20100122ubuntu1/po/pl.po 2010-01-22 22:04:57.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/pl.po 2010-02-12 22:48:26.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Błąd" @@ -148,35 +148,35 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -184,7 +184,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,12 +199,12 @@ msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -212,7 +212,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -248,7 +248,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -264,133 +264,133 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "Parametry \"test\" i \"then\" są wymagane" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "awaria w trakcie uruchamiania wtyczki graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -400,117 +400,117 @@ msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za " "pomocą parametru --url" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " "teraz edytowana" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Kopie lustrzane" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Kopia lustrzana" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -518,19 +518,19 @@ msgid "more" msgstr "więcej" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "niedostępna funkcja getctime" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Pobierz OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" @@ -539,31 +539,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Konto założone pomyślnie. Teraz można zalogować się." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Błąd w trakcie zakładania konta." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -594,119 +602,119 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "głosuj" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Oddane głosy:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "brakująca reguła" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "nieznana reguła" @@ -775,12 +783,12 @@ msgid "at noon on %A" msgstr "w południe w %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -788,84 +796,84 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " "teraz edytowana" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, fuzzy, perl-format msgid "%s is not a file" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "renderowanie %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -880,21 +888,21 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "brakujący parametr name lub url" @@ -902,7 +910,7 @@ #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "skrót %s wskazuje na adres %s" @@ -912,124 +920,126 @@ msgid "failed to parse any smileys" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "błąd w trakcie przetwarzania" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "nieprawidłowa średnica dla featurepoint" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "nieprawidłowe położenie dla featurepoint" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "nieprawidłowa wysokość" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "brakujący parametr width" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "nieprawidłowa szerokość" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "awaria w trakcie uruchamiania php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "nie można znaleźć pliku" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "nieznany format danych" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "brak danych" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Bezpośrednie pobieranie danych" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "awaria w trakcie przetwarzania linii %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "brakujący parametr id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 #, fuzzy msgid "missing tex code" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1103,20 +1113,20 @@ msgid "cannot read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1189,25 +1199,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/sv.po ikiwiki-3.20100212ubuntu1/po/sv.po --- ikiwiki-3.20100122ubuntu1/po/sv.po 2010-01-22 22:04:58.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/sv.po 2010-02-12 22:48:26.000000000 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Fel" @@ -145,35 +145,35 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -181,7 +181,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -196,12 +196,12 @@ msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -209,7 +209,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -245,7 +245,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -261,133 +261,133 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -397,113 +397,113 @@ msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Måste ange url till wiki med --url när --rss eller --atom används" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s är låst av %s och kan inte redigeras" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Speglar" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spegel" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -511,19 +511,19 @@ msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime inte implementerad" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Skaffa ett OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." @@ -532,31 +532,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Kontot har skapats. Du kan nu logga in." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Fel vid skapandet av konto." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -587,119 +595,119 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "röst" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Antal röster:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -767,12 +775,12 @@ msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -780,82 +788,82 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s är låst av %s och kan inte redigeras" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "ritar upp %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -870,21 +878,21 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "genväg saknar parameter för namn eller url" @@ -892,7 +900,7 @@ #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "genvägen %s pekar på %s" @@ -902,121 +910,123 @@ msgid "failed to parse any smileys" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1090,20 +1100,20 @@ msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1174,25 +1184,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff -Nru ikiwiki-3.20100122ubuntu1/po/tr.po ikiwiki-3.20100212ubuntu1/po/tr.po --- ikiwiki-3.20100122ubuntu1/po/tr.po 2010-01-22 22:04:58.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/tr.po 2010-02-12 22:48:26.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -51,7 +51,7 @@ msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Hata" @@ -141,32 +141,32 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -174,7 +174,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -189,12 +189,12 @@ msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -202,7 +202,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -238,7 +238,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -254,127 +254,127 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -383,104 +383,104 @@ msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -488,19 +488,19 @@ msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "" @@ -508,31 +508,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -562,117 +570,117 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -740,12 +748,12 @@ msgid "at noon on %A" msgstr "%A öğleyin" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -753,81 +761,81 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -842,28 +850,28 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "" @@ -872,113 +880,115 @@ msgid "failed to parse any smileys" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1052,20 +1062,20 @@ msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1136,25 +1146,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "" diff -Nru ikiwiki-3.20100122ubuntu1/po/vi.po ikiwiki-3.20100212ubuntu1/po/vi.po --- ikiwiki-3.20100122ubuntu1/po/vi.po 2010-01-22 22:04:58.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/po/vi.po 2010-02-12 22:48:27.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Lỗi" @@ -146,35 +146,35 @@ msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -182,7 +182,7 @@ msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,12 +197,12 @@ msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -210,7 +210,7 @@ msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -246,7 +246,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -262,133 +262,133 @@ msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,113 +398,113 @@ msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --" "atom »" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s bị %s khoá nên không thể sửa được" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -512,19 +512,19 @@ msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "chưa thực hiện getctime" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Lấy OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." @@ -533,31 +533,39 @@ msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Gặp lỗi khi tạo tài khoản." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -588,119 +596,119 @@ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "bỏ phiếu" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Tổng số phiếu :" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -768,12 +776,12 @@ msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -781,82 +789,82 @@ msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s bị %s khoá nên không thể sửa được" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -871,21 +879,21 @@ msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "lối tắt thiếu tên hay tham số url" @@ -893,7 +901,7 @@ #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "lối tắt %s chỉ tới %s" @@ -903,121 +911,123 @@ msgid "failed to parse any smileys" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1091,20 +1101,20 @@ msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1175,25 +1185,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" diff -Nru ikiwiki-3.20100122ubuntu1/t/pagespec_match.t ikiwiki-3.20100212ubuntu1/t/pagespec_match.t --- ikiwiki-3.20100122ubuntu1/t/pagespec_match.t 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/t/pagespec_match.t 2010-02-12 04:53:17.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 64; +use Test::More tests => 72; BEGIN { use_ok("IkiWiki"); } @@ -40,6 +40,15 @@ ok(pagespec_match("{f}oo", "{*}*"), "curly match"); ok(! pagespec_match("foo", "{*}*"), "curly !match"); +ok(pagespec_match("somepage", "user(frodo)", user => "frodo")); +ok(pagespec_match("somepage", "user(frodo)", user => "Frodo")); +ok(! pagespec_match("somepage", "user(frodo)", user => "Sam")); +ok(pagespec_match("somepage", "user(*o)", user => "Bilbo")); +ok(pagespec_match("somepage", "user(*o)", user => "frodo")); +ok(! pagespec_match("somepage", "user(*o)", user => "Sam")); +ok(pagespec_match("somepage", "user(http://*.myopenid.com/)", user => "http://foo.myopenid.com/")); +ok(pagespec_match("somepage", "user(*://*)", user => "http://foo.myopenid.com/")); + # The link and backlink stuff needs this. $config{userdir}=""; $links{foo}=[qw{bar baz}]; diff -Nru ikiwiki-3.20100122ubuntu1/underlays/basewiki/ikiwiki/pagespec/po.mdwn ikiwiki-3.20100212ubuntu1/underlays/basewiki/ikiwiki/pagespec/po.mdwn --- ikiwiki-3.20100122ubuntu1/underlays/basewiki/ikiwiki/pagespec/po.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/underlays/basewiki/ikiwiki/pagespec/po.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -14,3 +14,5 @@ Note that every non-po page is considered to be written in `po_master_language`, as specified in `ikiwiki.setup`. + +[[!meta robots="noindex, follow"]] diff -Nru ikiwiki-3.20100122ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn ikiwiki-3.20100212ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn --- ikiwiki-3.20100122ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn 2010-01-10 05:02:39.000000000 +0100 +++ ikiwiki-3.20100212ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn 2010-02-12 04:53:17.000000000 +0100 @@ -44,7 +44,8 @@ metadata, matching the specified glob. * "`user(username)`" - tests whether a modification is being made by a user with the specified username. If openid is enabled, an openid can also - be put here. + be put here. Glob patterns can be used in the username. For example, + to match all openid users, use `user(*://*)` * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the