From decf432fd53d85a81cc4e8904b1ee04d64d6ce3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 28 Aug 2010 10:02:27 -0400 Subject: Danish translation update. Closes: #594673 --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fb445a3ff..d5587bfce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low the bug and providing access to debug it. * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. * htmlscrubber: Do not scrub url anchors that contain colons. + * Danish translation update. Closes: #594673 -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 -- cgit v1.2.3 From 7ab84dcfe52a37b93e6faa49895ae963a3b5d0d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:15:49 -0400 Subject: highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. --- IkiWiki/Plugin/highlight.pm | 30 +++++++++++++++++----- debian/changelog | 2 ++ .../Highlight_extension_uses_hard_coded_paths.mdwn | 2 ++ 3 files changed, 27 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index e517ac5c0..d4ade0a7b 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -6,10 +6,6 @@ use strict; use IkiWiki 3.00; use Encode; -# locations of highlight's files -my $filetypes="/etc/highlight/filetypes.conf"; -my $langdefdir="/usr/share/highlight/langDefs"; - sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); @@ -32,9 +28,29 @@ sub getsetup () { safe => 1, rebuild => 1, }, + filetypes_conf => { + type => "string", + example => "/etc/highlight/filetypes.conf", + description => "location of highlight's filetypes.conf", + safe => 0, + rebuild => undef, + }, + langdefdir => { + type => "string", + example => "/usr/share/highlight/langDefs", + description => "location of highlight's langDefs directory", + safe => 0, + rebuild => undef, + }, } sub checkconfig () { + if (! exists $config{filetypes_conf}) { + $config{filetypes_conf}="/etc/highlight/filetypes.conf"; + } + if (! exists $config{langdefdir}) { + $config{langdefdir}="/usr/share/highlight/langDefs"; + } if (exists $config{tohighlight}) { foreach my $file (split ' ', $config{tohighlight}) { my @opts = $file=~s/^\.// ? @@ -80,7 +96,7 @@ my %highlighters; # Parse highlight's config file to get extension => language mappings. sub read_filetypes () { - open (IN, $filetypes) || error("$filetypes: $!"); + open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!"); while () { chomp; if (/^\$ext\((.*)\)=(.*)$/) { @@ -97,12 +113,12 @@ sub read_filetypes () { sub ext2langfile ($) { my $ext=shift; - my $langfile="$langdefdir/$ext.lang"; + my $langfile="$config{langdefdir}/$ext.lang"; return $langfile if exists $highlighters{$langfile}; read_filetypes() unless $filetypes_read; if (exists $ext2lang{$ext}) { - return "$langdefdir/$ext2lang{$ext}.lang"; + return "$config{langdefdir}/$ext2lang{$ext}.lang"; } # If a language only has one common extension, it will not # be listed in filetypes, so check the langfile. diff --git a/debian/changelog b/debian/changelog index d5587bfce..0d36a7352 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. * htmlscrubber: Do not scrub url anchors that contain colons. * Danish translation update. Closes: #594673 + * highlight: Make location of highlight's files configurable in setup + file to allow for nonstandard installations. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn index 1b9cb2e2d..275661fb8 100644 --- a/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn +++ b/doc/bugs/Highlight_extension_uses_hard_coded_paths.mdwn @@ -1 +1,3 @@ The [[plugins/highlight]] plugin hard codes some paths up the top of the plugin. This means that you need to edit the ikiwiki source if you have highlight installed in a non-standard location (e.g. if you have done a user-level install of the highlight package). + +> configurable now, [[done]] --[[Joey]] -- cgit v1.2.3 From 00a54d1bb7826455609645aa1d0ea66cfec3f468 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 13:37:16 -0400 Subject: finish link(.) support --- debian/changelog | 1 + doc/ikiwiki/pagespec.mdwn | 6 +++--- doc/todo/support_link__40__.__41___in_pagespec.mdwn | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0d36a7352..eba38c4d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * Danish translation update. Closes: #594673 * highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. + * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 7fabff9a4..6aec561ae 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -79,6 +79,6 @@ filenames of the pages in the wiki, so a pagespec "foo" used on page relative to the directory of the page containing the pagespec, you can use "./". For example, "./foo" on page "a/b" matches page "a/foo". -If you want to use the name of the page the pagespec is used in, you can use -a single dot. For example, `link(.)` matches all the pages linking to the -current page. +To indicate the name of the page the PageSpec is used in, you can +use a single dot. For example, `link(.)` matches all the pages +linking to the page containing the PageSpec. diff --git a/doc/todo/support_link__40__.__41___in_pagespec.mdwn b/doc/todo/support_link__40__.__41___in_pagespec.mdwn index 79809662a..653db1ff2 100644 --- a/doc/todo/support_link__40__.__41___in_pagespec.mdwn +++ b/doc/todo/support_link__40__.__41___in_pagespec.mdwn @@ -11,3 +11,11 @@ IkiWiki.pm is the best way to do it". > I implemented this suggestion in the simplest possible way, [[!taglink patch]] available [[here|http://git.oblomov.eu/ikiwiki/patch/f4a52de556436fdee00fd92ca9a3b46e876450fa]]. > An alternative approach, very similar, would be to make the empty page parameter mean current page (e.g. `link()` would mean pages linking here). The patch would be very similar. > -- GB + +>> Thanks for this, and also for your recent spam-fighting. +>> Huh, I was right about changing derel, didn't realize it would be +>> so obvious a change. :) Oh well, I managed to complicate it +>> some in optimisation pass.. ;) +>> +>> Note that your git-daemon on git.oblomov.eu seems down. +>> I pulled the patch from gitweb, [[done]] --[[Joey]] -- cgit v1.2.3 From d325f09a96ccb3d6a8740c38f4d8464810e85a95 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 14:56:13 -0400 Subject: document merging of intrigeri/po --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index eba38c4d1..53cff2970 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,13 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * highlight: Make location of highlight's files configurable in setup file to allow for nonstandard installations. * Allow "link(.)" and similar PageSpecs. Thanks, Giuseppe Bilotta. + * Run the preprocess hooks in scan mode *before* the scan hooks. + This allows the po plugin to register a scan hook that runs + last and rescans pages after all data from the first scan pass is + completed. This avoids the po plugin needing to rebuild some pages. + (intrigeri:) + * po: Fix some bugs that affected l10n.ikiwiki.info's unusual + setup. (intrigeri) -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 -- cgit v1.2.3 From 2ec5efcd6c3da2c5f28d3a064b970c49778855b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:23:22 -0400 Subject: t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. --- debian/changelog | 2 ++ t/bazaar.t | 8 ++++++++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 53cff2970..df74e35d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low (intrigeri:) * po: Fix some bugs that affected l10n.ikiwiki.info's unusual setup. (intrigeri) + * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure + bzr whoami before committing. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/t/bazaar.t b/t/bazaar.t index cd840fbe1..6e58f48f1 100755 --- a/t/bazaar.t +++ b/t/bazaar.t @@ -25,6 +25,14 @@ $config{srcdir} = "$dir/repo"; IkiWiki::loadplugins(); IkiWiki::checkconfig(); +# XXX +# This is a workaround for bzr's new requirement that bzr whoami be run +# before committing. This makes the test suite work with an unconfigured +# bzr, but ignores the need to have a properly configured bzr before +# using ikiwiki with bzr. +$ENV{HOME}=$dir; +system 'bzr whoami test@example.com'; + system "bzr init $config{srcdir}"; use CGI::Session; -- cgit v1.2.3 From 5da48a39ff4a005ff941837fc01aa791735f1275 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 15:25:33 -0400 Subject: add file package to suggests Now used by filecheck as fallback. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 049a685b0..2c35ea356 100644 --- a/debian/control +++ b/debian/control @@ -32,7 +32,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, - libfile-mimeinfo-perl, libcrypt-ssleay-perl, + libfile-mimeinfo-perl, file, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, graphviz, libnet-amazon-s3-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, -- cgit v1.2.3 From a330b1ee743f093a03ff23b2d4bff42df7def8b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 16:05:15 -0400 Subject: Avoid trying to log the user in when receiving anonymous pushes from git and a plugin like httpauth returns a login function. Just use check_canedit in nonfatal mode. --- IkiWiki/Receive.pm | 3 +-- debian/changelog | 2 ++ doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index d116049c4..14936f8cd 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,8 +95,7 @@ sub test () { if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - IkiWiki::check_canedit($page, $cgi, $session); - next; + next if IkiWiki::check_canedit($page, $cgi, $session, 1); } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { diff --git a/debian/changelog b/debian/changelog index df74e35d1..a1ef33b22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. + * Avoid trying to log the user in when receiving anonymous pushes + from git and a plugin like httpauth returns a login function. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn index 3e496fef4..91507f57a 100644 --- a/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn +++ b/doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn @@ -22,4 +22,4 @@ Analysis: So, all these calls need to avoid running the error handler functions returned by canedit hooks, and just return error -messages. +messages. [[done]] --[[Joey]] -- cgit v1.2.3 From f55c7d13966ff1cd90ddf50e05829f6bb3eda557 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 30 Aug 2010 18:32:32 -0400 Subject: httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session. --- IkiWiki/Plugin/httpauth.pm | 2 ++ debian/changelog | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index 868862f4f..cb488449d 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -84,6 +84,8 @@ sub canedit ($$$) { my $session=shift; if (! defined $cgi->remote_user() && + (! defined $session->param("name") || + ! IkiWiki::userinfo_get($session->param("name"), "regdate")) && defined $config{httpauth_pagespec} && length $config{httpauth_pagespec} && defined $config{cgiauthurl} && diff --git a/debian/changelog b/debian/changelog index a1ef33b22..44b54b123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure bzr whoami before committing. - * Avoid trying to log the user in when receiving anonymous pushes - from git and a plugin like httpauth returns a login function. + * httpauth: Avoid redirecting the user to the cgiauthurl if + they already have a login session. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 -- cgit v1.2.3 From 2ff705367b44447c2a9159d14f80880c38556ce4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 31 Aug 2010 14:30:34 -0400 Subject: releasing version 3.20100831 --- debian/changelog | 6 +- ikiwiki.spec | 2 +- po/bg.po | 52 +++++----- po/cs.po | 55 ++++++----- po/da.po | 281 +++++++++++++++++++++++++++++-------------------------- po/de.po | 55 ++++++----- po/es.po | 52 +++++----- po/fr.po | 59 ++++++------ po/gu.po | 52 +++++----- po/ikiwiki.pot | 52 +++++----- po/it.po | 55 ++++++----- po/pl.po | 52 +++++----- po/sv.po | 52 +++++----- po/tr.po | 52 +++++----- po/vi.po | 52 +++++----- 15 files changed, 477 insertions(+), 452 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 44b54b123..81bd99a71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100816) UNRELEASED; urgency=low +ikiwiki (3.20100831) unstable; urgency=low * filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. @@ -18,7 +18,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low This allows the po plugin to register a scan hook that runs last and rescans pages after all data from the first scan pass is completed. This avoids the po plugin needing to rebuild some pages. - (intrigeri:) + (intrigeri) * po: Fix some bugs that affected l10n.ikiwiki.info's unusual setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure @@ -26,7 +26,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session. - -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 + -- Joey Hess Tue, 31 Aug 2010 14:22:47 -0400 ikiwiki (3.20100815) unstable; urgency=medium diff --git a/ikiwiki.spec b/ikiwiki.spec index 9250a67cf..85d912da0 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100815 +Version: 3.20100831 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 8534c6d85..845b3f7fa 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -399,17 +399,17 @@ msgstr "приставката „linkmap”: грешка при изпълне msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -639,27 +639,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "промяна на %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -831,12 +821,12 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -869,29 +859,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -933,7 +923,12 @@ msgstr "препратката няма указани параметрите msgid "shortcut %s points to %s" msgstr "препратката „%s” сочи към „%s”" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" @@ -1121,6 +1116,11 @@ msgstr "обновяване на страницата „%s”, зависещ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "промяна на %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/cs.po b/po/cs.po index 11f1d05ed..7f1775b7d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -395,17 +395,17 @@ msgstr "nepodařilo se spustit graphviz" msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 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" @@ -625,21 +625,11 @@ msgid "" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 -#, 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:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "sestavuji %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -647,7 +637,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -820,12 +810,12 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" msgid "%s is not a file" msgstr "%s není souborem" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "potvrďte odstranění %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." @@ -857,29 +847,29 @@ msgstr "%s již existuje" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Také přejmenovat podstránky a přílohy" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Najednou lze přejmenovat pouze jednu přílohu." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Vyberte přílohu, kterou chcete přejmenovat." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -920,7 +910,12 @@ msgstr "chybí parametr jméno nebo url" msgid "shortcut %s points to %s" msgstr "zkratka %s odkazuje na %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "Modul shortcut nebude pracovat bez %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "nepodařilo se rozpoznat žádné smajlíky" @@ -1106,6 +1101,11 @@ msgstr "sestavuji %s, která závisí na %s" msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "sestavuji %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1261,6 +1261,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" + #~ msgid "You need to log in first." #~ msgstr "Nejprve se musíte přihlásit." diff --git a/po/da.po b/po/da.po index 4d289b8af..32a75ed0b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -56,7 +56,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Fejl" @@ -85,50 +85,50 @@ msgstr "indlæg" msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "færdig" @@ -167,19 +167,19 @@ msgstr "der er allerede en side ved navn %s" msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "vedhæftningsoplægning" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -196,77 +196,82 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, perl-format msgid "this comment needs %s" msgstr "denne kommentar kræver %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "moderering" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "kommentar skal have indhold" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Kommentarmoderering" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dårligt sidenavn" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -276,7 +281,7 @@ msgstr[1] "%i kommentarer" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "Kommentér" @@ -311,9 +316,9 @@ msgstr "%s er ikke en redigérbar side" msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -326,12 +331,12 @@ msgstr "skabelon %s ikke angivet" msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "beandling af skabelon mislykkedes:" @@ -344,11 +349,11 @@ msgstr "skal angive format og tekst" msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." @@ -362,23 +367,23 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:782 #, 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:731 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -387,21 +392,21 @@ msgstr "Skal angive %s når udvidelsen %s bruges" msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -426,12 +431,12 @@ msgstr "læsning af %s mislykkedes: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -504,7 +509,7 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -524,7 +529,7 @@ msgstr "kommentar kræver moderering" msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, perl-format msgid "failed to load openid module: " msgstr "indlæsning af openid-modul mislykkedes: " @@ -600,12 +605,17 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35." -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -613,7 +623,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -621,21 +631,11 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:390 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "gendanner alle sider for at korrigere meta titler" - -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 -#, perl-format -msgid "building %s" -msgstr "danner %s" - -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -643,7 +643,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -651,50 +651,50 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1199 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" @@ -815,16 +815,16 @@ msgstr "%s er ikke i srcdir, så kan ikke blive slettet" msgid "%s is not a file" msgstr "%s er ikke en fil" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "bekræft at %s bliver fjernet" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "fjernet" @@ -852,29 +852,29 @@ msgstr "%s eksisterer allerede" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Omdøb også UnderSider og vedhæftninger" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 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:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Vælg vedhæftningen som skal omdøbes." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -889,12 +889,12 @@ msgstr "afvikling af rsync_command mislykkedes: %s" msgid "rsync_command exited %d" msgstr "rsync_command sluttede (exit code) %d" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "søg" @@ -915,7 +915,12 @@ msgstr "manglende navn eller url parameter" msgid "shortcut %s points to %s" msgstr "genvej %s viser til %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "genvejsudvidelsen vil ikke fungere uden %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "afkodning af smileys mislykkedes" @@ -1009,22 +1014,22 @@ msgstr "%s udvidelser" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 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:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1032,7 +1037,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1042,7 +1047,7 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" @@ -1061,47 +1066,52 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "anmoder %s om oprettelses- og redigeringstider for fil.." -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, perl-format msgid "removing obsolete %s" msgstr "fjerner forældet %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "danner %s" + +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1118,7 +1128,7 @@ msgstr "kan ikke læse %s: %s" msgid "cannot load %s in safe mode" msgstr "kan ikke læse %s i sikker tilstand" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, perl-format msgid "failed to parse %s" msgstr "afkodning af %s mislykkedes" @@ -1141,27 +1151,31 @@ msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "bygger wrappers.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s ser ikke ud til at kunne afvikles" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1174,23 +1188,19 @@ msgstr "brug: ikiwiki [valg] kilde mål" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "brug: --set-yaml var=værdi" -#: ../ikiwiki.in:157 -msgid "generating wrappers.." -msgstr "bygger wrappers.." - -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1198,40 +1208,40 @@ msgstr "genopfrisker wiki..." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2130 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1255,3 +1265,6 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" #: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" + +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "gendanner alle sider for at korrigere meta titler" diff --git a/po/de.po b/po/de.po index dc3f447f5..586788bb1 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -397,17 +397,17 @@ msgstr "graphviz konnte nicht ausgeführt werden" msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -637,21 +637,11 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 -#, 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:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "erzeuge %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -659,7 +649,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -834,12 +824,12 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden" msgid "%s is not a file" msgstr "%s ist keine Datei" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "bestätigen Sie die Entfernung von %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." @@ -871,29 +861,29 @@ msgstr "%s existiert bereits" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" @@ -934,7 +924,12 @@ msgstr "fehlender Name oder URL-Parameter" msgid "shortcut %s points to %s" msgstr "Tastenkürzel %s verweist nach %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "Smileys konnten nicht ausgewertet werden" @@ -1123,6 +1118,11 @@ msgstr "erzeuge %s, die von %s abhängt" msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "erzeuge %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1284,6 +1284,9 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" + #~ msgid "You need to log in first." #~ msgstr "Sie müssen sich zuerst anmelden." diff --git a/po/es.po b/po/es.po index c7ec94678..dfdacf764 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -405,17 +405,17 @@ msgstr "no he podido ejecutar el programa graphviz " msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -645,27 +645,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "Informaremos a %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -835,12 +825,12 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." @@ -872,29 +862,29 @@ msgstr "%s ya existe" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -935,7 +925,12 @@ msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'" msgid "shortcut %s points to %s" msgstr "El atajo %s apunta a %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "el complemento shortcut no funcionará si no existe la página %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "Algunos emoticonos tienen errores" @@ -1129,6 +1124,11 @@ msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "Informaremos a %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/fr.po b/po/fr.po index e961ba0fa..221bff436 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2010-07-17 18:13+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -396,17 +396,17 @@ msgstr "Échec du lancement de graphviz" msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -638,23 +638,11 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:414 -#, 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:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "construction de %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -662,7 +650,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -837,12 +825,12 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" @@ -874,29 +862,29 @@ msgstr "%s existe déjà" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -937,7 +925,12 @@ msgstr "Il manque le paramètre nom ou URL." msgid "shortcut %s points to %s" msgstr "Le raccourci %s pointe vers %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "Aucun smiley n'a pu être analysé" @@ -1124,6 +1117,11 @@ msgstr "Reconstruction de %s, qui dépend de %s" msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "construction de %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1285,6 +1283,11 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "" +#~ "Reconstruction de toutes les pages pour corriger les titres (greffon " +#~ "« meta »)." + #~ msgid "You need to log in first." #~ msgstr "Vous devez d'abord vous identifier." diff --git a/po/gu.po b/po/gu.po index fbeea1492..baa8c8ee0 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -396,17 +396,17 @@ msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -629,27 +629,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "%s સુધારે છે" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -821,12 +811,12 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "%s is not a file" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -859,29 +849,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -922,7 +912,12 @@ msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિ msgid "shortcut %s points to %s" msgstr "ટુંકોરસ્તો %s એ %s નો નિર્દેશ કરે છે" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" @@ -1108,6 +1103,11 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "%s સુધારે છે" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index a8226f402..62f2792e4 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-15 11:48-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -389,17 +389,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -614,27 +614,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -803,12 +793,12 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -840,29 +830,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -903,7 +893,12 @@ msgstr "" msgid "shortcut %s points to %s" msgstr "" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "" @@ -1083,6 +1078,11 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/it.po b/po/it.po index 3fda6d221..e120681c4 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -394,17 +394,17 @@ msgstr "errore nell'eseguire graphviz" msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -634,21 +634,11 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:414 -#, 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:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "compilazione di %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -656,7 +646,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -831,12 +821,12 @@ msgstr "%s non è in src, quindi non può essere eliminato" msgid "%s is not a file" msgstr "%s non è un file" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "conferma rimozione di %s" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." @@ -868,29 +858,29 @@ msgstr "%s esiste già" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "Rinomina anche SottoPagine e allegati" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "Si può rinominare un solo allegato alla volta." -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "Selezionare l'allegato da rinominare." -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -931,7 +921,12 @@ msgstr "parametro nome o url mancante" msgid "shortcut %s points to %s" msgstr "la scorciatoia %s punta a %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, fuzzy, perl-format +msgid "smiley plugin will not work without %s" +msgstr "il plugin scorciatoia non può funzionare senza %s" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "impossibile interpretare gli smile" @@ -1117,6 +1112,11 @@ msgstr "compilazione di %s, che dipende da %s" msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "compilazione di %s" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" @@ -1273,6 +1273,9 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#~ msgid "rebuilding all pages to fix meta titles" +#~ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" + #~ msgid "You need to log in first." #~ msgstr "Occorre prima effettuare l'accesso." diff --git a/po/pl.po b/po/pl.po index e93753abd..f02444224 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -401,17 +401,17 @@ msgstr "awaria w trakcie uruchamiania wtyczki graphviz" msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -642,27 +642,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "edycja %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -836,12 +826,12 @@ msgstr "" msgid "%s is not a file" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -874,29 +864,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -938,7 +928,12 @@ msgstr "brakujący parametr name lub url" msgid "shortcut %s points to %s" msgstr "skrót %s wskazuje na adres %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "awaria w trakcie przetwarzania emitoikonki" @@ -1129,6 +1124,11 @@ msgstr "renderowanie %s zależącego od %s" msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "edycja %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/sv.po b/po/sv.po index fee2693e2..d8c2cd70b 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -398,17 +398,17 @@ msgstr "linkmap misslyckades att köra dot" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -635,27 +635,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "redigerar %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -826,12 +816,12 @@ msgstr "%s är låst av %s och kan inte redigeras" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -864,29 +854,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -928,7 +918,12 @@ msgstr "genväg saknar parameter för namn eller url" msgid "shortcut %s points to %s" msgstr "genvägen %s pekar på %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy msgid "failed to parse any smileys" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" @@ -1116,6 +1111,11 @@ msgstr "ritar upp %s, vilken är beroende av %s" msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "redigerar %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/tr.po b/po/tr.po index e1c5f03b5..91dca8739 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -385,17 +385,17 @@ msgstr "" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -610,27 +610,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, perl-format -msgid "building %s" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -799,12 +789,12 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -836,29 +826,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -899,7 +889,12 @@ msgstr "" msgid "shortcut %s points to %s" msgstr "" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" msgstr "" @@ -1079,6 +1074,11 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" +#: ../IkiWiki/Render.pm:784 +#, perl-format +msgid "building %s" +msgstr "" + #: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" diff --git a/po/vi.po b/po/vi.po index b22f16418..aa0503f46 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-04 09:22-0400\n" +"POT-Creation-Date: 2010-08-30 19:46-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -398,17 +398,17 @@ msgstr "linkmap không chạy dot được" msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:48 +#: ../IkiWiki/Plugin/highlight.pm:64 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:59 +#: ../IkiWiki/Plugin/highlight.pm:75 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:124 +#: ../IkiWiki/Plugin/highlight.pm:140 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -635,27 +635,17 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:414 -#, perl-format -msgid "rebuilding all pages to fix meta titles" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 -#, fuzzy, perl-format -msgid "building %s" -msgstr "đang sửa %s" - -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:444 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:467 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:499 +#: ../IkiWiki/Plugin/po.pm:487 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -826,12 +816,12 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:137 +#: ../IkiWiki/Plugin/remove.pm:136 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:174 +#: ../IkiWiki/Plugin/remove.pm:173 msgid "Please select the attachments to remove." msgstr "" @@ -864,29 +854,29 @@ msgstr "" 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:163 +#: ../IkiWiki/Plugin/rename.pm:164 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:253 +#: ../IkiWiki/Plugin/rename.pm:254 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:352 +#: ../IkiWiki/Plugin/rename.pm:353 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:577 +#: ../IkiWiki/Plugin/rename.pm:578 #, 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" @@ -928,7 +918,12 @@ msgstr "lối tắt thiếu tên hay tham số url" msgid "shortcut %s points to %s" msgstr "lối tắt %s chỉ tới %s" -#: ../IkiWiki/Plugin/smiley.pm:43 +#: ../IkiWiki/Plugin/smiley.pm:30 +#, perl-format +msgid "smiley plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:50 #, fuzzy 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" @@ -1116,6 +1111,11 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s" msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" +#: ../IkiWiki/Render.pm:784 +#, fuzzy, perl-format +msgid "building %s" +msgstr "đang sửa %s" + #: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" -- cgit v1.2.3 From 8a6f4a7e50c247c061fd74b535d0f292aca6bda7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 12:08:59 -0400 Subject: needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.) --- IkiWiki/Plugin/aggregate.pm | 2 ++ IkiWiki/Plugin/calendar.pm | 1 + IkiWiki/Plugin/edittemplate.pm | 2 ++ IkiWiki/Plugin/listdirectives.pm | 2 ++ IkiWiki/Plugin/meta.pm | 1 + IkiWiki/Plugin/pinger.pm | 1 + IkiWiki/Plugin/po.pm | 2 ++ IkiWiki/Plugin/skeleton.pm.example | 4 ++++ IkiWiki/Plugin/theme.pm | 1 + IkiWiki/Plugin/version.pm | 1 + IkiWiki/Render.pm | 5 ++++- debian/changelog | 8 ++++++++ doc/plugins/write.mdwn | 4 ++-- 13 files changed, 31 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 7789c4c2a..fe53d868d 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -210,6 +210,8 @@ sub needsbuild (@) { markunseen($feed->{sourcepage}); } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index bb995d499..c7d2b7c01 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -491,6 +491,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } 1 diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 226f83bb4..4f07866e4 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -41,6 +41,8 @@ sub needsbuild (@) { } } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/listdirectives.pm b/IkiWiki/Plugin/listdirectives.pm index 8a67f7160..835e25388 100644 --- a/IkiWiki/Plugin/listdirectives.pm +++ b/IkiWiki/Plugin/listdirectives.pm @@ -64,6 +64,8 @@ sub needsbuild (@) { } } } + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index d18585d3d..5941e3f3f 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -37,6 +37,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub scrub ($$) { diff --git a/IkiWiki/Plugin/pinger.pm b/IkiWiki/Plugin/pinger.pm index c20ecb5d4..cc9f52d2b 100644 --- a/IkiWiki/Plugin/pinger.pm +++ b/IkiWiki/Plugin/pinger.pm @@ -45,6 +45,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index f3530faf3..7b62092e1 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -221,6 +221,8 @@ sub needsbuild () { foreach my $master (keys %translations) { map add_depends($_, $master), values %{otherlanguages_pages($master)}; } + + return $needsbuild; } sub scan (@) { diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index 341d67867..7974d5e53 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -73,7 +73,11 @@ sub refresh () { } sub needsbuild ($) { + my $needsbuild=shift; + debug("skeleton plugin needsbuild"); + + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Plugin/theme.pm b/IkiWiki/Plugin/theme.pm index 03b0816ed..ee94547e9 100644 --- a/IkiWiki/Plugin/theme.pm +++ b/IkiWiki/Plugin/theme.pm @@ -60,6 +60,7 @@ sub needsbuild ($) { $wikistate{theme}{currenttheme}=$config{theme}; } + return $needsbuild; } 1 diff --git a/IkiWiki/Plugin/version.pm b/IkiWiki/Plugin/version.pm index c13643478..fc265526c 100644 --- a/IkiWiki/Plugin/version.pm +++ b/IkiWiki/Plugin/version.pm @@ -37,6 +37,7 @@ sub needsbuild (@) { } } } + return $needsbuild; } sub preprocess (@) { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 9921915b4..0dbe9611a 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -759,7 +759,10 @@ sub refresh () { my ($new, $internal_new)=find_new_files($files); my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); - run_hooks(needsbuild => sub { shift->($changed) }); + run_hooks(needsbuild => sub { + my $ret=shift->($changed); + $changed=$ret if ref $ret eq 'ARRAY'; + }); my $oldlink_targets=calculate_old_links($changed, $del); foreach my $file (@$changed) { diff --git a/debian/changelog b/debian/changelog index 81bd99a71..430bd302c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20100832) UNRELEASED; urgency=low + + * needsbuild hook interface changed; the hooks should now return + the modified array of things that need built. (Backwards compatability + code keeps plugins using the old interface working.) + + -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 + ikiwiki (3.20100831) unstable; urgency=low * filecheck: Fall back to using the file command if the freedesktop diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 10b4df835..31bb64e68 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -179,8 +179,8 @@ function is passed no values. This allows a plugin to manipulate the list of files that need to be built when the wiki is refreshed. The function is passed a reference to an -array of files that will be rebuilt, and can modify the array, either -adding or removing files from it. +array of files that will be rebuilt. It should return an array reference +that is a modified version of its input. It can add or remove files from it. ### scan -- cgit v1.2.3 From 5c6c0813ca8dff8c42ac32ed9702568228f8407b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Sep 2010 13:47:50 -0400 Subject: Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. --- debian/changelog | 2 ++ doc/bugs/ikiwiki_ignores_PATH_environment.mdwn | 9 +++++++++ ikiwiki.in | 3 --- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 430bd302c..a9892938a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * needsbuild hook interface changed; the hooks should now return the modified array of things that need built. (Backwards compatability code keeps plugins using the old interface working.) + * Remove PATH overriding code in ikiwiki script that was present to make + perl taint checking happy, but taint checking is disabled. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn index 63ac4bc31..5097acaef 100644 --- a/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn +++ b/doc/bugs/ikiwiki_ignores_PATH_environment.mdwn @@ -7,3 +7,12 @@ This makes it a little hard to specify which specific binaries should be used, e $ENV{PATH}="$ENV{PATH}:/usr/local/bin:/usr/bin:/bin:/opt/local/bin"; ? The alternative is of course to patch ikiwiki as suggested in the bug, but I wanted to ask here first :) + +> You can use the ENV setting in your setup file to set any environment +> variables you like. Since ikiwiki.cgi is run by the web browser, that +> is the best way to ensure ikiwiki always runs with a given variable set. +> +> As a suid program, the ikiwiki wrappers have to sanitize the environment. +> The ikiwiki script's own sanitization of PATH was done to make perl taint +> checking happy, but as taint checking is disabled anyway, I have removed +> that. [[done]] --[[Joey]] diff --git a/ikiwiki.in b/ikiwiki.in index bcda2469b..339efd37c 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -1,7 +1,4 @@ #!/usr/bin/perl -$ENV{PATH}="/usr/local/bin:/usr/bin:/bin"; -delete @ENV{qw{IFS CDPATH ENV BASH_ENV}}; - package IkiWiki; use warnings; -- cgit v1.2.3 From 074c9869f3223387e636d1bcea8276c49ef12fda Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 9 Sep 2010 18:23:31 -0400 Subject: changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a9892938a..a89485f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low code keeps plugins using the old interface working.) * Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. + * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 + Thanks, Paul Menzel. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3 From 400aabe82d3d763ee700993c10985c8fb007c7b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 11:45:59 -0400 Subject: po: Allow enabling via web setup. The only unsafe thing should be that enabling it with some languages will generate po files. --- IkiWiki/Plugin/po.pm | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 7b62092e1..651c98ed7 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -89,7 +89,7 @@ sub import { sub getsetup () { return plugin => { - safe => 0, + safe => 1, rebuild => 1, # format plugin section => "format", }, @@ -110,7 +110,7 @@ sub getsetup () { 'es|Español', 'de|Deutsch' ], - description => "slave languages (PO files)", + description => "slave languages (translated via PO files) format: ll|Langname", safe => 1, rebuild => 1, }, diff --git a/debian/changelog b/debian/changelog index a89485f79..ebccf4698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low perl taint checking happy, but taint checking is disabled. * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 Thanks, Paul Menzel. + * po: Allow enabling via web setup. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3 From fbfda5ccfce40d3f0b5a6076ef02f07e9e5b8fd6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 13:13:00 -0400 Subject: po: Make the po_master_language use a langpair like "en|English", so it can be configured via the web. --- IkiWiki/Plugin/po.pm | 81 ++++++++++++++++++++++++++++++++-------------------- debian/changelog | 2 ++ doc/plugins/po.mdwn | 2 +- 3 files changed, 53 insertions(+), 32 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 651c98ed7..a233fb5af 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -25,6 +25,7 @@ use File::Temp; use Memoize; use UNIVERSAL; +my ($master_language_code, $master_language_name); my %translations; my @origneedsbuild; my %origsubs; @@ -95,10 +96,7 @@ sub getsetup () { }, po_master_language => { type => "string", - example => { - 'code' => 'en', - 'name' => 'English' - }, + example => "en|English", description => "master language (non-PO files)", safe => 1, rebuild => 1, @@ -132,24 +130,31 @@ sub getsetup () { } sub checkconfig () { - foreach my $field (qw{po_master_language}) { - if (! exists $config{$field} || ! defined $config{$field}) { - error(sprintf(gettext("Must specify %s when using the %s plugin"), - $field, 'po')); + if (exists $config{po_master_language}) { + if (! ref $config{po_master_language}) { + ($master_language_code, $master_language_name)= + splitlangpair($config{po_master_language}); } + else { + $master_language_code=$config{po_master_language}{code}; + $master_language_name=$config{po_master_language}{name}; + } + } + if (! defined $master_language_code) { + $master_language_code='en'; + } + if (! defined $master_language_name) { + $master_language_name='English'; } if (ref $config{po_slave_languages} eq 'ARRAY') { my %slaves; foreach my $pair (@{$config{po_slave_languages}}) { - my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ ); - if (!defined $code || !defined $name) { - error(sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), - $pair)); + my ($code, $name)=splitlangpair($pair); + if (defined $code) { + push @slavelanguages, $code; + $slaves{$code} = $name; } - $slaves{$code} = $name; - push @slavelanguages, $code; - } $config{po_slave_languages} = \%slaves; } @@ -159,12 +164,12 @@ sub checkconfig () { } keys %{$config{po_slave_languages}}; } - delete $config{po_slave_languages}{$config{po_master_language}{code}};; + delete $config{po_slave_languages}{$master_language_code}; map { islanguagecode($_) or error(sprintf(gettext("%s is not a valid language code"), $_)); - } ($config{po_master_language}{code}, @slavelanguages); + } ($master_language_code, @slavelanguages); if (! exists $config{po_translatable_pages} || ! defined $config{po_translatable_pages}) { @@ -198,11 +203,11 @@ sub checkconfig () { if -d "$config{underlaydirbase}/po/$ll/$underlay"; } - if ($config{po_master_language}{code} ne 'en') { + if ($master_language_code ne 'en') { # Add underlay containing translated source files # for the master language. - add_underlay("locale/$config{po_master_language}{code}/$underlay") - if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay"; + add_underlay("locale/$master_language_code/$underlay") + if -d "$config{underlaydirbase}/locale/$master_language_code/$underlay"; } } } @@ -512,7 +517,7 @@ sub formbuilder_setup (@) { if ($form->field("do") eq "create") { # Warn the user: new pages must be written in master language. my $template=template("pocreatepage.tmpl"); - $template->param(LANG => $config{po_master_language}{name}); + $template->param(LANG => $master_language_name); $form->tmpl_param(message => $template->output); } elsif ($form->field("do") eq "edit") { @@ -601,7 +606,7 @@ sub mybeautify_urlpath ($) { my $res=$origsubs{'beautify_urlpath'}->($url); if (defined $config{po_link_to} && $config{po_link_to} eq "negotiated") { - $res =~ s!/\Qindex.$config{po_master_language}{code}.$config{htmlext}\E$!/!; + $res =~ s!/\Qindex.$master_language_code.$config{htmlext}\E$!/!; $res =~ s!/\Qindex.$config{htmlext}\E$!/!; map { $res =~ s!/\Qindex.$_.$config{htmlext}\E$!/!; @@ -824,7 +829,7 @@ sub lang ($) { if (1 < (my ($masterpage, $lang) = _istranslation($page))) { return $lang; } - return $config{po_master_language}{code}; + return $master_language_code; } sub islanguagecode ($) { @@ -837,7 +842,7 @@ sub otherlanguage_page ($$) { my $page=shift; my $code=shift; - return masterpage($page) if $code eq $config{po_master_language}{code}; + return masterpage($page) if $code eq $master_language_code; return masterpage($page) . '.' . $code; } @@ -851,9 +856,9 @@ sub otherlanguages_codes ($) { return \@ret unless istranslation($page) || istranslatable($page); my $curlang=lang($page); foreach my $lang - ($config{po_master_language}{code}, @slavelanguages) { + ($master_language_code, @slavelanguages) { next if $lang eq $curlang; - if ($lang eq $config{po_master_language}{code} || + if ($lang eq $master_language_code || istranslatedto(masterpage($page), $lang)) { push @ret, $lang; } @@ -1008,8 +1013,8 @@ sub percenttranslated ($) { sub languagename ($) { my $code=shift; - return $config{po_master_language}{name} - if $code eq $config{po_master_language}{code}; + return $master_language_name + if $code eq $master_language_code; return $config{po_slave_languages}{$code} if defined $config{po_slave_languages}{$code}; return; @@ -1022,13 +1027,13 @@ sub otherlanguagesloop ($) { if (istranslation($page)) { push @ret, { url => urlto_with_orig_beautiful_urlpath(masterpage($page), $page), - code => $config{po_master_language}{code}, - language => $config{po_master_language}{name}, + code => $master_language_code, + language => $master_language_name, master => 1, }; } foreach my $lang (@{otherlanguages_codes($page)}) { - next if $lang eq $config{po_master_language}{code}; + next if $lang eq $master_language_code; my $otherpage = otherlanguage_page($page, $lang); push @ret, { url => urlto_with_orig_beautiful_urlpath($otherpage, $page), @@ -1233,6 +1238,20 @@ sub po4a_options($) { return %options; } +sub splitlangpair ($) { + my $pair=shift; + + my ($code, $name) = ( $pair =~ /^([a-z]{2})\|(.+)$/ ); + if (! defined $code || ! defined $name || + ! length $code || ! length $name) { + # not a fatal error to avoid breaking if used with web setup + print STDERR sprintf(gettext("%s has invalid syntax: must use CODE|NAME"), + $pair)."\n"; + } + + return $code, $name; +} + # ,---- # | PageSpecs # `---- diff --git a/debian/changelog b/debian/changelog index ebccf4698..72b220a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low perl taint checking happy, but taint checking is disabled. * teximg: Use Unicode UTF-8 encoding by default. Closes: #596067 Thanks, Paul Menzel. + * po: Make the po_master_language use a langpair like "en|English", + so it can be configured via the web. * po: Allow enabling via web setup. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index da58a9f49..2acbc366a 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -49,7 +49,7 @@ Supported languages `po_master_language` is used to set the "master" language in `ikiwiki.setup`, such as: - po_master_language => { 'code' => 'en', 'name' => 'English' } + po_master_language => 'en|English' `po_slave_languages` is used to set the list of supported "slave" languages, such as: -- cgit v1.2.3 From 23f88690092f4434335f0ae4df90fafbf58100eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 14:04:43 -0400 Subject: po: Auto-upgrade old format settings to new formats when writing setup file. --- IkiWiki/Plugin/po.pm | 27 +++++++++++++++++++-------- debian/changelog | 2 ++ 2 files changed, 21 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index a233fb5af..d920d3648 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -30,6 +30,7 @@ my %translations; my @origneedsbuild; my %origsubs; my @slavelanguages; # language codes ordered as in config po_slave_languages +my %slavelanguages; # language code to name lookup memoize("istranslatable"); memoize("_istranslation"); @@ -138,6 +139,7 @@ sub checkconfig () { else { $master_language_code=$config{po_master_language}{code}; $master_language_name=$config{po_master_language}{name}; + $config{po_master_language}=joinlangpair($master_language_code, $master_language_name); } } if (! defined $master_language_code) { @@ -148,23 +150,25 @@ sub checkconfig () { } if (ref $config{po_slave_languages} eq 'ARRAY') { - my %slaves; foreach my $pair (@{$config{po_slave_languages}}) { my ($code, $name)=splitlangpair($pair); if (defined $code) { push @slavelanguages, $code; - $slaves{$code} = $name; + $slavelanguages{$code} = $name; } } - $config{po_slave_languages} = \%slaves; } elsif (ref $config{po_slave_languages} eq 'HASH') { + %slavelanguages=%{$config{po_slave_languages}}; @slavelanguages = sort { $config{po_slave_languages}->{$a} cmp $config{po_slave_languages}->{$b}; - } keys %{$config{po_slave_languages}}; + } keys %slavelanguages; + $config{po_slave_languages}=[ + map { joinlangpair($_, $slavelanguages{$_}) } @slavelanguages + ] } - delete $config{po_slave_languages}{$master_language_code}; + delete $slavelanguages{$master_language_code}; map { islanguagecode($_) @@ -797,7 +801,7 @@ sub _istranslation ($) { return 0 unless defined $masterpage && defined $lang && length $masterpage && length $lang && defined $pagesources{$masterpage} - && defined $config{po_slave_languages}{$lang}; + && defined $slavelanguages{$lang}; return (maybe_add_leading_slash($masterpage, $hasleadingslash), $lang) if istranslatable($masterpage); @@ -1015,8 +1019,8 @@ sub languagename ($) { return $master_language_name if $code eq $master_language_code; - return $config{po_slave_languages}{$code} - if defined $config{po_slave_languages}{$code}; + return $slavelanguages{$code} + if defined $slavelanguages{$code}; return; } @@ -1252,6 +1256,13 @@ sub splitlangpair ($) { return $code, $name; } +sub joinlangpair ($$) { + my $code=shift; + my $name=shift; + + return "$code|$name"; +} + # ,---- # | PageSpecs # `---- diff --git a/debian/changelog b/debian/changelog index 72b220a4f..4b61a12b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * po: Make the po_master_language use a langpair like "en|English", so it can be configured via the web. * po: Allow enabling via web setup. + * po: Auto-upgrade old format settings to new formats when writing + setup file. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 -- cgit v1.2.3 From c4ebdd6f467f3361b1f444d9462e10acdbcf9322 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 10 Sep 2010 17:17:08 -0400 Subject: Pass array of names of files that have been deleted to needsbuild hook as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. --- IkiWiki/Plugin/inline.pm | 5 +++-- IkiWiki/Render.pm | 2 +- debian/changelog | 3 +++ doc/plugins/write.mdwn | 13 +++++++++---- 4 files changed, 16 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 715a3d652..20c5f3bdd 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -570,9 +570,9 @@ sub genfeed ($$$$$@) { } } + my $file=$pagesources{$p}; + my $type=pagetype($file); if ($itemtemplate->query(name => "enclosure")) { - my $file=$pagesources{$p}; - my $type=pagetype($file); if (defined $type) { $itemtemplate->param(content => $pcontent); } @@ -591,6 +591,7 @@ sub genfeed ($$$$$@) { } } else { + next unless defined $type; $itemtemplate->param(content => $pcontent); } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0dbe9611a..7ea919abc 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -760,7 +760,7 @@ sub refresh () { my ($del, $internal_del)=find_del_files($pages); my ($changed, $internal_changed)=find_changed($files); run_hooks(needsbuild => sub { - my $ret=shift->($changed); + my $ret=shift->($changed, [@$del, @$internal_del]); $changed=$ret if ref $ret eq 'ARRAY'; }); my $oldlink_targets=calculate_old_links($changed, $del); diff --git a/debian/changelog b/debian/changelog index 4b61a12b0..bf294b6d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * po: Allow enabling via web setup. * po: Auto-upgrade old format settings to new formats when writing setup file. + * Pass array of names of files that have been deleted to needsbuild hook + as second parameter, to allow for plugins that needs access to this + information earlier than the delete hook. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 31bb64e68..e60314485 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -177,10 +177,15 @@ function is passed no values. hook(type => "needsbuild", id => "foo", call => \&needsbuild); -This allows a plugin to manipulate the list of files that need to be -built when the wiki is refreshed. The function is passed a reference to an -array of files that will be rebuilt. It should return an array reference -that is a modified version of its input. It can add or remove files from it. +This allows a plugin to observe or even manipulate the list of files that +need to be built when the wiki is refreshed. + +As its first parameter, the function is passed a reference to an array of +files that will be built. It should return an array reference that is a +modified version of its input. It can add or remove files from it. + +The second parameter passed to the function is a reference to an array of +files that have been deleted. ### scan -- cgit v1.2.3 From 41a10eb0b055467b2677295442480e40dfe3d277 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 14:31:34 -0400 Subject: actiontabs: Improve tab padding. --- debian/changelog | 1 + themes/actiontabs/style.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bf294b6d4..7138824f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * Pass array of names of files that have been deleted to needsbuild hook as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. + * actiontabs: Improve tab padding. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css index c5925cedd..13e9dc1a4 100644 --- a/themes/actiontabs/style.css +++ b/themes/actiontabs/style.css @@ -69,11 +69,11 @@ body { .pageheader .actions { position: absolute; - bottom: 5px; + bottom: 0; right: 2em; width: 100%; text-align: right; - padding: 0; + padding: 2px; } #content, #comments, #footer { -- cgit v1.2.3 From b5be85a611f83dd97f1f40daaf294b31d975b4a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Sep 2010 14:40:56 -0400 Subject: blueview: Fix display of links to translated pages in the page header. --- debian/changelog | 1 + themes/blueview/style.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7138824f9..3428aa6d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low as second parameter, to allow for plugins that needs access to this information earlier than the delete hook. * actiontabs: Improve tab padding. + * blueview: Fix display of links to translated pages in the page header. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/themes/blueview/style.css b/themes/blueview/style.css index 540cac415..c07d1cdfa 100644 --- a/themes/blueview/style.css +++ b/themes/blueview/style.css @@ -197,14 +197,14 @@ body { font-weight: bold; } -.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span { +.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li { padding: 0.25em 0.25em 0.25em 0.25em; background-image: url('background_darkness.png'); background-repeat: repeat; color: white; } -.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { +.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a { color: white; text-decoration: none; } -- cgit v1.2.3 From 894d09ba9482dd53448986f487ca0f372083fee4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 12:40:40 -0400 Subject: Set isPermaLink="no" for guids in rss feeds. The rss spec says that unless the attribute is set, guid elements *are* permalinks. The problem with that is that if [[meta permalink=]] is used, as is done with aggregated posts, that goes into the link element, and apparently some rss readers prefer the not-really-permalink in the guid element when linking to the post. Without meta permalink, the link and guid elements have the same content, so it should be ok, in that case too for the guid to not be a permalink. (Checked and this does not flood aggregators.) --- debian/changelog | 1 + templates/rssitem.tmpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3428aa6d3..8b127b574 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low information earlier than the delete hook. * actiontabs: Improve tab padding. * blueview: Fix display of links to translated pages in the page header. + * Set isPermaLink="no" for guids in rss feeds. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl index a64a4ebd7..272b340bb 100644 --- a/templates/rssitem.tmpl +++ b/templates/rssitem.tmpl @@ -8,7 +8,7 @@ - + -- cgit v1.2.3 From e0898ae1a8e64a12c4e47b3f922d6cf1fad4f31c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:23:16 -0400 Subject: blogspam: Fix crash when content contained utf-8. I also tried setting RPC::XML::ENCODING but that did not prevent the crash, and it seems that blogspam.net doesn't like getting xml encoded in unicode, since it mis-flagged comments as spammy that way that are normally allowed through. --- IkiWiki/Plugin/blogspam.pm | 12 +++++++----- debian/changelog | 1 + .../blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm index 8db3780e8..f0b6cb2a2 100644 --- a/IkiWiki/Plugin/blogspam.pm +++ b/IkiWiki/Plugin/blogspam.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::blogspam; use warnings; use strict; use IkiWiki 3.00; +use Encode; my $defaulturl='http://test.blogspam.net:8888/'; @@ -68,6 +69,7 @@ sub checkcontent (@) { my $url=$defaulturl; $url = $config{blogspam_server} if exists $config{blogspam_server}; + my $client = RPC::XML::Client->new($url); my @options = split(",", $config{blogspam_options}) @@ -90,12 +92,12 @@ sub checkcontent (@) { my %req=( ip => $session->remote_addr(), - comment => defined $params{diff} ? $params{diff} : $params{content}, - subject => defined $params{subject} ? $params{subject} : "", - name => defined $params{author} ? $params{author} : "", - link => exists $params{url} ? $params{url} : "", + comment => encode_utf8(defined $params{diff} ? $params{diff} : $params{content}), + subject => encode_utf8(defined $params{subject} ? $params{subject} : ""), + name => encode_utf8(defined $params{author} ? $params{author} : ""), + link => encode_utf8(exists $params{url} ? $params{url} : ""), options => join(",", @options), - site => $config{url}, + site => encode_utf8($config{url}), version => "ikiwiki ".$IkiWiki::version, ); my $res = $client->send_request('testComment', \%req); diff --git a/debian/changelog b/debian/changelog index 8b127b574..0eb5810d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * actiontabs: Improve tab padding. * blueview: Fix display of links to translated pages in the page header. * Set isPermaLink="no" for guids in rss feeds. + * blogspam: Fix crash when content contained utf-8. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn index 22242a97f..265040d67 100644 --- a/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn +++ b/doc/bugs/blog_spam_plugin_not_allowing_non-ASCII_chars__63__.mdwn @@ -8,3 +8,8 @@ This seems to happen because I had a non-ASCII character in the comment (an elli The interesting part is that the comment preview works fine, just the save fails. Probably this means that the blogspam plugin is the culprit (hence the error in RPC::XML::Client library). I'm using version 3.20100815~bpo50+. Thanks! + +> I've filed an upstream bug about this on RPC::XML: +> +> +> Worked around it in blogspam by decoding. --[[Joey]] -- cgit v1.2.3 From 0ff945ddf19010b890458face057505f7b48b572 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:37:45 -0400 Subject: external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. --- IkiWiki/Plugin/external.pm | 2 ++ debian/changelog | 3 +++ doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn | 3 +++ 3 files changed, 8 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm index ec91c79db..a4cc1dd3c 100644 --- a/IkiWiki/Plugin/external.pm +++ b/IkiWiki/Plugin/external.pm @@ -28,7 +28,9 @@ sub import { $plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid, accum => ""}; + $RPC::XML::ENCODING="utf-8"; + $RPC::XML::FORCE_STRING_ENCODING="true"; rpc_call($plugins{$plugin}, "import"); } diff --git a/debian/changelog b/debian/changelog index 0eb5810d0..46401b58c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,9 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * blueview: Fix display of links to translated pages in the page header. * Set isPermaLink="no" for guids in rss feeds. * blogspam: Fix crash when content contained utf-8. + * external: Disable RPC::XML's "smart" encoding, which sent ints + for strings that contained only a number, fixing a longstanding crash + of the rst plugin. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn index dab3b7e5b..99e46aac9 100644 --- a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn +++ b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn @@ -24,3 +24,6 @@ throwing code..): > No, still the same failure. I think it's failing parsing the input data, > (which perl probably transmitted as an int due to perl internals) > not writing out its response. --[[Joey]] + +> On second thought, this was a bug in ikiwiki, it should be transmitting +> that as a string. Fixed in external.pm --[[Joey]] -- cgit v1.2.3 From cd794613b6f5140365e51f79023c882e8ea71197 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 14 Sep 2010 15:45:38 -0400 Subject: git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. --- IkiWiki/Plugin/git.pm | 2 +- debian/changelog | 2 ++ doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index d342a7398..fd57ce1e4 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -462,7 +462,7 @@ sub rcs_update () { # Update working directory. if (length $config{gitorigin_branch}) { - run_or_cry('git', 'pull', $config{gitorigin_branch}); + run_or_cry('git', 'pull', '--prune', $config{gitorigin_branch}); } } diff --git a/debian/changelog b/debian/changelog index 46401b58c..27e0fb103 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * external: Disable RPC::XML's "smart" encoding, which sent ints for strings that contained only a number, fixing a longstanding crash of the rst plugin. + * git: When updating from remote, use git pull --prune, to avoid possible + errors from conflicting obsolete remote branches. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn index 01f3d1a28..5dc4250e3 100644 --- a/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn +++ b/doc/bugs/git.pm_should_prune_remote_branches_when_fetching.mdwn @@ -9,3 +9,6 @@ Pruning remote branches can be done automatically with the --prune option to "gi > from obsolete remote branches. --[[Joey]] Suppose a remote repository contains a branch named "foo", and you fetch from it. Then, someone renames that branch to "foo/bar". The next time you fetch from that repository, you will get an error because the obsolete branch "foo" is blocking the branch "foo/bar" from being created (due to the way git stores refs for branches). Pruning gets around the problem. It doesn't really add much overhead to the fetch, and in fact it can *save* overhead since obsolete branches do consume resources (any commits they point to cannot be garbage collected). --[[blipvert]] + +> Ok, so git pull --prune can be used to do everything in one command. +> [[done]] --[[Joey]] -- cgit v1.2.3 From 884835ce1cd3b1ba24d6f6bb19786d04e6b8ae90 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:24:50 -0400 Subject: cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut. --- IkiWiki/Plugin/cutpaste.pm | 31 +++++++++++++++------- debian/changelog | 2 ++ ..._in_this_page_--_missing_page_dependencies.mdwn | 20 ++++++++++++++ 3 files changed, 44 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm index 4a8817168..0f6ea0b1f 100644 --- a/IkiWiki/Plugin/cutpaste.pm +++ b/IkiWiki/Plugin/cutpaste.pm @@ -5,10 +5,9 @@ use warnings; use strict; use IkiWiki 3.00; -my %savedtext; - sub import { hook(type => "getsetup", id => "cutpaste", call => \&getsetup); + hook(type => "needsbuild", id => "cutpaste", call => \&needsbuild); hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1); hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1); hook(type => "preprocess", id => "paste", call => \&preprocess_paste); @@ -23,6 +22,22 @@ sub getsetup () { }, } +sub needsbuild (@) { + my $needsbuild=shift; + foreach my $page (keys %pagestate) { + if (exists $pagestate{$page}{cutpaste}) { + if (exists $pagesources{$page} && + grep { $_ eq $pagesources{$page} } @$needsbuild) { + # remove state, will be re-added if + # the cut/copy directive is still present + # on rebuild. + delete $pagestate{$page}{cutpaste}; + } + } + } + return $needsbuild; +} + sub preprocess_cut (@) { my %params=@_; @@ -32,8 +47,7 @@ sub preprocess_cut (@) { } } - $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; - $savedtext{$params{page}}->{$params{id}} = $params{text}; + $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text}; return "" if defined wantarray; } @@ -47,8 +61,7 @@ sub preprocess_copy (@) { } } - $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; - $savedtext{$params{page}}->{$params{id}} = $params{text}; + $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text}; return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text}) if defined wantarray; @@ -63,15 +76,15 @@ sub preprocess_paste (@) { } } - if (! exists $savedtext{$params{page}}) { + if (! exists $pagestate{$params{page}}{cutpaste}) { error gettext('no text was copied in this page'); } - if (! exists $savedtext{$params{page}}->{$params{id}}) { + if (! exists $pagestate{$params{page}}{cutpaste}{$params{id}}) { error sprintf(gettext('no text was copied in this page with id %s'), $params{id}); } return IkiWiki::preprocess($params{page}, $params{destpage}, - $savedtext{$params{page}}->{$params{id}}); + $pagestate{$params{page}}{cutpaste}{$params{id}}); } 1; diff --git a/debian/changelog b/debian/changelog index 27e0fb103..d6eebea78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low of the rst plugin. * git: When updating from remote, use git pull --prune, to avoid possible errors from conflicting obsolete remote branches. + * cutpaste: Fix bug that occured in some cases involving inlines when + text was pasted on a page before being cut. -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 diff --git a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn index 356f9155a..4535cf35d 100644 --- a/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn +++ b/doc/bugs/Error:_no_text_was_copied_in_this_page_--_missing_page_dependencies.mdwn @@ -24,3 +24,23 @@ This error shows up only for *news.html*, but not in *news/2010-07-31* or for the aggregation in *index.html* or its RSS and atom files. --[[tschwinge]] + +> So the cutpaste plugin, in order to support pastes +> that come before the corresponding cut in the page, +> relies on the scan hook being called for the page +> before it is preprocessed. +> +> In the case of an inline, this doesn't happen, if +> the page in question has not changed. +> +> Really though it's not just inline, it's potentially anything +> that preprocesses content. None of those things guarantee that +> scan gets re-run on it first. +> +> I think cutpaste is going beyond the intended use of scan hooks, +> which is to gather link information, not do arbitrary data collection. +> Requiring scan be run repeatedly could be a lot more work. +> +> Using `%pagestate` to store the cut content when scanning would be +> one way to fix this bug. It would mean storing potentially big chunks +> of page content in the indexdb. --[[Joey]] -- cgit v1.2.3 From 3d4313f21d2b61ff323fb26805b29c9b59e1ace5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Sep 2010 16:40:26 -0400 Subject: releasing version 3.20100915 --- debian/changelog | 6 +-- debian/control | 2 +- ikiwiki.spec | 2 +- po/bg.po | 133 +++++++++++++++++++++++++++---------------------------- po/cs.po | 133 +++++++++++++++++++++++++++---------------------------- po/da.po | 133 +++++++++++++++++++++++++++---------------------------- po/de.po | 133 +++++++++++++++++++++++++++---------------------------- po/es.po | 133 +++++++++++++++++++++++++++---------------------------- po/fr.po | 133 +++++++++++++++++++++++++++---------------------------- po/gu.po | 133 +++++++++++++++++++++++++++---------------------------- po/ikiwiki.pot | 133 +++++++++++++++++++++++++++---------------------------- po/it.po | 133 +++++++++++++++++++++++++++---------------------------- po/pl.po | 133 +++++++++++++++++++++++++++---------------------------- po/sv.po | 133 +++++++++++++++++++++++++++---------------------------- po/tr.po | 133 +++++++++++++++++++++++++++---------------------------- po/vi.po | 133 +++++++++++++++++++++++++++---------------------------- 16 files changed, 863 insertions(+), 876 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d6eebea78..8286b7887 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ -ikiwiki (3.20100832) UNRELEASED; urgency=low +ikiwiki (3.20100915) unstable; urgency=low * needsbuild hook interface changed; the hooks should now return - the modified array of things that need built. (Backwards compatability + the modified array of things that need built. (Backwards compatibility code keeps plugins using the old interface working.) * Remove PATH overriding code in ikiwiki script that was present to make perl taint checking happy, but taint checking is disabled. @@ -27,7 +27,7 @@ ikiwiki (3.20100832) UNRELEASED; urgency=low * cutpaste: Fix bug that occured in some cases involving inlines when text was pasted on a page before being cut. - -- Joey Hess Tue, 07 Sep 2010 12:08:05 -0400 + -- Joey Hess Wed, 15 Sep 2010 16:29:01 -0400 ikiwiki (3.20100831) unstable; urgency=low diff --git a/debian/control b/debian/control index 2c35ea356..71c9e18bb 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libfile-chdir-perl, Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki diff --git a/ikiwiki.spec b/ikiwiki.spec index 85d912da0..534c3a001 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100831 +Version: 3.20100915 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 845b3f7fa..4fb771b75 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -64,68 +64,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "нов източник" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "съобщения" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -134,7 +134,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "готово" @@ -179,7 +179,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -282,18 +282,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -320,22 +320,22 @@ msgstr "създаване на %s" msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -384,8 +384,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" @@ -505,22 +504,22 @@ msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -594,21 +593,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -617,92 +616,92 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "гласуване" @@ -1006,11 +1005,11 @@ msgstr "липсващ параметър „id” на шаблона" msgid "%s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" @@ -1116,12 +1115,12 @@ msgstr "обновяване на страницата „%s”, зависещ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1190,27 +1189,27 @@ msgstr "крешка при компилиране на файла %s" msgid "successfully generated %s" msgstr "успешно генериране на %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "формат: ikiwiki [опции] източник местоназначение" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." diff --git a/po/cs.po b/po/cs.po index 7f1775b7d..068327ecb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -64,67 +64,67 @@ msgstr "Agregace spuštěna přes web." msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Není třeba nic dělat, všechny kanály jsou aktuální!" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nový kanál" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "příspěvky" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "poslední kontrola %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji kanál %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít kanál na %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "kanál nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(entity byly v kanálu zakódovány)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "kanál shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -133,7 +133,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "hotovo" @@ -175,7 +175,7 @@ msgstr "příloha nahrána" msgid "automatic index generation" msgstr "automatické vytváření indexu" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -283,18 +283,18 @@ msgstr[1] "Komentáře" msgid "Comment" msgstr "Komentáře" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametr %s je povinný" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "na této stránce nebyl zkopírován žádný text" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, 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" @@ -321,20 +321,20 @@ msgstr "vytvářím %s" msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "nebyl zadán parametr template" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -381,8 +381,7 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" 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:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, 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" @@ -492,19 +491,19 @@ 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:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -579,21 +578,21 @@ msgstr "resetování hesla bylo zamítnuto" msgid "Ping received." msgstr "Obdrženo pinknutí." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "vyžaduje parametry „from“ a „to“" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "Pinknu %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignoruji direktivu ping pro wiki %s (toto je wiki %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP nebyl nalezen, nepinkám" @@ -601,35 +600,30 @@ msgstr "LWP nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 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:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -637,7 +631,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -645,55 +639,60 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, 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:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, 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:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 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/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "hlasovat" @@ -986,11 +985,11 @@ msgstr "chybí parametr id" msgid "%s not found" msgstr "%s nenalezen" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "chybí TeXový kód" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "z kódu se nepodařilo vygenerovat obrázek" @@ -1101,12 +1100,12 @@ msgstr "sestavuji %s, která závisí na %s" msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1175,28 +1174,28 @@ msgstr "nelze zkompilovat %s" msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "použití: ikiwiki [volby] zdroj cíl" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup konfigurační.soubor" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "obnovuji wiki..." diff --git a/po/da.po b/po/da.po index 32a75ed0b..45cb8bab9 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -68,67 +68,67 @@ msgstr "Indsamling udløst via web." msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Intet at gøre lige nu, alle fødninger er tidssvarende!" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "mangler parametren %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "ny fødning" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "indlæg" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "færdig" @@ -179,7 +179,7 @@ msgstr "vedhæftningsoplægning" msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -285,18 +285,18 @@ msgstr[1] "%i kommentarer" msgid "Comment" msgstr "Kommentér" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametren %s er krævet" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "ingen tekst blev kopieret i denne side" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "ingen tekst blev kopieret i denne side med id %s" @@ -323,20 +323,20 @@ msgstr "opretter %s" msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "skabelon %s ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "beandling af skabelon mislykkedes:" @@ -382,8 +382,7 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -497,19 +496,19 @@ msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -583,21 +582,21 @@ msgstr "adgangskodenulstilling afvist" msgid "Ping received." msgstr "Ping modtaget." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "kræver 'from'- og 'to'-parametre" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "vil pinge %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP ikke fundet, pinger ikke" @@ -605,17 +604,12 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "advarsel: Gammel po4a detekteret. Anbefaler opgradering til 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -623,7 +617,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -631,11 +625,11 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -643,7 +637,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -651,54 +645,59 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 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/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "stem" @@ -991,11 +990,11 @@ msgstr "manglende id-parameter" msgid "%s not found" msgstr "%s ikke fundet" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "manglende tex-kode" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" @@ -1106,12 +1105,12 @@ msgstr "danner %s, som afhænger af %s" msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1180,27 +1179,27 @@ msgstr "kompilering af %s mislykkedes" msgid "successfully generated %s" msgstr "Korrekt bygget %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "brug: ikiwiki [valg] kilde mål" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "brug: --set-yaml var=værdi" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." diff --git a/po/de.po b/po/de.po index 586788bb1..07e702e5c 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -65,67 +65,67 @@ msgstr "Das Web löst die Zusammenstellung aus" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Es gibt nichts zu tun, alle Vorlagen (feeds) sind aktuell!" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "Parameter %s fehlt" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "neue Vorlage (feed)" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "Beiträge" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "neu" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s läuft aus (%s Tage alt)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "%s läuft aus" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "zuletzt geprüft %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "überprüfe Vorlage (feed) %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "konnte Vorlage (feed) unter %s nicht finden" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(Einträge in der Vorlage (feed) wurden maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" @@ -134,7 +134,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "fertig" @@ -177,7 +177,7 @@ msgstr "Anhang hochladen" msgid "automatic index generation" msgstr "automatische Index-Erstellung" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -285,18 +285,18 @@ msgstr[1] "%i Kommentare" msgid "Comment" msgstr "Kommentieren" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "der Parameter %s wird benötigt" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "es wurde kein Text in diese Seite kopiert" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, 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" @@ -323,20 +323,20 @@ msgstr "erstelle %s" msgid "editing %s" msgstr "bearbeite %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "Vorlage nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -383,8 +383,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" @@ -501,19 +500,19 @@ msgstr "" "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -589,21 +588,21 @@ msgstr "zurücksetzen des Passworts abgelehnt" msgid "Ping received." msgstr "Ping empfangen." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "erfordert die Parameter 'from' und 'to'" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "werde Ping an %s senden" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignoriere die ping Anweisung für das Wiki %s (dieses Wiki ist %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP nicht gefunden, führe Ping nicht aus" @@ -611,17 +610,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -629,7 +623,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -637,11 +631,11 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -649,7 +643,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -657,55 +651,60 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 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/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "abstimmen" @@ -1000,11 +999,11 @@ msgstr "fehlender Parameter id" msgid "%s not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "fehlender TeX-Code" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" @@ -1118,12 +1117,12 @@ msgstr "erzeuge %s, die von %s abhängt" msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1195,28 +1194,28 @@ msgstr "erzeugen von %s fehlgeschlagen" msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup Konfigurationsdatei" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." diff --git a/po/es.po b/po/es.po index dfdacf764..39c4797e7 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -70,67 +70,67 @@ msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "falta el parámetro %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nueva entrada" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "entradas" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "última comprobación el %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -139,7 +139,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "completado" @@ -184,7 +184,7 @@ msgstr "enviado el adjunto" msgid "automatic index generation" msgstr "creación de índice automática" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -292,18 +292,18 @@ msgstr[1] "Comentarios" msgid "Comment" msgstr "Comentarios" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "el parámetro %s es obligatorio" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "no se ha copiado ningún texto en esta página" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, 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" @@ -330,20 +330,20 @@ msgstr "creando página %s" msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "falta indicar la plantilla (template)" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -391,8 +391,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, 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" @@ -509,19 +508,19 @@ 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:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -601,21 +600,21 @@ msgstr "reinicio de contraseña denegado" msgid "Ping received." msgstr "Recibida una señal ping." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "los parámetros 'from' y 'to' son obligatorios" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "No he encontrado el componente LWP, no envío señal alguna" @@ -623,92 +622,92 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, 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:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, 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:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Votar" @@ -1005,11 +1004,11 @@ msgstr "falta el parámetro \"id\"" msgid "%s not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "falta el código tex" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" @@ -1124,12 +1123,12 @@ msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1200,28 +1199,28 @@ msgstr "ha fallado la compilación del programa %s" msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "uso: ikiwiki [opciones] origen destino" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup archivo_de_configuración" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "actualizando el wiki.." diff --git a/po/fr.po b/po/fr.po index 221bff436..05ad086af 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2010-07-17 18:13+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -66,67 +66,67 @@ msgstr "Agrégation déclenchée par le web" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Rien à faire pour le moment, tous les flux sont à jour !" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "Paramètre %s manquant" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "Nouveau flux" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "Articles" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -135,7 +135,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "Terminé" @@ -177,7 +177,7 @@ msgstr "Envoi de la pièce jointe" msgid "automatic index generation" msgstr "Génération de l'index automatique" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -284,18 +284,18 @@ msgstr[1] "%i commentaires" msgid "Comment" msgstr "poster un commentaire" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "Le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "Aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, 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" @@ -322,20 +322,20 @@ msgstr "Création de %s" msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "modèle (« template ») non indiqué" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -382,8 +382,7 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." @@ -498,19 +497,19 @@ msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "les paramètres « from » et « to » sont nécessaires." @@ -588,21 +587,21 @@ msgstr "réinitialisation du mot de passe refusée" msgid "Ping received." msgstr "Ping reçu" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "les paramètres « from » et « to » sont nécessaires." -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "va envoyer un ping à %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP est introuvable. Pas de réponse au ping" @@ -612,17 +611,12 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -630,7 +624,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -638,11 +632,11 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -650,7 +644,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -658,55 +652,60 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, 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:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 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/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Voter" @@ -1001,11 +1000,11 @@ msgstr "Paramètre d'identification manquant" msgid "%s not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" @@ -1117,12 +1116,12 @@ msgstr "Reconstruction de %s, qui dépend de %s" msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1196,28 +1195,28 @@ msgstr "Échec de la compilation de %s" msgid "successfully generated %s" msgstr "%s a été créé avec succès" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup fichier de configuration" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." diff --git a/po/gu.po b/po/gu.po index baa8c8ee0..08107e5b4 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -63,67 +63,67 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "નવું ફીડ" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "પોસ્ટ" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -132,7 +132,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "સંપૂર્ણ" @@ -177,7 +177,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -280,18 +280,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -318,22 +318,22 @@ msgstr "%s બનાવે છે" msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -382,8 +382,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" @@ -496,21 +495,21 @@ msgstr "" 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:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -584,21 +583,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -607,92 +606,92 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "મત" @@ -992,12 +991,12 @@ msgstr "ખોવાયેલ આઇડી વિકલ્પ" msgid "%s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -1103,12 +1102,12 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1177,27 +1176,27 @@ msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 62f2792e4..9edda3427 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,67 +64,67 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "" @@ -175,7 +175,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -278,18 +278,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -316,20 +316,20 @@ msgstr "" msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "" @@ -375,8 +375,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -485,19 +484,19 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -570,21 +569,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "" @@ -592,91 +591,91 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" @@ -969,11 +968,11 @@ msgstr "" msgid "%s not found" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "" @@ -1078,12 +1077,12 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1152,27 +1151,27 @@ msgstr "" msgid "successfully generated %s" msgstr "" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "" diff --git a/po/it.po b/po/it.po index e120681c4..4d6f1d887 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -63,67 +63,67 @@ msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "parametro %s mancante" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nuovo notiziario" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "articoli" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nuovo" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "in scadenza %s (vecchio di %s giorni)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "in scadenza %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "ultimo controllo %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "controllo notiziario %s..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "impossibile trovare il notiziario %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(entità del notiziario espanse con escape)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "il notiziario ha fatto andare in crash XML::Feed." -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "creazione nuova pagina %s" @@ -132,7 +132,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "fatto" @@ -174,7 +174,7 @@ msgstr "carica allegato" msgid "automatic index generation" msgstr "generazione automatica dell'indice" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -282,18 +282,18 @@ msgstr[1] "Commenti" msgid "Comment" msgstr "Commenti" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametro %s necessario" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "nessun testo è stato copiato in questa pagina" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, 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" @@ -320,20 +320,20 @@ msgstr "creazione %s" msgid "editing %s" msgstr "modifica %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "modello non specificato" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -380,8 +380,7 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" @@ -495,19 +494,19 @@ 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:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -585,21 +584,21 @@ msgstr "reset della password non permesso" msgid "Ping received." msgstr "Ping ricevuto." -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "sono richiesti i parametri \"to\" e \"from\"" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "Verrà inviato un ping a %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "Ignorata la richiesta di ping per il wiki %s (questo wiki è %s)" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "LWP non trovato, ping non inviato" @@ -609,24 +608,19 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -634,11 +628,11 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -646,7 +640,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:487 +#: ../IkiWiki/Plugin/po.pm:498 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -654,55 +648,60 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, 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:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 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/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "voto" @@ -997,11 +996,11 @@ msgstr "parametro id mancante" msgid "%s not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "codice tex mancante" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" @@ -1112,12 +1111,12 @@ msgstr "compilazione di %s, che dipende da %s" msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1187,28 +1186,28 @@ msgstr "errore nel compilare %s" msgid "successfully generated %s" msgstr "%s generato con successo" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup configfile" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." diff --git a/po/pl.po b/po/pl.po index f02444224..4bd07b5a6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -66,68 +66,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nowy kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "wpisy" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -136,7 +136,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "gotowe" @@ -181,7 +181,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -284,18 +284,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "Parametry \"test\" i \"then\" są wymagane" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -322,22 +322,22 @@ msgstr "tworzenie %s" msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -386,8 +386,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" @@ -508,22 +507,22 @@ msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -597,21 +596,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -620,92 +619,92 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "głosuj" @@ -1013,12 +1012,12 @@ msgstr "brakujący parametr id" msgid "%s not found" msgstr "nie znaleziono %s" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -1124,12 +1123,12 @@ msgstr "renderowanie %s zależącego od %s" msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1198,27 +1197,27 @@ msgstr "awaria w trakcie kompilowania %s" msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "użycie: ikiwiki [parametry] źródło cel" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." diff --git a/po/sv.po b/po/sv.po index d8c2cd70b..1dc8a5f49 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -63,68 +63,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "ny kanal" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "inlägg" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -133,7 +133,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "klar" @@ -178,7 +178,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -281,18 +281,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -319,22 +319,22 @@ msgstr "skapar %s" msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -383,8 +383,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" @@ -501,22 +500,22 @@ msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -590,21 +589,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -613,92 +612,92 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "röst" @@ -1001,11 +1000,11 @@ msgstr "mall saknar id-parameter" msgid "%s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" @@ -1111,12 +1110,12 @@ msgstr "ritar upp %s, vilken är beroende av %s" msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1185,27 +1184,27 @@ msgstr "misslyckades med att kompilera %s" msgid "successfully generated %s" msgstr "generering av %s lyckades" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "användning: ikiwiki [flaggor] källa mål" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." diff --git a/po/tr.po b/po/tr.po index 91dca8739..b94039191 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -60,67 +60,67 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, perl-format msgid "missing %s parameter" msgstr "%s parametresi eksik" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "yeni özet akışı" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "gönderi" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "yeni" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s için zaman aşımı (%s gün eski)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "%s için zaman aşımı" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "son güncelleme: %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "%s özet akışı denetleniyor ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "%s özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 msgid "feed not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "(özet akışı girdileri işlendi)" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" @@ -129,7 +129,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "" @@ -171,7 +171,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -274,18 +274,18 @@ msgstr[1] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -312,20 +312,20 @@ msgstr "" msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "" @@ -371,8 +371,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -481,19 +480,19 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:174 +#: ../IkiWiki/Plugin/meta.pm:175 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -566,21 +565,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, perl-format msgid "Will ping %s" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 msgid "LWP not found, not pinging" msgstr "" @@ -588,91 +587,91 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" @@ -965,11 +964,11 @@ msgstr "" msgid "%s not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 msgid "failed to generate image from code" msgstr "" @@ -1074,12 +1073,12 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1148,27 +1147,27 @@ msgstr "" msgid "successfully generated %s" msgstr "" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "" diff --git a/po/vi.po b/po/vi.po index aa0503f46..1b0bab9b1 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-30 19:46-0400\n" +"POT-Creation-Date: 2010-09-15 16:30-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -64,68 +64,68 @@ msgstr "" msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:220 +#: ../IkiWiki/Plugin/aggregate.pm:222 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/aggregate.pm:255 +#: ../IkiWiki/Plugin/aggregate.pm:257 msgid "new feed" msgstr "nguồn tin mới" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "posts" msgstr "bài" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:273 msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:455 +#: ../IkiWiki/Plugin/aggregate.pm:457 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:462 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:489 +#: ../IkiWiki/Plugin/aggregate.pm:491 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:495 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:498 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:517 +#: ../IkiWiki/Plugin/aggregate.pm:519 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:528 +#: ../IkiWiki/Plugin/aggregate.pm:530 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:536 +#: ../IkiWiki/Plugin/aggregate.pm:538 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:544 +#: ../IkiWiki/Plugin/aggregate.pm:546 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:630 +#: ../IkiWiki/Plugin/aggregate.pm:632 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -134,7 +134,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 msgid "done" msgstr "xong" @@ -179,7 +179,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:110 +#: ../IkiWiki/Plugin/blogspam.pm:112 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -281,18 +281,18 @@ msgstr[0] "" msgid "Comment" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 -#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:46 +#: ../IkiWiki/Plugin/cutpaste.pm:60 ../IkiWiki/Plugin/cutpaste.pm:75 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:67 +#: ../IkiWiki/Plugin/cutpaste.pm:80 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:70 +#: ../IkiWiki/Plugin/cutpaste.pm:83 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" @@ -319,22 +319,22 @@ msgstr "đang tạo %s" msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/edittemplate.pm:52 +#: ../IkiWiki/Plugin/edittemplate.pm:54 #, fuzzy msgid "template not specified" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/edittemplate.pm:55 +#: ../IkiWiki/Plugin/edittemplate.pm:57 #, fuzzy msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:70 +#: ../IkiWiki/Plugin/edittemplate.pm:72 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -383,8 +383,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 -#: ../IkiWiki/Plugin/search.pm:38 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, 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" @@ -501,22 +500,22 @@ msgstr "" 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:174 +#: ../IkiWiki/Plugin/meta.pm:175 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:212 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:226 +#: ../IkiWiki/Plugin/meta.pm:227 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:395 +#: ../IkiWiki/Plugin/meta.pm:396 msgid "sort=meta requires a parameter" msgstr "" @@ -590,21 +589,21 @@ msgstr "" msgid "Ping received." msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:53 +#: ../IkiWiki/Plugin/pinger.pm:54 msgid "requires 'from' and 'to' parameters" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:58 +#: ../IkiWiki/Plugin/pinger.pm:59 #, fuzzy, perl-format msgid "Will ping %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/pinger.pm:61 +#: ../IkiWiki/Plugin/pinger.pm:62 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" msgstr "" -#: ../IkiWiki/Plugin/pinger.pm:77 +#: ../IkiWiki/Plugin/pinger.pm:78 #, fuzzy msgid "LWP not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -613,92 +612,92 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:147 -#, perl-format -msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:166 +#: ../IkiWiki/Plugin/po.pm:175 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:178 +#: ../IkiWiki/Plugin/po.pm:187 #, 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:183 +#: ../IkiWiki/Plugin/po.pm:192 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:455 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:467 +#: ../IkiWiki/Plugin/po.pm:478 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:487 +#: ../IkiWiki/Plugin/po.pm:498 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:924 +#: ../IkiWiki/Plugin/po.pm:935 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:958 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:989 +#: ../IkiWiki/Plugin/po.pm:1000 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1000 +#: ../IkiWiki/Plugin/po.pm:1011 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1079 +#: ../IkiWiki/Plugin/po.pm:1090 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 -#: ../IkiWiki/Plugin/po.pm:1187 +#: ../IkiWiki/Plugin/po.pm:1147 ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1198 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1146 +#: ../IkiWiki/Plugin/po.pm:1157 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1199 +#: ../IkiWiki/Plugin/po.pm:1210 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1252 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "bỏ phiếu" @@ -1001,11 +1000,11 @@ msgstr "mẫu thiếu tham số id" msgid "%s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/teximg.pm:72 +#: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:124 +#: ../IkiWiki/Plugin/teximg.pm:125 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" @@ -1111,12 +1110,12 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s" msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Render.pm:787 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Render.pm:836 +#: ../IkiWiki/Render.pm:839 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1185,27 +1184,27 @@ msgstr "lỗi biên dịch %s" msgid "successfully generated %s" msgstr "%s đã được tạo ra" -#: ../ikiwiki.in:13 +#: ../ikiwiki.in:10 msgid "usage: ikiwiki [options] source dest" msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" -#: ../ikiwiki.in:14 +#: ../ikiwiki.in:11 msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:105 +#: ../ikiwiki.in:102 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:112 +#: ../ikiwiki.in:109 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:215 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:221 +#: ../ikiwiki.in:218 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -- cgit v1.2.3 From 8063b960ade41a089d859b655ff26fb61fb18d3f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 19 Sep 2010 20:15:34 -0400 Subject: meta: Ensure that the url specified by xrds-location is absolute. With a relative xrds-location, the openid perl client module will fail. I haven't checked the specs to see if it needs to be absolute, but all examples I've seen are absolute, so it seems a very good idea. --- IkiWiki/Plugin/meta.pm | 6 +++++- debian/changelog | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index ae593555e..5cfa72833 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -198,8 +198,12 @@ sub preprocess (@) { '" rel="openid2.local_id" />' if $delegate ne 1; } if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) { + # force url absolute + eval q{use URI}; + error($@) if $@; + my $url=URI->new_abs($params{"xrds-location"}, $config{url}); push @{$metaheaders{$page}}, ''; + 'content="'.encode_entities($url).'" />'; } } elsif ($key eq 'redir') { diff --git a/debian/changelog b/debian/changelog index 8286b7887..24115c177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100916) UNRELEASED; urgency=low + + * meta: Ensure that the url specified by xrds-location is absolute. + + -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 + ikiwiki (3.20100915) unstable; urgency=low * needsbuild hook interface changed; the hooks should now return -- cgit v1.2.3 From 90bc68589e8c9e0243d563a9616701c946b2d3fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 21 Sep 2010 15:33:42 -0400 Subject: attachment: Fix attachment file size display. --- IkiWiki/Plugin/attachment.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index f73e355ee..bd93d3718 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -242,7 +242,7 @@ sub attachment_list ($) { push @ret, { "field-select" => '', link => htmllink($page, $page, $f, noimageinline => 1), - size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]), + size => IkiWiki::Plugin::filecheck::humansize((stat($f))[7]), mtime => displaytime($IkiWiki::pagemtime{$f}), mtime_raw => $IkiWiki::pagemtime{$f}, }; diff --git a/debian/changelog b/debian/changelog index 24115c177..cae182f63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. + * attachment: Fix attachment file size display. -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 -- cgit v1.2.3 From 1883e31de2044eba87035c7bbb4b34c45fefa432 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 22:27:46 -0400 Subject: Propigate PATH into wrapper. In the last version, the ikiwiki script stopped setting PATH. But that leads to gcc failing when run from websetup. See http://www.branchable.com/bugs/Crashes_when_rebuilding_wiki_after_setup_change/ --- IkiWiki/Wrapper.pm | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 927368fae..5eb96f4ae 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -128,7 +128,7 @@ EOF #include extern char **environ; -char *newenviron[$#envsave+6]; +char *newenviron[$#envsave+7]; int i=0; void addenv(char *var, char *val) { @@ -147,6 +147,7 @@ $check_commit_hook @wrapper_hooks $envsave newenviron[i++]="HOME=$ENV{HOME}"; + newenviron[i++]="PATH=$ENV{PATH}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; #ifdef __TINYC__ diff --git a/debian/changelog b/debian/changelog index cae182f63..97f9d3c79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. + * Propigate PATH into wrapper. -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 -- cgit v1.2.3 From 43c99f907674de2207a7b411ee1b0c2996ce79d2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 26 Sep 2010 22:37:18 -0400 Subject: htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) --- debian/changelog | 1 + doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 97f9d3c79..a71a08ea2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20100916) UNRELEASED; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. * Propigate PATH into wrapper. + * htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 diff --git a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn index 2613224cf..92427065d 100644 --- a/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn +++ b/doc/bugs/htmlbalance_fails_with_HTML-Tree_v4.mdwn @@ -14,3 +14,5 @@ From the git commit: and indeed the regression tests do get an error. --[[smcv]] + +[[done]] --[[Joey]] -- cgit v1.2.3 From 3dfc7ea4dc49208681dfa753ae1001c57fd3d873 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 27 Sep 2010 00:56:03 -0400 Subject: releasing version 3.20100926 --- debian/changelog | 6 +++--- ikiwiki.spec | 2 +- po/ikiwiki.pot | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a71a08ea2..a26a35617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -ikiwiki (3.20100916) UNRELEASED; urgency=low +ikiwiki (3.20100926) unstable; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. * attachment: Fix attachment file size display. * Propigate PATH into wrapper. - * htmlbalance: Fix compatability with HTML::Tree 4.0. (smcv) + * htmlbalance: Fix compatibility with HTML::Tree 4.0. (smcv) - -- Joey Hess Sun, 19 Sep 2010 20:13:06 -0400 + -- Joey Hess Sun, 26 Sep 2010 23:02:54 -0400 ikiwiki (3.20100915) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 534c3a001..5cd072750 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100915 +Version: 3.20100926 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 9edda3427..17c313ba8 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-09-26 23:04-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -488,15 +488,15 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -1140,13 +1140,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "" -- cgit v1.2.3 From 2df92a956af2ed6b4ac3c2c3de01c56bb08e2368 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 29 Sep 2010 11:58:45 -0400 Subject: Fix test suite failure on other side of date line. --- debian/changelog | 6 ++++++ t/pagespec_match.t | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a26a35617..527dd7884 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100927) UNRELEASED; urgency=low + + * Fix test suite failure on other side of date line. + + -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 + ikiwiki (3.20100926) unstable; urgency=low * meta: Ensure that the url specified by xrds-location is absolute. diff --git a/t/pagespec_match.t b/t/pagespec_match.t index fe9624370..a37b06e8e 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -101,6 +101,7 @@ ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success"); ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success"); +$ENV{TZ}="GMT"; $IkiWiki::pagectime{foo}=1154532692; # Wed Aug 2 11:26 EDT 2006 $IkiWiki::pagectime{bar}=1154532695; # after ok(pagespec_match("foo", "created_before(bar)")); -- cgit v1.2.3 From bd48ff734a0e01a6f2c097932f728ccb680702a2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Oct 2010 12:02:34 -0400 Subject: fixups tidy change Need checkconfig hook; examples don't become default values. --- IkiWiki/Plugin/htmltidy.pm | 9 +++++++-- debian/changelog | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 8a0e8f428..185d01dd6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -25,13 +25,18 @@ sub getsetup () { }, htmltidy => { type => "string", - example => "tidy --show-body-only yes --show-warnings no --tidy-mark no --markup yes -quiet -asxhtml -utf8", description => "tidy command line", safe => 0, # path - rebuild => 0, + rebuild => undef, }, } +sub checkconfig () { + if (! defined $config{htmltidy}) { + $config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes"; + } +} + sub sanitize (@) { my %params=@_; diff --git a/debian/changelog b/debian/changelog index 527dd7884..c59c19af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Fix test suite failure on other side of date line. + * htmltidy: Allow configuring tidy parameters in setup file. + (W. Trevor King) -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From 5c514706e43e8e4bff7b4620db4add6eed9a5bca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 3 Oct 2010 12:34:58 -0400 Subject: Updated French program translation. Closes: #598918 --- debian/changelog | 1 + po/fr.po | 61 ++++++++++++++++++++++++++------------------------------ 2 files changed, 29 insertions(+), 33 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c59c19af7..1d12d0558 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Fix test suite failure on other side of date line. * htmltidy: Allow configuring tidy parameters in setup file. (W. Trevor King) + * Updated French program translation. Closes: #598918 -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/po/fr.po b/po/fr.po index 05ad086af..ae2b9f411 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-09-15 16:30-0400\n" -"PO-Revision-Date: 2010-07-17 18:13+0200\n" +"PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "Language: fr\n" @@ -146,15 +146,15 @@ msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " -msgstr "Impossible de créer un compartiment S3 :" +msgstr "Impossible de créer un compartiment S3 : " #: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " -msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" +msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 : " #: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " -msgstr "Échec lors de la suppression du fichier sur S3 :" +msgstr "Échec lors de la suppression du fichier sur S3 : " #: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format @@ -195,14 +195,13 @@ msgid "There are no broken links!" msgstr "Aucun lien cassé !" #: ../IkiWiki/Plugin/comments.pm:113 -#, fuzzy, perl-format +#, perl-format msgid "this comment needs %s" -msgstr "Faire un commentaire sur %s" +msgstr "Ce commentaire demande %s" #: ../IkiWiki/Plugin/comments.pm:116 -#, fuzzy msgid "moderation" -msgstr "Modération du commentaire" +msgstr "Modération" #: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format @@ -218,7 +217,6 @@ msgid "Anonymous" msgstr "Anonyme" #: ../IkiWiki/Plugin/comments.pm:256 -#, fuzzy msgid "Comment Moderation" msgstr "Modération du commentaire" @@ -337,9 +335,8 @@ msgstr "edittemplate %s enregistré pour %s" #: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy msgid "failed to process template:" -msgstr "Échec du traitement :" +msgstr "Échec du traitementdu modèle :" #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" @@ -510,9 +507,8 @@ msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" #: ../IkiWiki/Plugin/meta.pm:396 -#, fuzzy msgid "sort=meta requires a parameter" -msgstr "les paramètres « from » et « to » sont nécessaires." +msgstr "sort=meta demande un paramètre." #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" @@ -531,9 +527,9 @@ msgid "more" msgstr "lire la suite" #: ../IkiWiki/Plugin/openid.pm:70 -#, fuzzy, perl-format +#, perl-format msgid "failed to load openid module: " -msgstr "Échec de la compilation de %s" +msgstr "Impossible de charger le module openid" #: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." @@ -704,7 +700,7 @@ msgstr "" #: ../IkiWiki/Plugin/po.pm:1252 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" -msgstr "" +msgstr "La syntaxe de %s n'est pas correcte : il faut utiliser CODE|NOM" #: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" @@ -899,7 +895,7 @@ msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" #: ../IkiWiki/Plugin/search.pm:195 -#, fuzzy, perl-format +#, perl-format msgid "need Digest::SHA to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" @@ -925,9 +921,9 @@ msgid "shortcut %s points to %s" msgstr "Le raccourci %s pointe vers %s" #: ../IkiWiki/Plugin/smiley.pm:30 -#, fuzzy, perl-format +#, perl-format msgid "smiley plugin will not work without %s" -msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" +msgstr "Le module smiley ne fonctionne pas sans %s" #: ../IkiWiki/Plugin/smiley.pm:50 msgid "failed to parse any smileys" @@ -987,7 +983,7 @@ msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" #: ../IkiWiki/Plugin/tag.pm:83 -#, fuzzy, perl-format +#, perl-format msgid "creating tag page %s" msgstr "Création de la nouvelle page %s" @@ -996,9 +992,9 @@ msgid "missing id parameter" msgstr "Paramètre d'identification manquant" #: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "%s not found" -msgstr "Flux introuvable " +msgstr "%s introuvable" #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" @@ -1089,12 +1085,12 @@ msgstr "%s peut être associé à plusieurs pages source." #: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "" +msgstr "recherche de %s pour les dates de modification et de création des fichiers..." #: ../IkiWiki/Render.pm:446 -#, fuzzy, perl-format +#, perl-format msgid "removing obsolete %s" -msgstr "Suppression de l'ancienne page %s" +msgstr "Suppression de %s obsolète" #: ../IkiWiki/Render.pm:520 #, perl-format @@ -1134,14 +1130,14 @@ msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" #: ../IkiWiki/Setup.pm:34 -#, fuzzy, perl-format +#, perl-format msgid "cannot load %s in safe mode" -msgstr "Lecture impossible de %s : %s" +msgstr "Impossible de charger %s de façon sécurisée" #: ../IkiWiki/Setup.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "failed to parse %s" -msgstr "Impossible de mettre à jour %s" +msgstr "Impossible d'analyser %s" #: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" @@ -1208,9 +1204,8 @@ msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" #: ../ikiwiki.in:109 -#, fuzzy msgid "usage: --set-yaml var=value" -msgstr "Syntaxe : -- set var=valeur" +msgstr "Syntaxe : --set-yaml var=valeur" #: ../ikiwiki.in:215 msgid "rebuilding wiki.." @@ -1248,7 +1243,7 @@ msgid "yes" msgstr "oui" #: ../IkiWiki.pm:2130 -#, fuzzy, perl-format +#, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" @@ -1260,7 +1255,7 @@ msgstr "Type de tri %s inconnu" #: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" -msgstr "Impossible de trouver les pages %s" +msgstr "Impossible de trouver les pages : %s" #: ../auto.setup:16 msgid "What will the wiki be named?" -- cgit v1.2.3 From 1820f07f04476e8be290aadeee140cd0a5a0dfed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:24:06 -0400 Subject: revert interface done --- debian/changelog | 5 +++++ doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn | 6 ++++++ doc/todo/web_reversion.mdwn | 2 ++ 3 files changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1d12d0558..d1ee4967d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * htmltidy: Allow configuring tidy parameters in setup file. (W. Trevor King) * Updated French program translation. Closes: #598918 + * git: Added new rcs_revert and rcs_preprevert hooks. + * recentchanges: Add revert buttons to RecentChanges page, and + implement web-based reversion interface. + * Thanks to Peter Gammie for his assistance with the web-based reversion + feature. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn index 4998c1a75..d69b3801b 100644 --- a/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn +++ b/doc/forum/how_do_I_revert_edits_in_the_web_mode__63__.mdwn @@ -38,3 +38,9 @@ Puzzled a bit :-/ Perer Gammie and I are working on reversion over at [[todo/web_reversion]]. --[[Joey]] + +Update: Web reversion is now supported by ikiwiki. Only changes committed +to your wiki after you upgrade to the version of ikiwiki that supports it +will get revert buttons on the RecentChanges page. If you want to force +adding buttons for older changes, you can delete `recentchanges/*._change` +from your srcdir, and rebuild the wiki. --[[Joey]] diff --git a/doc/todo/web_reversion.mdwn b/doc/todo/web_reversion.mdwn index 212fd3a53..9550fa58b 100644 --- a/doc/todo/web_reversion.mdwn +++ b/doc/todo/web_reversion.mdwn @@ -71,3 +71,5 @@ Peter Gammie has done an initial implementation of the above. >>> [[!template id=gitbranch branch=origin/revert author="[[joey]]"]] >>> (and fixed all the indention..). --[[Joey]] >>>> Please change the git pointer above, then. I will work on your branch. -- [[peteg]] + +[[done]] -- cgit v1.2.3 From 2852c6b0d5494b21695ebe39b172fc30d01d2600 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 8 Oct 2010 19:55:56 -0400 Subject: actiontabs: More consistent styling of Hn tags. In particular the use of italics for h3 was weird. --- debian/changelog | 1 + themes/actiontabs/style.css | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d1ee4967d..53bee5df6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low implement web-based reversion interface. * Thanks to Peter Gammie for his assistance with the web-based reversion feature. + * actiontabs: More consistent styling of Hn tags. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/themes/actiontabs/style.css b/themes/actiontabs/style.css index 13e9dc1a4..749d9b21e 100644 --- a/themes/actiontabs/style.css +++ b/themes/actiontabs/style.css @@ -97,8 +97,7 @@ body { h1 { font: 120% sans-serif } h2 { font: bold 100% sans-serif } -h3 { font: italic 100% sans-serif } -h4, h5, h6 { font: small-caps 100% sans-serif } +h3, h4, h5, h6 { font: bold 80% sans-serif } /* Smaller headings for inline pages */ .inlinepage h1 { font-size: 110% } -- cgit v1.2.3 From 274219ecc865f9bdcb65ad26e4750fa90dfaa670 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 11:12:41 -0400 Subject: websetup: Fix saving of advanced mode changes. The showadvanced field was not known to formbuilder when hitting the save changes button. --- IkiWiki/Plugin/websetup.pm | 1 + debian/changelog | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 11b4428e3..2674b91e8 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -295,6 +295,7 @@ sub showform ($$) { $form->field(name => "do", type => "hidden", value => "setup", force => 1); $form->field(name => "rebuild_asked", type => "hidden"); + $form->field(name => "showadvanced", type => "hidden"); if ($form->submitted eq 'Basic Mode') { $form->field(name => "showadvanced", type => "hidden", diff --git a/debian/changelog b/debian/changelog index 53bee5df6..fb012abd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * Thanks to Peter Gammie for his assistance with the web-based reversion feature. * actiontabs: More consistent styling of Hn tags. + * websetup: Fix saving of advanced mode changes. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From cfbd272c8bdbb96b6e92449f4d940fb2b72aa651 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 11:27:06 -0400 Subject: websetup: Fix defaults of checkboxes in advanced mode. So formbuilder has an annoying glitch, that setting the value of a checkbox, even without force, will override the value currently on the form. Thus the guards against changing checkbox values when a form has been submitted. But those guards also prevented the checkboxes for advanced items getting the right value when going into advanced mode. Note that if the user makes changes to advanced mode stuff and leaves advanced mode, those changes are lost. That seems reasonable so I didn't change it -- and it made this fix simple. --- IkiWiki/Plugin/websetup.pm | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 2674b91e8..0ab18997c 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -219,7 +219,8 @@ sub showfields ($$$@) { options => [ [ 1 => $description ] ], fieldset => $section, ); - if (! $form->submitted) { + if (! $form->submitted || + ($info{advanced} && $form->submitted eq 'Advanced Mode')) { $form->field(name => $name, value => $value); } } diff --git a/debian/changelog b/debian/changelog index fb012abd2..6d333a843 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low feature. * actiontabs: More consistent styling of Hn tags. * websetup: Fix saving of advanced mode changes. + * websetup: Fix defaults of checkboxes in advanced mode. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From 7ba0f7d297e7d3e833756016b635ffa0cc78200e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Oct 2010 20:30:14 -0400 Subject: monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. --- IkiWiki/Plugin/monotone.pm | 13 ++++++++++++- debian/changelog | 2 ++ .../monotone_backend_does_not_support_srcdir_in_subdir.mdwn | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 95fbcee76..75bf2f458 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -252,9 +252,20 @@ sub get_changed_files ($$) { my @ret; my %seen = (); - + + # we need to strip off the relative path to the source dir + # because monotone outputs all file paths absolute according + # to the workspace root + my $rel_src_dir = $config{'srcdir'}; + $rel_src_dir =~ s/^\Q$config{'mtnrootdir'}\E\/?//; + $rel_src_dir .= "/" if length $rel_src_dir; + while ($changes =~ m/\s*(add_file|patch|delete|rename)\s"(.*?)(? Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn index 9e1924472..35f624f78 100644 --- a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn +++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn @@ -1,3 +1,5 @@ The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir in a subdirectory of the repository. It must be at the top. Git has special code to handle this case. --[[Joey]] + +[[done]] -- cgit v1.2.3 From 8555d10f6369d78c44cf4677010b7e1260d9f5c0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 13 Oct 2010 12:57:16 -0400 Subject: img: If a class is specified, don't also put the img in the img class. --- IkiWiki/Plugin/img.pm | 5 +---- debian/changelog | 2 ++ .../class_parameter_of_img_directive_behave_not_as_documented.mdwn | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 2375ead89..bd527c8c8 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -156,10 +156,7 @@ sub preprocess (@) { $imgurl="$config{url}/$imglink"; } - if (exists $params{class}) { - $params{class}.=" img"; - } - else { + if (! exists $params{class}) { $params{class}="img"; } diff --git a/debian/changelog b/debian/changelog index 12cc90b11..5433ba05f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * websetup: Fix defaults of checkboxes in advanced mode. * monotone: Fix recentchanges page when the srcdir is not at the top of the monotone workspace. Thanks, tommyd. + * img: If a class is specified, don't also put the img in the img + class. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn index 10ba15066..e7797765f 100644 --- a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn +++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn @@ -27,3 +27,5 @@ I would prefer if the `img` class were only added if no class attribute is passed. If you keep the current behaviour, please document it. + +> [[done]] --[[Joey]] -- cgit v1.2.3 From 1d119e5314279235cebc5624f944ee67586cca52 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 17 Oct 2010 17:26:35 -0400 Subject: auto-blog.setup: Don't enable opendiscussion by default; require users be logged in to post comments. --- auto-blog.setup | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/auto-blog.setup b/auto-blog.setup index 980074ec3..0eb83ded6 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam calendar sidebar}], + add_plugins => [qw{goodstuff websetup comments blogspam calendar sidebar}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, @@ -49,6 +49,6 @@ IkiWiki::Setup::Automator->import( archive_pagespec => "page(posts/*) and !*/Discussion", global_sidebars => 0, discussion => 0, - locked_pages => "*", + locked_pages => "* and !postcomment(*)", tagbase => "tags", ) diff --git a/debian/changelog b/debian/changelog index 5433ba05f..9e6bd53f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low of the monotone workspace. Thanks, tommyd. * img: If a class is specified, don't also put the img in the img class. + * auto-blog.setup: Don't enable opendiscussion by default; require users be + logged in to post comments. -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 -- cgit v1.2.3 From 490e0813c53ce7cff708ae4b6c2805c643f9f005 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Oct 2010 02:44:10 -0400 Subject: releasing version 3.20101019 --- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/bg.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/cs.po | 97 ++++++++++++++++++++++++++++++++----------------------- po/da.po | 95 ++++++++++++++++++++++++++++++++---------------------- po/de.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/es.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/fr.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/gu.po | 97 ++++++++++++++++++++++++++++++++----------------------- po/ikiwiki.pot | 78 ++++++++++++++++++++++++++------------------ po/it.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/pl.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/sv.po | 98 +++++++++++++++++++++++++++++++++----------------------- po/tr.po | 92 +++++++++++++++++++++++++++++++--------------------- po/vi.po | 98 +++++++++++++++++++++++++++++++++----------------------- 15 files changed, 738 insertions(+), 511 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9e6bd53f0..951e59c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100927) UNRELEASED; urgency=low +ikiwiki (3.20101019) unstable; urgency=low * Fix test suite failure on other side of date line. * htmltidy: Allow configuring tidy parameters in setup file. @@ -19,7 +19,7 @@ ikiwiki (3.20100927) UNRELEASED; urgency=low * auto-blog.setup: Don't enable opendiscussion by default; require users be logged in to post comments. - -- Joey Hess Wed, 29 Sep 2010 11:58:23 -0400 + -- Joey Hess Tue, 19 Oct 2010 02:32:23 -0400 ikiwiki (3.20100926) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 5cd072750..b2cebc495 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100926 +Version: 3.20101019 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 4fb771b75..36774cfb2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -130,6 +130,11 @@ msgstr "данните от източника предизвикаха греш msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "грешка при обработване на шаблона" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -256,7 +261,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -335,12 +340,6 @@ msgstr "не е указан файл на обвивката" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "грешка при обработване на шаблона" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -369,8 +368,8 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -384,6 +383,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "крешка при компилиране на файла %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -413,7 +417,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" @@ -468,12 +472,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "шаблонът „%s” не е намерен" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -509,17 +513,17 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -800,6 +804,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -1000,11 +1014,6 @@ msgstr "създаване на нова страницa „%s”" msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "шаблонът „%s” не е намерен" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1029,26 +1038,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,11 +1067,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "пропускане на невалидното име на файл „%s”" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1178,13 +1182,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1237,21 +1241,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "пропускане на невалидното име на файл „%s”" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "шаблонът „%s” не е намерен" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1276,6 +1290,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "шаблонът „%s” не е намерен" + #~ msgid "You need to log in first." #~ msgstr "Първо трябва да влезете." diff --git a/po/cs.po b/po/cs.po index 068327ecb..c154da695 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -129,6 +129,11 @@ msgstr "kanál shodil XML::Feed!" msgid "creating new page %s" msgstr "vytvářím novou stránku %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "nepodařilo se zpracovat:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "mažu bucket..." @@ -256,7 +261,7 @@ msgstr "Přidán komentář" msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" @@ -334,12 +339,6 @@ msgstr "nebyl zadán parametr match" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "nepodařilo se zpracovat:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "musíte zadat formát a text" @@ -366,8 +365,8 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" @@ -381,6 +380,11 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "nelze zkompilovat %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +413,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" @@ -458,12 +462,12 @@ msgstr "parametry %s a %s nelze použít zároveň" msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "šablona %s nebyla nalezena" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -495,15 +499,15 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -790,6 +794,16 @@ msgstr "neplatná procentuální hodnota %s" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "potvrďte odstranění %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff oříznut)" @@ -980,11 +994,6 @@ msgstr "vytvářím novou stránku %s" msgid "missing id parameter" msgstr "chybí parametr id" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s nenalezen" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "chybí TeXový kód" @@ -1008,20 +1017,20 @@ msgstr "moduly" msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1029,7 +1038,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1041,11 +1050,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "chybné jméno souboru %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1163,13 +1167,13 @@ msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1221,21 +1225,31 @@ msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "chybné jméno souboru %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "šablona %s nebyla nalezena" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" @@ -1260,6 +1274,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "%s not found" +#~ msgstr "%s nenalezen" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" diff --git a/po/da.po b/po/da.po index 45cb8bab9..331654355 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20100518\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2010-08-27 12:45+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -133,6 +133,10 @@ msgstr "fødning fik XML::Feed til at bryde sammen!" msgid "creating new page %s" msgstr "opretter ny side %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "beandling af skabelon mislykkedes:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "sletter bundt.." @@ -259,7 +263,7 @@ msgstr "Tilføjede en kommentar" msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" @@ -336,11 +340,6 @@ msgstr "sammenligning ikke angivet" msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "beandling af skabelon mislykkedes:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "skal angive format og tekst" @@ -367,8 +366,8 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" @@ -382,6 +381,11 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "kompilering af %s mislykkedes" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +416,7 @@ msgstr "" "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel " "gennemkørsel" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy kunne ikke afkode dette html" @@ -461,12 +465,12 @@ msgstr "parametrene %s og %s kan ikke anvendes sammen" msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "skabelon %s ikke fundet" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "beandling af skabelon mislykkedes:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -500,15 +504,15 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -795,6 +799,16 @@ msgstr "ugyldig procentværdi %s" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "bekræft at %s bliver fjernet" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff trunkeret)" @@ -985,11 +999,6 @@ msgstr "opretter mærkatside %s" msgid "missing id parameter" msgstr "manglende id-parameter" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s ikke fundet" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "manglende tex-kode" @@ -1013,22 +1022,22 @@ msgstr "%s udvidelser" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1036,7 +1045,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1046,11 +1055,6 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "dårligt filnavn %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1168,13 +1172,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1226,21 +1230,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "dårligt filnavn %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "skabelon %s ikke fundet" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1265,5 +1279,8 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" +#~ msgid "%s not found" +#~ msgstr "%s ikke fundet" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "gendanner alle sider for at korrigere meta titler" diff --git a/po/de.po b/po/de.po index 07e702e5c..6159912d0 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -130,6 +130,11 @@ msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" msgid "creating new page %s" msgstr "erstelle neue Seite %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "Fehler beim Ablauf:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." @@ -259,7 +264,7 @@ msgstr "Kommentar hinzugefügt" msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" @@ -336,12 +341,6 @@ msgstr "Übereinstimmung nicht angegeben" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "Fehler beim Ablauf:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "Format und Text müssen spezifiziert werden" @@ -368,8 +367,8 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" @@ -383,6 +382,11 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "erzeugen von %s fehlgeschlagen" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -413,7 +417,7 @@ msgstr "" "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass " "through" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy konnte dieses HTML nicht auswerten" @@ -464,12 +468,12 @@ msgstr "die Parameter %s und %s können nicht zusammen benutzt werden" msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "Vorlage %s nicht gefunden" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -504,15 +508,15 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -804,6 +808,16 @@ msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " "benötigt" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "bestätigen Sie die Entfernung von %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff wurde gekürzt)" @@ -994,11 +1008,6 @@ msgstr "erstelle neue Seite %s" msgid "missing id parameter" msgstr "fehlender Parameter id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "Vorlage (feed) nicht gefunden" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "fehlender TeX-Code" @@ -1022,22 +1031,22 @@ msgstr "%s-Erweiterungen" msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1045,7 +1054,7 @@ msgstr "" "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,11 +1067,6 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "fehlerhafter Dateiname %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1183,13 +1187,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1244,21 +1248,31 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "fehlerhafter Dateiname %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "Vorlage %s nicht gefunden" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1283,6 +1297,10 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "Vorlage (feed) nicht gefunden" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" diff --git a/po/es.po b/po/es.po index 39c4797e7..a2459007b 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -135,6 +135,11 @@ msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" msgid "creating new page %s" msgstr "creando nueva página %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "se ha producido un error fatal mientras procesaba la plantilla:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "borrando el directorio.." @@ -265,7 +270,7 @@ msgstr "Añadir un comentario" msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" @@ -343,12 +348,6 @@ msgstr "falta indicar la coincidencia de páginas (match)" msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "se ha producido un error fatal mientras procesaba la plantilla:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "se deben especificar tanto el formato como el texto" @@ -376,8 +375,8 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" @@ -391,6 +390,11 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "ha fallado la compilación del programa %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -421,7 +425,7 @@ msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" @@ -473,12 +477,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "no he encontrado la plantilla %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -512,15 +516,15 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -805,6 +809,16 @@ msgstr "%s es un valor erróneo para un porcentaje" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "confirme el borrado de %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Lista de diferencias truncada)" @@ -999,11 +1013,6 @@ msgstr "creando nueva página %s" msgid "missing id parameter" msgstr "falta el parámetro \"id\"" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "fuente de datos no encontrada" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "falta el código tex" @@ -1027,22 +1036,22 @@ msgstr "complementos" msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1050,7 +1059,7 @@ msgstr "" "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1062,11 +1071,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "no puedo determinar el identificador de un usuario no fiable como %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "el nombre de archivo %s es erróneo" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1188,13 +1192,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "ha fallado la compilación del programa %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1250,21 +1254,31 @@ msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "el nombre de archivo %s es erróneo" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "no he encontrado la plantilla %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1292,6 +1306,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "fuente de datos no encontrada" + #~ msgid "You need to log in first." #~ msgstr "Antes es necesario identificarse." diff --git a/po/fr.po b/po/fr.po index ae2b9f411..c0df34b6a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -131,6 +131,10 @@ msgstr "Plantage du flux XML::Feed !" msgid "creating new page %s" msgstr "Création de la nouvelle page %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "Échec du traitementdu modèle :" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." @@ -256,7 +260,7 @@ msgstr "Commentaire ajouté" msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" @@ -333,11 +337,6 @@ msgstr "correspondance non indiquée" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "Échec du traitementdu modèle :" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "le format et le texte doivent être indiqués" @@ -364,8 +363,8 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" @@ -379,6 +378,11 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "Échec de la compilation de %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +413,7 @@ msgstr "" "Avertissement : le module perl « highlight » n'est pas disponible. " "Continuation malgré tout." -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "htmltidy n'a pas pu analyser cette page html" @@ -460,12 +464,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "Modèle de page %s introuvable" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "Échec du traitementdu modèle :" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -498,15 +502,15 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "sort=meta demande un paramètre." @@ -801,6 +805,16 @@ msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est " "nécessaire." +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "Suppression de %s confirmée" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" @@ -991,11 +1005,6 @@ msgstr "Création de la nouvelle page %s" msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "%s introuvable" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "Il manque le code TeX" @@ -1019,22 +1028,22 @@ msgstr "Greffons %s" msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1051,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1053,11 +1062,6 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "Nom de fichier incorrect %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1085,7 +1089,8 @@ msgstr "%s peut être associé à plusieurs pages source." #: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." -msgstr "recherche de %s pour les dates de modification et de création des fichiers..." +msgstr "" +"recherche de %s pour les dates de modification et de création des fichiers..." #: ../IkiWiki/Render.pm:446 #, perl-format @@ -1180,13 +1185,13 @@ msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1238,21 +1243,31 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "Nom de fichier incorrect %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "Modèle de page %s introuvable" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages : %s" @@ -1277,6 +1292,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "%s not found" +#~ msgstr "%s introuvable" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "" #~ "Reconstruction de toutes les pages pour corriger les titres (greffon " diff --git a/po/gu.po b/po/gu.po index 08107e5b4..b73f51591 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -128,6 +128,11 @@ msgstr "ફીડ ભાંગી ગયું XML::Feed!" msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "ક્રિયા કરવામાં નિષ્ફળ:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -254,7 +259,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -333,12 +338,6 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "ક્રિયા કરવામાં નિષ્ફળ:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -367,8 +366,8 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -382,6 +381,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -410,7 +414,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" @@ -463,12 +467,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "ટેમ્પલેટ %s મળ્યું નહી" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -499,17 +503,17 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -791,6 +795,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -986,11 +1000,6 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "ટેમ્પલેટ %s મળ્યું નહી" - #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1016,26 +1025,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1045,11 +1054,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1165,13 +1169,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1222,21 +1226,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "ટેમ્પલેટ %s મળ્યું નહી" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1261,6 +1275,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "%s not found" +#~ msgstr "ટેમ્પલેટ %s મળ્યું નહી" + #~ msgid "You need to log in first." #~ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 17c313ba8..bca72b108 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-26 23:04-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -129,6 +129,10 @@ msgstr "" msgid "creating new page %s" msgstr "" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -252,7 +256,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -329,11 +333,6 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -360,8 +359,8 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -375,6 +374,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, perl-format +msgid "Failed to revert commit %s" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -403,7 +407,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "" @@ -452,12 +456,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 #, perl-format -msgid "template %s not found" +msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -773,6 +777,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -963,11 +977,6 @@ msgstr "" msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "%s not found" -msgstr "" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -991,26 +1000,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1020,11 +1029,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1197,21 +1201,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 4d6f1d887..657bda7a0 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -128,6 +128,11 @@ msgstr "il notiziario ha fatto andare in crash XML::Feed." msgid "creating new page %s" msgstr "creazione nuova pagina %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "errore nell'elaborazione:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "eliminazione contenitore..." @@ -255,7 +260,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -333,12 +338,6 @@ msgstr "corrispondenza non specificata" msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "errore nell'elaborazione:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "occorre specificare formato e testo" @@ -365,8 +364,8 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" @@ -380,6 +379,11 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "errore nel compilare %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -409,7 +413,7 @@ msgid "" msgstr "" "attenzione: modulo perl highlight non trovato, verrà passato inalterato" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" @@ -460,12 +464,12 @@ msgstr "i parametri %s e %s non possono essere usati insieme" msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "modello %s non trovato" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -498,15 +502,15 @@ msgstr "" msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -801,6 +805,16 @@ msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " "\"donepages\"" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, fuzzy, perl-format +msgid "confirm reversion of %s" +msgstr "conferma rimozione di %s" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff troncato)" @@ -991,11 +1005,6 @@ msgstr "creazione nuova pagina %s" msgid "missing id parameter" msgstr "parametro id mancante" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "notiziario non trovato" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "codice tex mancante" @@ -1019,22 +1028,22 @@ msgstr "plugin" msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1051,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1052,11 +1061,6 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." msgid "cannot determine id of untrusted committer %s" msgstr "impossibile determinare l'id del committer non fidato %s" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "nome file %s scorretto" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1175,13 +1179,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1233,21 +1237,31 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "nome file %s scorretto" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "modello %s non trovato" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -1272,6 +1286,10 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "notiziario non trovato" + #~ msgid "rebuilding all pages to fix meta titles" #~ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" diff --git a/po/pl.po b/po/pl.po index 4bd07b5a6..6a9d973be 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -132,6 +132,11 @@ msgstr "awaria kanału RSS w module XML::Feed!" msgid "creating new page %s" msgstr "tworzenie nowej strony %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "awaria w trakcie przetwarzania:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -258,7 +263,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -337,12 +342,6 @@ msgstr "nieokreślona nazwa pliku osłony" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "awaria w trakcie przetwarzania:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -371,8 +370,8 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -386,6 +385,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "awaria w trakcie kompilowania %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -415,7 +419,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" @@ -470,12 +474,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "nieznaleziony szablon %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -512,17 +516,17 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -804,6 +808,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -1007,11 +1021,6 @@ msgstr "tworzenie nowej strony %s" msgid "missing id parameter" msgstr "brakujący parametr id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "nie znaleziono %s" - #: ../IkiWiki/Plugin/teximg.pm:73 #, fuzzy msgid "missing tex code" @@ -1037,26 +1046,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1066,11 +1075,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "pomijanie nieprawidłowej nazwy pliku %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1186,13 +1190,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1245,21 +1249,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "pomijanie nieprawidłowej nazwy pliku %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "nieznaleziony szablon %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1284,6 +1298,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "nie znaleziono %s" + #~ msgid "You need to log in first." #~ msgstr "Proszę najpierw zalogować się." diff --git a/po/sv.po b/po/sv.po index 1dc8a5f49..1b6d1f2e8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -129,6 +129,11 @@ msgstr "kanalen kraschade XML::Feed!" msgid "creating new page %s" msgstr "skapar nya sidan %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "misslyckades med att behandla mall:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -255,7 +260,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -334,12 +339,6 @@ msgstr "filnamn för wrapper har inte angivits" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "misslyckades med att behandla mall:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -368,8 +367,8 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -383,6 +382,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "misslyckades med att kompilera %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +416,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" @@ -465,12 +469,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "mallen %s hittades inte" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -505,17 +509,17 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -796,6 +800,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -995,11 +1009,6 @@ msgstr "skapar nya sidan %s" msgid "missing id parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "mallen %s hittades inte" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1024,26 +1033,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1053,11 +1062,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "hoppar över felaktigt filnamn %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1173,13 +1177,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1230,21 +1234,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "hoppar över felaktigt filnamn %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "mallen %s hittades inte" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1269,6 +1283,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "mallen %s hittades inte" + #~ msgid "You need to log in first." #~ msgstr "Du måste logga in först." diff --git a/po/tr.po b/po/tr.po index b94039191..aa6884a6f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -125,6 +125,10 @@ msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process template:" +msgstr "" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -248,7 +252,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -325,11 +329,6 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -msgid "failed to process template:" -msgstr "" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -356,8 +355,8 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -371,6 +370,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, perl-format +msgid "Failed to revert commit %s" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -399,7 +403,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 msgid "htmltidy failed to parse this html" msgstr "" @@ -448,12 +452,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 #, perl-format -msgid "template %s not found" +msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -484,15 +488,15 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -769,6 +773,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -959,11 +973,6 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "özet akışı bulunamadı" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -987,26 +996,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1016,11 +1025,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, perl-format -msgid "bad file name %s" -msgstr "" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1136,13 +1140,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1193,21 +1197,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, perl-format msgid "cannot match pages: %s" msgstr "" @@ -1232,5 +1246,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "özet akışı bulunamadı" + #~ msgid "You need to log in first." #~ msgstr "Önce sisteme giriş yapmanız gerekiyor." diff --git a/po/vi.po b/po/vi.po index 1b0bab9b1..59f74e881 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-15 16:30-0400\n" +"POT-Creation-Date: 2010-10-18 16:44-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -130,6 +130,11 @@ msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." msgid "creating new page %s" msgstr "đang tạo trang mới %s" +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#, fuzzy +msgid "failed to process template:" +msgstr "mẫu không xử lý được:" + #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." msgstr "" @@ -256,7 +261,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:269 msgid "you are not logged in as an admin" msgstr "" @@ -334,12 +339,6 @@ msgstr "chưa xác định tên tập tin bộ bao bọc" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 ../IkiWiki/Plugin/inline.pm:339 -#: ../IkiWiki/Plugin/template.pm:44 -#, fuzzy -msgid "failed to process template:" -msgstr "mẫu không xử lý được:" - #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" @@ -368,8 +367,8 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:760 ../IkiWiki/Plugin/git.pm:823 +#: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -383,6 +382,11 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" +#: ../IkiWiki/Plugin/git.pm:854 +#, fuzzy, perl-format +msgid "Failed to revert commit %s" +msgstr "lỗi biên dịch %s" + #: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -412,7 +416,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:50 +#: ../IkiWiki/Plugin/htmltidy.pm:62 #, fuzzy msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" @@ -467,12 +471,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:342 -#, perl-format -msgid "template %s not found" -msgstr "không tìm thấy mẫu %s" +#: ../IkiWiki/Plugin/inline.pm:339 ../IkiWiki/Plugin/template.pm:44 +#, fuzzy, perl-format +msgid "failed to process template %s" +msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/inline.pm:633 +#: ../IkiWiki/Plugin/inline.pm:630 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -505,17 +509,17 @@ msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » ( msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:217 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:227 +#: ../IkiWiki/Plugin/meta.pm:231 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:396 +#: ../IkiWiki/Plugin/meta.pm:400 msgid "sort=meta requires a parameter" msgstr "" @@ -796,6 +800,16 @@ msgstr "" msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:104 +#, perl-format +msgid "This reverts commit %s" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:123 +#, perl-format +msgid "confirm reversion of %s" +msgstr "" + #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "" @@ -995,11 +1009,6 @@ msgstr "đang tạo trang mới %s" msgid "missing id parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/template.pm:47 -#, fuzzy, perl-format -msgid "%s not found" -msgstr "không tìm thấy mẫu %s" - #: ../IkiWiki/Plugin/teximg.pm:73 msgid "missing tex code" msgstr "" @@ -1024,26 +1033,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/websetup.pm:273 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:288 +#: ../IkiWiki/Plugin/websetup.pm:289 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:431 +#: ../IkiWiki/Plugin/websetup.pm:433 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:437 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:472 +#: ../IkiWiki/Plugin/websetup.pm:474 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1053,11 +1062,6 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format -msgid "bad file name %s" -msgstr "đang bỏ qua tên tập tin sai %s" - #: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" @@ -1173,13 +1177,13 @@ msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:219 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:238 +#: ../IkiWiki/Wrapper.pm:239 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1231,21 +1235,31 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:2053 +#: ../IkiWiki.pm:1536 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "đang bỏ qua tên tập tin sai %s" + +#: ../IkiWiki.pm:1836 +#, perl-format +msgid "template %s not found" +msgstr "không tìm thấy mẫu %s" + +#: ../IkiWiki.pm:2118 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2130 +#: ../IkiWiki.pm:2195 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2151 +#: ../IkiWiki.pm:2216 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2287 +#: ../IkiWiki.pm:2352 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1270,6 +1284,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "%s not found" +#~ msgstr "không tìm thấy mẫu %s" + #~ msgid "You need to log in first." #~ msgstr "Trước tiên bạn cần phải đăng nhập." -- cgit v1.2.3 From 1c5a3f2c67c153a57439bce02f320e6e950a58ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 15:25:29 -0400 Subject: Fix typo that broke anonymous git push. --- IkiWiki/Receive.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 225f2b9ab..c73adfbbb 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -73,7 +73,7 @@ sub test () { }) || error("failed adding user"); } - check_canchange( + IkiWiki::check_canchange( cgi => $cgi, session => $session, changes => [IkiWiki::rcs_receive()] diff --git a/debian/changelog b/debian/changelog index 951e59c9a..3f649a2ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20101020) UNRELEASED; urgency=low + + * Fix typo that broke anonymous git push. + + -- Joey Hess Sat, 23 Oct 2010 15:25:19 -0400 + ikiwiki (3.20101019) unstable; urgency=low * Fix test suite failure on other side of date line. -- cgit v1.2.3 From 9ca9959eda17ca85ca1550353d09ee33f6bb0469 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 16:19:16 -0400 Subject: fix web reversion when the srcdir is in a subdir of the git repo. --- IkiWiki/Plugin/git.pm | 35 +++++++++++++++++++++++------------ debian/changelog | 1 + 2 files changed, 24 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index e89813253..892b711d8 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -9,7 +9,7 @@ use open qw{:utf8 :std}; my $sha1_pattern = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums my $dummy_commit_msg = 'dummy commit'; # message to skip in recent changes -my $no_chdir=0; +my $git_dir=undef; sub import { hook(type => "checkconfig", id => "git", call => \&checkconfig); @@ -164,9 +164,13 @@ sub safe_git (&@) { if (!$pid) { # In child. # Git commands want to be in wc. - if (! $no_chdir) { + if (! defined $git_dir) { chdir $config{srcdir} - or error("Cannot chdir to $config{srcdir}: $!"); + or error("cannot chdir to $config{srcdir}: $!"); + } + else { + chdir $git_dir + or error("cannot chdir to $git_dir: $!"); } exec @cmdline or error("Cannot exec '@cmdline': $!"); } @@ -721,14 +725,13 @@ sub rcs_getmtime ($) { } { -my $git_root; - +my $ret; sub git_find_root { # The wiki may not be the only thing in the git repo. # Determine if it is in a subdirectory by examining the srcdir, # and its parents, looking for the .git directory. - return $git_root if defined $git_root; + return @$ret if defined $ret; my $subdir=""; my $dir=$config{srcdir}; @@ -740,7 +743,8 @@ sub git_find_root { } } - return $git_root=$subdir; + $ret=[$subdir, $dir]; + return @$ret; } } @@ -748,7 +752,7 @@ sub git_find_root { sub git_parse_changes { my @changes = @_; - my $subdir = git_find_root(); + my ($subdir, $rootdir) = git_find_root(); my @rets; foreach my $ci (@changes) { foreach my $detail (@{ $ci->{'details'} }) { @@ -794,8 +798,8 @@ sub git_parse_changes { die $@ if $@; my $fh; ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); - my $cmd = ($no_chdir ? '' : "cd $config{srcdir} && ") - . "git show $detail->{sha1_to} > '$path'"; + my $cmd = "cd $git_dir && ". + "git show $detail->{sha1_to} > '$path'"; if (system($cmd) != 0) { error("failed writing temp file '$path'."); } @@ -825,10 +829,12 @@ sub rcs_receive () { # Avoid chdir when running git here, because the changes # are in the master git repo, not the srcdir repo. + # (Also, if a subdir is involved, we don't want to chdir to + # it and only see changes in it.) # The pre-receive hook already puts us in the right place. - $no_chdir=1; + $git_dir="."; push @rets, git_parse_changes(git_commit_info($oldrev."..".$newrev)); - $no_chdir=0; + $git_dir=undef; } return reverse @rets; @@ -838,7 +844,12 @@ sub rcs_preprevert ($) { my $rev=shift; my ($sha1) = $rev =~ /^($sha1_pattern)$/; # untaint + # Examine changes from root of git repo, not from any subdir, + # in order to see all changes. + my ($subdir, $rootdir) = git_find_root(); + $git_dir=$rootdir; return git_parse_changes(git_commit_info($sha1, 1)); + $git_dir=undef; } sub rcs_revert ($) { diff --git a/debian/changelog b/debian/changelog index 3f649a2ce..cee42dc85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20101020) UNRELEASED; urgency=low * Fix typo that broke anonymous git push. + * fix web reversion when the srcdir is in a subdir of the git repo. -- Joey Hess Sat, 23 Oct 2010 15:25:19 -0400 -- cgit v1.2.3 From 5db2d6f6b224872b119535d57e675d12a2c7dfe1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 23 Oct 2010 17:13:04 -0400 Subject: nice message if someone tries to revert a merge commit --- IkiWiki/Plugin/git.pm | 15 +++++++++++++-- debian/changelog | 6 +++--- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index f8e16859b..f5101d904 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -848,9 +848,20 @@ sub rcs_preprevert ($) { # in order to see all changes. my ($subdir, $rootdir) = git_find_root(); $git_dir=$rootdir; - my @ret=git_parse_changes(git_commit_info($sha1, 1)); + my @commits=git_commit_info($sha1, 1); $git_dir=undef; - return @ret; + + if (! @commits) { + error "unknown commit"; # just in case + } + + # git revert will fail on merge commits. Add a nice message. + if (exists $commits[0]->{parents} && + @{$commits[0]->{parents}} > 1) { + error gettext("you are not allowed to revert a merge"); + } + + return git_parse_changes(@commits); } sub rcs_revert ($) { diff --git a/debian/changelog b/debian/changelog index cee42dc85..b304e4b86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -ikiwiki (3.20101020) UNRELEASED; urgency=low +ikiwiki (3.20101023) unstable; urgency=low * Fix typo that broke anonymous git push. - * fix web reversion when the srcdir is in a subdir of the git repo. + * Fix web reversion when the srcdir is in a subdir of the git repo. - -- Joey Hess Sat, 23 Oct 2010 15:25:19 -0400 + -- Joey Hess Sat, 23 Oct 2010 16:36:50 -0400 ikiwiki (3.20101019) unstable; urgency=low -- cgit v1.2.3 From 2076ed597c02bfede9063c3d40f4b855d4e8f8b8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Oct 2010 22:37:34 -0400 Subject: txt: Fix display when used inside a format directive. txt's use of a format hook can't work in that case, so it needs to use a htmlizeformat hook in this case to handle wrapping the text in pre tags. --- IkiWiki/Plugin/format.pm | 24 +++++++++++++----------- IkiWiki/Plugin/highlight.pm | 6 +++--- IkiWiki/Plugin/txt.pm | 38 ++++++++++++++++++++++++++++---------- debian/changelog | 6 ++++++ 4 files changed, 50 insertions(+), 24 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm index d54e71131..b596bc0a1 100644 --- a/IkiWiki/Plugin/format.pm +++ b/IkiWiki/Plugin/format.pm @@ -29,22 +29,24 @@ sub preprocess (@) { if (! defined $format || ! defined $text) { error(gettext("must specify format and text")); } + + # Other plugins can register htmlizeformat hooks to add support + # for page types not suitable for htmlize, or that need special + # processing when included via format. Try them until one succeeds. + my $ret; + IkiWiki::run_hooks(htmlizeformat => sub { + $ret=shift->($format, $text) + unless defined $ret; + }); + + if (defined $ret) { + return $ret; + } elsif (exists $IkiWiki::hooks{htmlize}{$format}) { return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text); } else { - # Other plugins can register htmlizefallback - # hooks to add support for page types - # not suitable for htmlize. Try them until - # one succeeds. - my $ret; - IkiWiki::run_hooks(htmlizefallback => sub { - $ret=shift->($format, $text) - unless defined $ret; - }); - return $ret if defined $ret; - error(sprintf(gettext("unsupported page format %s"), $format)); } } diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index d4ade0a7b..5674f0b4a 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -10,8 +10,8 @@ sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); # this hook is used by the format plugin - hook(type => "htmlizefallback", id => "highlight", call => - \&htmlizefallback); + hook(type => "htmlizeformat", id => "highlight", call => + \&htmlizeformat); } sub getsetup () { @@ -79,7 +79,7 @@ sub checkconfig () { } } -sub htmlizefallback { +sub htmlizeformat { my $format=lc shift; my $langfile=ext2langfile($format); diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm index 0d9a0b35b..fcfb68be9 100644 --- a/IkiWiki/Plugin/txt.pm +++ b/IkiWiki/Plugin/txt.pm @@ -17,6 +17,7 @@ sub import { hook(type => "getsetup", id => "txt", call => \&getsetup); hook(type => "filter", id => "txt", call => \&filter); hook(type => "htmlize", id => "txt", call => \&htmlize); + hook(type => "htmlizeformat", id => "txt", call => \&htmlizeformat); eval q{use URI::Find}; if (! $@) { @@ -46,25 +47,42 @@ sub filter (@) { will_render($params{page}, 'robots.txt'); writefile('robots.txt', $config{destdir}, $content); } - - encode_entities($content, "<>&"); - if ($findurl) { - my $finder = URI::Find->new(sub { - my ($uri, $orig_uri) = @_; - return qq|$orig_uri|; - }); - $finder->find(\$content); - } - $content = "
" . $content . "
"; + return txt2html($content); } return $content; } +sub txt2html ($) { + my $content=shift; + + encode_entities($content, "<>&"); + if ($findurl) { + my $finder = URI::Find->new(sub { + my ($uri, $orig_uri) = @_; + return qq|$orig_uri|; + }); + $finder->find(\$content); + } + return "
" . $content . "
"; +} + # We need this to register the .txt file extension sub htmlize (@) { my %params=@_; return $params{content}; } +sub htmlizeformat ($$) { + my $format=shift; + my $content=shift; + + if ($format eq 'txt') { + return txt2html($content); + } + else { + return; + } +} + 1 diff --git a/debian/changelog b/debian/changelog index b304e4b86..2857ec482 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20101024) UNRELEASED; urgency=low + + * txt: Fix display when used inside a format directive. + + -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 + ikiwiki (3.20101023) unstable; urgency=low * Fix typo that broke anonymous git push. -- cgit v1.2.3 From 5c6eb167b8e69e0607330f06c893a73dfe1c675a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Oct 2010 23:00:32 -0400 Subject: highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties. --- IkiWiki/Plugin/highlight.pm | 5 +++-- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 5674f0b4a..872537c72 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -10,8 +10,8 @@ sub import { hook(type => "getsetup", id => "highlight", call => \&getsetup); hook(type => "checkconfig", id => "highlight", call => \&checkconfig); # this hook is used by the format plugin - hook(type => "htmlizeformat", id => "highlight", call => - \&htmlizeformat); + hook(type => "htmlizeformat", id => "highlight", + call => \&htmlizeformat, last => 1); } sub getsetup () { @@ -74,6 +74,7 @@ sub checkconfig () { }, longname => sprintf(gettext("Source code: %s"), $file), @opts, + last => 1, ); } } diff --git a/debian/changelog b/debian/changelog index 2857ec482..f6ca122a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * txt: Fix display when used inside a format directive. + * highlight: Ensure that other, more-specific format plugins, + like txt are used in preference to this one in case of ties. -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 49865d551294f2fbf24458aa7fa4f8ddc441ce1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 30 Oct 2010 22:03:02 -0400 Subject: changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f6ca122a0..45971e593 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * txt: Fix display when used inside a format directive. * highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties. + * htmltidy: Add missing checkconfig hook registration. Closes: #601912 -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 0a0366b8c6d280fff06e4edd5639dd57605a86e0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Oct 2010 10:12:28 -0400 Subject: changelog --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 45971e593..d2f0c334e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * txt: Fix display when used inside a format directive. * highlight: Ensure that other, more-specific format plugins, like txt are used in preference to this one in case of ties. - * htmltidy: Add missing checkconfig hook registration. Closes: #601912 + * htmltidy, sortnaturally: Add missing checkconfig hook + registration. Closes: #601912 -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 0c18b347aa286647ee5d3bdb36653ef3585ba61f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 31 Oct 2010 16:07:54 -0400 Subject: changelog --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d2f0c334e..59d7eb761 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low like txt are used in preference to this one in case of ties. * htmltidy, sortnaturally: Add missing checkconfig hook registration. Closes: #601912 + (Thanks, Craig Lennox and Tuomas Jormola) + * git: Use author date, not committer date. Closes: #602012 + (Thanks, Tuomas Jormola) -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 289b30a47d548326aad9c1dc5252fc0269494c87 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Nov 2010 23:59:24 -0400 Subject: Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined into. Should allow setting to "* and !comment(*)" to scrub comments, but leave your blog posts unscrubbed, etc. --- IkiWiki/Plugin/htmlscrubber.pm | 4 ++-- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 927792f79..a58a27d52 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -57,8 +57,8 @@ sub sanitize (@) { if (exists $config{htmlscrubber_skip} && length $config{htmlscrubber_skip} && - exists $params{destpage} && - pagespec_match($params{destpage}, $config{htmlscrubber_skip})) { + exists $params{page} && + pagespec_match($params{page}, $config{htmlscrubber_skip})) { return $params{content}; } diff --git a/debian/changelog b/debian/changelog index 59d7eb761..63e13896e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low (Thanks, Craig Lennox and Tuomas Jormola) * git: Use author date, not committer date. Closes: #602012 (Thanks, Tuomas Jormola) + * Fix htmlscrubber_skip to be matched on the source page, not the page it is + inlined into. Should allow setting to "* and !comment(*)" to scrub + comments, but leave your blog posts unscrubbed, etc. -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 78de33d2eaf8a187b610685f70e60b7d5946374f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Nov 2010 00:25:31 -0400 Subject: comments: Make postcomment() pagespec work when previewing a comment. --- IkiWiki/Plugin/comments.pm | 6 ++++++ debian/changelog | 2 ++ 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 851f4862e..57f5b1304 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -727,6 +727,10 @@ sub previewcomment ($$$) { my $page=shift; my $time=shift; + # Previewing a comment should implicitly enable comment posting mode. + my $oldpostcomment=$postcomment; + $postcomment=1; + my $preview = IkiWiki::htmlize($location, $page, '_comment', IkiWiki::linkify($location, $page, IkiWiki::preprocess($location, $page, @@ -745,6 +749,8 @@ sub previewcomment ($$$) { $template->param(have_actions => 0); + $postcomment=$oldpostcomment; + return $template->output; } diff --git a/debian/changelog b/debian/changelog index 63e13896e..91a678805 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined into. Should allow setting to "* and !comment(*)" to scrub comments, but leave your blog posts unscrubbed, etc. + * comments: Make postcomment() pagespec work when previewing a comment, + including during moderation. -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From d8de98911ec98f9e4560ab2939b4edf8fb04066b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Nov 2010 00:36:03 -0400 Subject: comments: Make comment() pagespec also match comments that are being posted. --- IkiWiki/Plugin/comments.pm | 18 ++++++++++-------- debian/changelog | 2 ++ 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 57f5b1304..a39dab36c 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -947,14 +947,16 @@ sub match_comment ($$;@) { my $page = shift; my $glob = shift; - # To see if it's a comment, check the source file type. - # Deal with comments that were just deleted. - my $source=exists $IkiWiki::pagesources{$page} ? - $IkiWiki::pagesources{$page} : - $IkiWiki::delpagesources{$page}; - my $type=defined $source ? IkiWiki::pagetype($source) : undef; - if (! defined $type || $type ne "_comment") { - return IkiWiki::FailReason->new("$page is not a comment"); + if (! $postcomment) { + # To see if it's a comment, check the source file type. + # Deal with comments that were just deleted. + my $source=exists $IkiWiki::pagesources{$page} ? + $IkiWiki::pagesources{$page} : + $IkiWiki::delpagesources{$page}; + my $type=defined $source ? IkiWiki::pagetype($source) : undef; + if (! defined $type || $type ne "_comment") { + return IkiWiki::FailReason->new("$page is not a comment"); + } } return match_glob($page, "$glob/*", internal => 1, @_); diff --git a/debian/changelog b/debian/changelog index 91a678805..2c4c9274a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low comments, but leave your blog posts unscrubbed, etc. * comments: Make postcomment() pagespec work when previewing a comment, including during moderation. + * comments: Make comment() pagespec also match comments that are being + posted. -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 -- cgit v1.2.3 From 5dbf25127fb776cc52a3a142b805a0c7f3cef242 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Nov 2010 00:45:00 -0400 Subject: releasing version 3.20101112 --- debian/changelog | 4 ++-- doc/security.mdwn | 2 +- ikiwiki.spec | 2 +- po/ikiwiki.pot | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2c4c9274a..f8dc04eca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20101024) UNRELEASED; urgency=low +ikiwiki (3.20101112) unstable; urgency=HIGH * txt: Fix display when used inside a format directive. * highlight: Ensure that other, more-specific format plugins, @@ -16,7 +16,7 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low * comments: Make comment() pagespec also match comments that are being posted. - -- Joey Hess Mon, 25 Oct 2010 22:30:29 -0400 + -- Joey Hess Fri, 12 Nov 2010 00:36:06 -0400 ikiwiki (3.20101023) unstable; urgency=low diff --git a/doc/security.mdwn b/doc/security.mdwn index 33b199247..2c342b199 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -449,7 +449,7 @@ of eg, blog posts. Confusingly, setting it to "* and !comment(*)" did not scrub comments. Additionally, it was discovered that comments' html was never scrubbed during -preview or moderation of comments. +preview or moderation of comments with such a configuration. These problems were discovered on 12 November 2010 and fixed the same hour with the release of ikiwiki 3.20101112. diff --git a/ikiwiki.spec b/ikiwiki.spec index 7653ac671..5ef43903d 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101023 +Version: 3.20101112 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index fa65b6f93..e4274d0f6 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-23 17:21-0400\n" +"POT-Creation-Date: 2010-11-12 00:37-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -203,7 +203,7 @@ msgstr "" msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" @@ -268,7 +268,7 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:822 +#: ../IkiWiki/Plugin/comments.pm:828 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -278,7 +278,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:832 +#: ../IkiWiki/Plugin/comments.pm:838 msgid "Comment" msgstr "" @@ -411,7 +411,7 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/htmltidy.pm:62 +#: ../IkiWiki/Plugin/htmltidy.pm:63 msgid "htmltidy failed to parse this html" msgstr "" -- cgit v1.2.3 From 5f750e16b8c32d2fd69209f433e7d19efa53a71f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Nov 2010 10:25:21 -0400 Subject: CVE id --- debian/changelog | 6 +++--- doc/security.mdwn | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f8dc04eca..582a8e36a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,11 +10,11 @@ ikiwiki (3.20101112) unstable; urgency=HIGH (Thanks, Tuomas Jormola) * Fix htmlscrubber_skip to be matched on the source page, not the page it is inlined into. Should allow setting to "* and !comment(*)" to scrub - comments, but leave your blog posts unscrubbed, etc. + comments, but leave your blog posts unscrubbed, etc. CVE-2010-1673 * comments: Make postcomment() pagespec work when previewing a comment, - including during moderation. + including during moderation. CVE-2010-1673 * comments: Make comment() pagespec also match comments that are being - posted. + posted. CVE-2010-1673 -- Joey Hess Fri, 12 Nov 2010 00:36:06 -0400 diff --git a/doc/security.mdwn b/doc/security.mdwn index 2c342b199..4fa531eb1 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -452,4 +452,4 @@ Additionally, it was discovered that comments' html was never scrubbed during preview or moderation of comments with such a configuration. These problems were discovered on 12 November 2010 and fixed the same -hour with the release of ikiwiki 3.20101112. +hour with the release of ikiwiki 3.20101112. ([[!cve CVE-2010-1673]]) -- cgit v1.2.3 From b85ca8603aecbd3523201d99edf019db1094b558 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 14:24:15 -0400 Subject: websetup: Fix encoding problem when restoring old setup file. --- IkiWiki/Plugin/websetup.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 0ab18997c..9c032fdc6 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -475,7 +475,7 @@ sub showform ($$) { join(" ", @command), $ret). '

'; open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!"); - print OUT $oldsetup; + print OUT Encode::encode_utf8($oldsetup); close OUT; } diff --git a/debian/changelog b/debian/changelog index 582a8e36a..91ff0964b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20101113) UNRELEASED; urgency=low + + * websetup: Fix encoding problem when restoring old setup file. + + -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 + ikiwiki (3.20101112) unstable; urgency=HIGH * txt: Fix display when used inside a format directive. -- cgit v1.2.3 From ec6c1269d251c78d2eef68cb789de6cfc6272464 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 15:00:04 -0400 Subject: more: Add pages parameter to limit where the more is displayed. (thanks, dark) --- IkiWiki/Plugin/more.pm | 5 ++++- debian/changelog | 2 ++ doc/ikiwiki/directive/more.mdwn | 5 +++++ doc/todo/selective_more_directive.mdwn | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/more.pm b/IkiWiki/Plugin/more.pm index 80e339a1b..6880e366d 100644 --- a/IkiWiki/Plugin/more.pm +++ b/IkiWiki/Plugin/more.pm @@ -26,7 +26,10 @@ sub preprocess (@) { $params{linktext} = $linktext unless defined $params{linktext}; - if ($params{page} ne $params{destpage}) { + if ($params{page} ne $params{destpage} && + (! exists $params{pages} || + pagespec_match($params{destpage}, $params{pages}, + location => $params{page}))) { return "\n". htmllink($params{page}, $params{destpage}, $params{page}, linktext => $params{linktext}, diff --git a/debian/changelog b/debian/changelog index 91ff0964b..faabf1993 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * websetup: Fix encoding problem when restoring old setup file. + * more: Add pages parameter to limit where the more is displayed. + (thanks, dark) -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 diff --git a/doc/ikiwiki/directive/more.mdwn b/doc/ikiwiki/directive/more.mdwn index 506551910..bda1427f3 100644 --- a/doc/ikiwiki/directive/more.mdwn +++ b/doc/ikiwiki/directive/more.mdwn @@ -11,6 +11,11 @@ leads to the full version of the page. Use it like this: If the `linktext` parameter is omitted it defaults to just "more". +An optional `pages` parameter can be used to specify a +[[ikiwiki/PageSpec]], and then the "more" link will only be displayed +when the page is inlined into a page matching that PageSpec, and otherwise +the full content shown. + Note that you can accomplish something similar using a [[toggle]] instead. [[!meta robots="noindex, follow"]] diff --git a/doc/todo/selective_more_directive.mdwn b/doc/todo/selective_more_directive.mdwn index 24e6ab568..2a9998205 100644 --- a/doc/todo/selective_more_directive.mdwn +++ b/doc/todo/selective_more_directive.mdwn @@ -24,3 +24,5 @@ I can now call it as I'm not entirely happy with the design, since I would rather put this information in the inline directive instead of in every story post. Unfortunately I found no way to pass parameters from the inline directive to the inlined page. -- [[dark]] + +> Me neither, but nor do I see a better way, so [[applied|done]]. --[[Joey]] -- cgit v1.2.3 From cedf2c0af568d801fe2cf1917ac0202ce64f838b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 15:12:52 -0400 Subject: Fix escaping of filenames in historyurl. (Thanks, aj) --- IkiWiki/Render.pm | 4 ++-- debian/changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 7ea919abc..8e8336b99 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -5,7 +5,6 @@ package IkiWiki; use warnings; use strict; use IkiWiki; -use Encode; my (%backlinks, %rendered); our %brokenlinks; @@ -94,7 +93,8 @@ sub genpage ($$) { } if (defined $config{historyurl} && length $config{historyurl}) { my $u=$config{historyurl}; - $u=~s/\[\[file\]\]/$pagesources{$page}/g; + my $p=uri_escape_utf8($pagesources{$page}); + $u=~s/\[\[file\]\]/$p/g; $template->param(historyurl => $u); $actions++; } diff --git a/debian/changelog b/debian/changelog index faabf1993..00c32e95d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * websetup: Fix encoding problem when restoring old setup file. * more: Add pages parameter to limit where the more is displayed. (thanks, dark) + * Fix escaping of filenames in historyurl. (Thanks, aj) -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 -- cgit v1.2.3 From b00c6c9640453bf1407c4e880ef0c171388197c7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Nov 2010 16:57:50 -0400 Subject: inline: Improve RSS url munging to use a proper html parser and support all elements that HTML::Tagset knows about. (Which doesn't include html5 just yet, but then the old version didn't either.) Bonus: 4 times faster than old regexp method. --- IkiWiki/Plugin/inline.pm | 63 ++++++++++++++++++++++++++++++++++++------------ debian/changelog | 4 +++ 2 files changed, 52 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 3b98bf8dd..1fe40a5ea 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -506,26 +506,59 @@ sub date_822 ($) { } sub absolute_urls ($$) { - # sucky sub because rss sucks - my $content=shift; + # needed because rss sucks + my $html=shift; my $baseurl=shift; my $url=$baseurl; $url=~s/[^\/]+$//; + my $urltop; # calculated if needed - # what is the non path part of the url? - my $top_uri = URI->new($url); - $top_uri->path_query(""); # reset the path - my $urltop = $top_uri->as_string; - - $content=~s/(new(api_version => 3); + $p->handler(default => sub { $ret.=join("", @_) }, "text"); + $p->handler(start => sub { + my ($tagname, $pos, $text) = @_; + if (ref $HTML::Tagset::linkElements{$tagname}) { + while (4 <= @$pos) { + # use attribute sets from right to left + # to avoid invalidating the offsets + # when replacing the values + my ($k_offset, $k_len, $v_offset, $v_len) = + splice(@$pos, -4); + my $attrname = lc(substr($text, $k_offset, $k_len)); + next unless grep { $_ eq $attrname } @{$HTML::Tagset::linkElements{$tagname}}; + next unless $v_offset; # 0 v_offset means no value + my $v = substr($text, $v_offset, $v_len); + $v =~ s/^([\'\"])(.*)\1$/$2/; + if ($v=~/^#/) { + $v=$baseurl.$v; # anchor + } + elsif ($v=~/^(?!\w+:)[^\/]/) { + $v=$url.$v; # relative url + } + elsif ($v=~/^\//) { + if (! defined $urltop) { + # what is the non path part of the url? + my $top_uri = URI->new($url); + $top_uri->path_query(""); # reset the path + $urltop = $top_uri->as_string; + } + $v=$urltop.$v; # url relative to top of site + } + $v =~ s/\"/"/g; # since we quote with "" + substr($text, $v_offset, $v_len) = qq("$v"); + } + } + $ret.=$text; + }, "tagname, tokenpos, text"); + $p->parse($html); + $p->eof; + + return $ret; } sub genfeed ($$$$$@) { diff --git a/debian/changelog b/debian/changelog index 00c32e95d..0edb78004 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * more: Add pages parameter to limit where the more is displayed. (thanks, dark) * Fix escaping of filenames in historyurl. (Thanks, aj) + * inline: Improve RSS url munging to use a proper html parser, + and support all elements that HTML::Tagset knows about. + (Which doesn't include html5 just yet, but then the old version + didn't either.) Bonus: 4 times faster than old regexp method. -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 -- cgit v1.2.3 From f8f8770a652520b2f09eb2262510a04a8e353e9d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 Nov 2010 12:28:22 -0400 Subject: smcv/ready/glob-cache merged --- debian/changelog | 1 + doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0edb78004..65c235317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low and support all elements that HTML::Tagset knows about. (Which doesn't include html5 just yet, but then the old version didn't either.) Bonus: 4 times faster than old regexp method. + * Optimise glob() pagespec. (Thanks, Kathryn and smcv) -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 diff --git a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn index 4fe14540f..4e1df3381 100644 --- a/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn +++ b/doc/todo/Improving_the_efficiency_of_match__95__glob.mdwn @@ -57,6 +57,8 @@ Here's my patch - please consider it! -- [[KathrynAndersen]] >>>>>>> representative. >>>>>>> --[[smcv]] +[[done]] --[[Joey]] + -------------------------------------------------------------- [[!toggle id="smcv-benchmark" text="current benchmarks"]] -- cgit v1.2.3 From af5f162ca7c8cd14d64f6282e05a3032dbd7c2fb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 Nov 2010 12:55:26 -0400 Subject: highlight: Support new format of filetypes.conf used by version 3.2 of the highlight package. --- IkiWiki/Plugin/highlight.pm | 27 +++++++++++++++++++++------ debian/changelog | 2 ++ 2 files changed, 23 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 934e64bed..9d05e9fcf 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -96,14 +96,29 @@ my %highlighters; # Parse highlight's config file to get extension => language mappings. sub read_filetypes () { - open (IN, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!"); - while () { - chomp; - if (/^\$ext\((.*)\)=(.*)$/) { - $ext2lang{$_}=$1 foreach $1, split ' ', $2; + open (my $f, $config{filetypes_conf}) || error("$config{filetypes_conf}: $!"); + local $/=undef; + my $config=<$f>; + close $f; + + # highlight >= 3.2 format (bind-style) + while ($config=~m/Lang\s*=\s*\"([^"]+)\"[,\s]+Extensions\s*=\s*{([^}]+)}/sg) { + my $lang=$1; + foreach my $bit (split ',', $2) { + $bit=~s/.*"(.*)".*/$1/s; + $ext2lang{$bit}=$lang; } } - close IN; + + # highlight < 3.2 format + if (! keys %ext2lang) { + foreach (split("\n", $config)) { + if (/^\$ext\((.*)\)=(.*)$/) { + $ext2lang{$_}=$1 foreach $1, split ' ', $2; + } + } + } + $filetypes_read=1; } diff --git a/debian/changelog b/debian/changelog index 65c235317..ecd028a0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low (Which doesn't include html5 just yet, but then the old version didn't either.) Bonus: 4 times faster than old regexp method. * Optimise glob() pagespec. (Thanks, Kathryn and smcv) + * highlight: Support new format of filetypes.conf used by version 3.2 + of the highlight package. -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 -- cgit v1.2.3 From 31f0e459b8143cd986f04d122d255f4d0f44a505 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 20 Nov 2010 14:54:43 -0400 Subject: edittemplate: Fix crash if using a .tmpl file or other non-page file as a template for a new page. --- IkiWiki/Plugin/edittemplate.pm | 6 ++++-- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 576c94be4..061242fd8 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -107,9 +107,11 @@ sub formbuilder (@) { my $template=$pagestate{$registering_page}{edittemplate}{$pagespec}; $form->field(name => "editcontent", value => filltemplate($template, $page)); - $form->field(name => "type", - value => pagetype($pagesources{$template})) + my $type=pagetype($pagesources{$template}) if $pagesources{$template}; + $form->field(name => "type", + value => $type) + if defined $type; return; } } diff --git a/debian/changelog b/debian/changelog index ecd028a0c..d236361d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * Optimise glob() pagespec. (Thanks, Kathryn and smcv) * highlight: Support new format of filetypes.conf used by version 3.2 of the highlight package. + * edittemplate: Fix crash if using a .tmpl file or other non-page file + as a template for a new page. -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 -- cgit v1.2.3 From 78a22e2eb2d3b963c48067367f6ded5da061eb81 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Nov 2010 12:01:50 -0400 Subject: git: Fix temp file location. --- IkiWiki/Plugin/git.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 3fa29b22f..39d88d002 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -797,7 +797,7 @@ sub git_parse_changes { eval q{use File::Temp}; die $@ if $@; my $fh; - ($fh, $path)=File::Temp::tempfile("XXXXXXXXXX", UNLINK => 1); + ($fh, $path)=File::Temp::tempfile(undef, UNLINK => 1); my $cmd = "cd $git_dir && ". "git show $detail->{sha1_to} > '$path'"; if (system($cmd) != 0) { diff --git a/debian/changelog b/debian/changelog index d236361d2..6f97399d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low of the highlight package. * edittemplate: Fix crash if using a .tmpl file or other non-page file as a template for a new page. + * git: Fix temp file location. -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 -- cgit v1.2.3 From a5120846cb6461616dce4d0042a4fd45211170e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Nov 2010 13:28:28 -0400 Subject: rename: Fix to pass named parameters to rcs_commit --- IkiWiki/Plugin/rename.pm | 9 ++++----- debian/changelog | 1 + doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn | 7 +++++++ doc/bugs/rename_fixup_not_attributed_to_author.mdwn | 3 +++ 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index ad5e72645..a05e85be0 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -574,11 +574,10 @@ sub fixlinks ($$$) { eval { writefile($file, $config{srcdir}, $content) }; next if $@; my $conflict=IkiWiki::rcs_commit( - $file, - sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}), - $token, - $session->param("name"), - $session->remote_addr(), + file => $file, + message => sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}), + token => $token, + session => $session, ); push @fixedlinks, $page if ! defined $conflict; } diff --git a/debian/changelog b/debian/changelog index 6f97399d8..bab5eeb88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low * edittemplate: Fix crash if using a .tmpl file or other non-page file as a template for a new page. * git: Fix temp file location. + * rename: Fix to pass named parameters to rcs_commit. -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn index 1b6eeb2a5..829e80327 100644 --- a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn +++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn @@ -9,3 +9,10 @@ I'm unsure yet why the recentchanges files were being committed. Possibly because of the link fixup code run when renaming a page. --[[Joey]] > See also [[bugs/rename fixup not attributed to author]]. --[[smcv]] + +> Ok, there was a call to `rcs_commit` that was still using non-named +> parameters, which confused it thuroughly, and I think caused +> 'git add .' to be called. I've fixed that. +> +> I think there is still potential for the problem I described above to +> occur during a rename or possibly otherwise. --[[Joey]] diff --git a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn index 3122307a2..bcfafac22 100644 --- a/doc/bugs/rename_fixup_not_attributed_to_author.mdwn +++ b/doc/bugs/rename_fixup_not_attributed_to_author.mdwn @@ -7,3 +7,6 @@ and didn't set a commit message. been committed, for which see [[bugs/git_commit_adds_files_that_were_not_tracked]].) --[[smcv]] + +> It was calling `rcs_commit` old-style, and so not passing the session +> object that is used to get the user's name. [[fixed|done]] --[[Joey]] -- cgit v1.2.3 From 170cb0247926d0b7c736e61b2ff66d6a3095f271 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Nov 2010 13:42:03 -0400 Subject: git: Avoid adding files when committing, so as not to implicitly add files like recentchanges files that are not normally checked in, when fixing links after rename. --- IkiWiki/Plugin/git.pm | 20 +++++++++++--------- debian/changelog | 3 +++ .../git_commit_adds_files_that_were_not_tracked.mdwn | 3 ++- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 39d88d002..3db4af729 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -496,16 +496,16 @@ sub rcs_commit (@) { return $conflict if defined $conflict; } - rcs_add($params{file}); - return rcs_commit_staged( - message => $params{message}, - session => $params{session}, - ); + return rcs_commit_helper(@_); } sub rcs_commit_staged (@) { # Commits all staged changes. Changes can be staged using rcs_add, # rcs_remove, and rcs_rename. + return rcs_commit_helper(@_); +} + +sub rcs_commit_helper (@) { my %params=@_; my %env=%ENV; @@ -546,10 +546,12 @@ sub rcs_commit_staged (@) { $params{message}.="."; } } - push @opts, '-q'; - # git commit returns non-zero if file has not been really changed. - # so we should ignore its exit status (hence run_or_non). - if (run_or_non('git', 'commit', @opts, '-m', $params{message})) { + if (exists $params{file}) { + push @opts, '--', $params{file}; + } + # git commit returns non-zero if nothing really changed. + # So we should ignore its exit status (hence run_or_non). + if (run_or_non('git', 'commit', '-m', $params{message}, '-q', @opts)) { if (length $config{gitorigin_branch}) { run_or_cry('git', 'push', $config{gitorigin_branch}); } diff --git a/debian/changelog b/debian/changelog index bab5eeb88..1ae992b7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low as a template for a new page. * git: Fix temp file location. * rename: Fix to pass named parameters to rcs_commit. + * git: Avoid adding files when committing, so as not to implicitly add + files like recentchanges files that are not normally checked in, + when fixing links after rename. -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 diff --git a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn index 829e80327..587650c61 100644 --- a/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn +++ b/doc/bugs/git_commit_adds_files_that_were_not_tracked.mdwn @@ -15,4 +15,5 @@ because of the link fixup code run when renaming a page. --[[Joey]] > 'git add .' to be called. I've fixed that. > > I think there is still potential for the problem I described above to -> occur during a rename or possibly otherwise. --[[Joey]] +> occur during a rename or possibly otherwise. Ok.. fixed `rcs_commit` +> to not add too. [[done]] --[[Joey]] -- cgit v1.2.3 From 853fcc2b56d72462901ee0f72621d02cb97dc2a3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Nov 2010 14:12:41 -0400 Subject: releasing version 3.20101129 --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1ae992b7a..fd271dab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20101113) UNRELEASED; urgency=low +ikiwiki (3.20101129) unstable; urgency=low * websetup: Fix encoding problem when restoring old setup file. * more: Add pages parameter to limit where the more is displayed. @@ -19,7 +19,7 @@ ikiwiki (3.20101113) UNRELEASED; urgency=low files like recentchanges files that are not normally checked in, when fixing links after rename. - -- Joey Hess Tue, 16 Nov 2010 14:23:47 -0400 + -- Joey Hess Mon, 29 Nov 2010 13:59:10 -0400 ikiwiki (3.20101112) unstable; urgency=HIGH diff --git a/ikiwiki.spec b/ikiwiki.spec index 5ef43903d..b0826d64e 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101112 +Version: 3.20101129 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index e4274d0f6..492222b86 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-12 00:37-0400\n" +"POT-Creation-Date: 2010-11-29 14:01-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -129,7 +129,7 @@ msgstr "" msgid "creating new page %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/aggregate.pm:652 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr "" @@ -359,26 +359,26 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:764 ../IkiWiki/Plugin/git.pm:827 +#: ../IkiWiki/Plugin/git.pm:766 ../IkiWiki/Plugin/git.pm:829 #: ../IkiWiki.pm:1580 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:786 +#: ../IkiWiki/Plugin/git.pm:788 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:790 +#: ../IkiWiki/Plugin/git.pm:792 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:861 +#: ../IkiWiki/Plugin/git.pm:863 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:877 +#: ../IkiWiki/Plugin/git.pm:879 #, perl-format msgid "Failed to revert commit %s" msgstr "" @@ -406,7 +406,7 @@ msgstr "" msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:140 +#: ../IkiWiki/Plugin/highlight.pm:155 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -465,7 +465,7 @@ msgstr "" msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:630 +#: ../IkiWiki/Plugin/inline.pm:663 msgid "RPC::XML::Client not found, not pinging" msgstr "" -- cgit v1.2.3 From 141dc37d361107a6607b3ff549f107c26fa700d4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Nov 2010 15:00:22 -0400 Subject: merged localurl branch; changelog --- debian/changelog | 12 ++++++++++++ ...ki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 2 ++ 2 files changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd271dab1..ec995a08a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +ikiwiki (3.20101130) UNRELEASED; urgency=low + + * Better support for serving the same site by both http and https. + Links generated by the CGI will now remain on https if it was accessed + via https. + (Thanks, smcv) + * API: urlto without a defined second parameter now generates an url + that starts with "/" (when possible; eg when the site's url and cgiurl + are on the same domain). + + -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 + ikiwiki (3.20101129) unstable; urgency=low * websetup: Fix encoding problem when restoring old setup file. diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index 264eb9688..f7938b061 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -319,3 +319,5 @@ Potential future things: >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage) >> and 5 in plugins, since I used it for things like redirection back >> to the top of the wiki --[[smcv]] + +[[merged|done]] --[[Joey]] -- cgit v1.2.3 From 5f4f0b5bdd2d9f9bfaa55acf1fa02b1889281a60 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Nov 2010 16:32:23 -0400 Subject: merged sslcookie-auto --- debian/changelog | 3 +++ doc/todo/use_secure_cookies_for_ssl_logins.mdwn | 2 ++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ec995a08a..82f9ece19 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ ikiwiki (3.20101130) UNRELEASED; urgency=low * API: urlto without a defined second parameter now generates an url that starts with "/" (when possible; eg when the site's url and cgiurl are on the same domain). + * Now when users log in via https, ikiwiki sends a secure cookie, that can + only be used over https. If the user switches to using http, they will + need to re-login. (smcv) -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn index f72b2d2d5..194db2f36 100644 --- a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn +++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn @@ -32,3 +32,5 @@ get a secure session cookie, but if you log in over HTTP, you won't. > first, so that dual https/http sites can better be set up. --[[Joey]] >> Thanks for merging that! :-) --s + +[[merged|done]] --[[Joey]] -- cgit v1.2.3 From 2884e3c6c7bfbcf49d3128f1e8b5b6dc99fc8955 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Dec 2010 11:51:51 -0400 Subject: smcv's https fix is actually also applicable to using multiple other urls --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 82f9ece19..921f31f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,7 @@ ikiwiki (3.20101130) UNRELEASED; urgency=low - * Better support for serving the same site by both http and https. - Links generated by the CGI will now remain on https if it was accessed - via https. + * Better support for serving the same site on multiple urls. (Such as + a http and a https url, or a ipv4 and an ipv6 url.) (Thanks, smcv) * API: urlto without a defined second parameter now generates an url that starts with "/" (when possible; eg when the site's url and cgiurl -- cgit v1.2.3 From aa65300c2f6a22d4372020b4b5b1a04b5842531a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Dec 2010 20:25:05 -0400 Subject: meta: Fix calling of htmlscrubber to pass the page parameter. The change of the htmlscrubber to look at page rather than destpage caused htmlscrubber_skip to not work for meta directives. --- IkiWiki/Plugin/meta.pm | 14 +++++++------- debian/changelog | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 47007afe2..abc8f1b1a 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -40,10 +40,10 @@ sub needsbuild (@) { return $needsbuild; } -sub scrub ($$) { +sub scrub ($$$) { if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) { return IkiWiki::Plugin::htmlscrubber::sanitize( - content => shift, destpage => shift); + content => shift, page => shift, destpage => shift); } else { return shift; @@ -162,7 +162,7 @@ sub preprocess (@) { # Metadata handling that happens only during preprocessing pass. if ($key eq 'permalink') { if (safeurl($value)) { - push @{$metaheaders{$page}}, scrub('', $destpage); + push @{$metaheaders{$page}}, scrub('', $page, $destpage); } } elsif ($key eq 'stylesheet') { @@ -240,7 +240,7 @@ sub preprocess (@) { my $delay=int(exists $params{delay} ? $params{delay} : 0); my $redir=""; if (! $safe) { - $redir=scrub($redir, $destpage); + $redir=scrub($redir, $page, $destpage); } push @{$metaheaders{$page}}, $redir; } @@ -250,7 +250,7 @@ sub preprocess (@) { join(" ", map { encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" } keys %params). - " />\n", $destpage); + " />\n", $page, $destpage); } } elsif ($key eq 'robots') { @@ -266,12 +266,12 @@ sub preprocess (@) { push @{$metaheaders{$page}}, scrub('', $destpage); + ' />', $page, $destpage); } else { push @{$metaheaders{$page}}, scrub('', $destpage); + encode_entities($value).'" />', $page, $destpage); } return ""; diff --git a/debian/changelog b/debian/changelog index 921f31f29..33c2d3d07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ ikiwiki (3.20101130) UNRELEASED; urgency=low * Now when users log in via https, ikiwiki sends a secure cookie, that can only be used over https. If the user switches to using http, they will need to re-login. (smcv) + * meta: Fix calling of htmlscrubber to pass the page parameter. + The change of the htmlscrubber to look at page rather than destpage + caused htmlscrubber_skip to not work for meta directives. -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 -- cgit v1.2.3 From 9c0f98de02f550081d8bb8bf18cf12db92bec6cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Dec 2010 20:34:30 -0400 Subject: releasing version 3.20101201 --- IkiWiki/Plugin/meta.pm | 14 +++++++------- debian/changelog | 8 ++++++++ ikiwiki.spec | 2 +- po/ikiwiki.pot | 2 +- 4 files changed, 17 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 47007afe2..abc8f1b1a 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -40,10 +40,10 @@ sub needsbuild (@) { return $needsbuild; } -sub scrub ($$) { +sub scrub ($$$) { if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) { return IkiWiki::Plugin::htmlscrubber::sanitize( - content => shift, destpage => shift); + content => shift, page => shift, destpage => shift); } else { return shift; @@ -162,7 +162,7 @@ sub preprocess (@) { # Metadata handling that happens only during preprocessing pass. if ($key eq 'permalink') { if (safeurl($value)) { - push @{$metaheaders{$page}}, scrub('', $destpage); + push @{$metaheaders{$page}}, scrub('', $page, $destpage); } } elsif ($key eq 'stylesheet') { @@ -240,7 +240,7 @@ sub preprocess (@) { my $delay=int(exists $params{delay} ? $params{delay} : 0); my $redir=""; if (! $safe) { - $redir=scrub($redir, $destpage); + $redir=scrub($redir, $page, $destpage); } push @{$metaheaders{$page}}, $redir; } @@ -250,7 +250,7 @@ sub preprocess (@) { join(" ", map { encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" } keys %params). - " />\n", $destpage); + " />\n", $page, $destpage); } } elsif ($key eq 'robots') { @@ -266,12 +266,12 @@ sub preprocess (@) { push @{$metaheaders{$page}}, scrub('', $destpage); + ' />', $page, $destpage); } else { push @{$metaheaders{$page}}, scrub('', $destpage); + encode_entities($value).'" />', $page, $destpage); } return ""; diff --git a/debian/changelog b/debian/changelog index fd271dab1..cecf61d5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20101201) unstable; urgency=low + + * meta: Fix calling of htmlscrubber to pass the page parameter. + The change of the htmlscrubber to look at page rather than destpage + caused htmlscrubber_skip to not work for meta directives. + + -- Joey Hess Wed, 01 Dec 2010 20:28:01 -0400 + ikiwiki (3.20101129) unstable; urgency=low * websetup: Fix encoding problem when restoring old setup file. diff --git a/ikiwiki.spec b/ikiwiki.spec index b0826d64e..09cc4a0f4 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101129 +Version: 3.20101201 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 492222b86..6eb13103e 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-29 14:01-0400\n" +"POT-Creation-Date: 2010-12-01 20:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From ca7e3a59234cd2a4219fe8810998519571e588aa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Dec 2010 20:36:42 -0400 Subject: update changelog to reflect bugfix-only release --- debian/changelog | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ec85743a7..b418fc993 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,4 @@ -ikiwiki (3.20101201) unstable; urgency=low - - * meta: Fix calling of htmlscrubber to pass the page parameter. - The change of the htmlscrubber to look at page rather than destpage - caused htmlscrubber_skip to not work for meta directives. - - -- Joey Hess Wed, 01 Dec 2010 20:28:01 -0400 - -ikiwiki (3.20101130) UNRELEASED; urgency=low +ikiwiki (3.20101202) UNRELEASED; urgency=low * Better support for serving the same site on multiple urls. (Such as a http and a https url, or a ipv4 and an ipv6 url.) @@ -17,11 +9,16 @@ ikiwiki (3.20101130) UNRELEASED; urgency=low * Now when users log in via https, ikiwiki sends a secure cookie, that can only be used over https. If the user switches to using http, they will need to re-login. (smcv) + + -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 + +ikiwiki (3.20101201) unstable; urgency=low + * meta: Fix calling of htmlscrubber to pass the page parameter. The change of the htmlscrubber to look at page rather than destpage caused htmlscrubber_skip to not work for meta directives. - -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 + -- Joey Hess Wed, 01 Dec 2010 20:28:01 -0400 ikiwiki (3.20101129) unstable; urgency=low -- cgit v1.2.3 From efe702479afc51b8364c58d9a2ed86ad1780b5ae Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 5 Dec 2010 16:38:38 -0400 Subject: changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b418fc993..fae2f15b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low * Now when users log in via https, ikiwiki sends a secure cookie, that can only be used over https. If the user switches to using http, they will need to re-login. (smcv) + * inline: Display feed buttons for nested inlines, linking to the inlined + page's feed. (Giuseppe Bilotta) -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 -- cgit v1.2.3 From 338a04190f5af2b5e77730d19c570b5fae60066d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Dec 2010 16:04:06 -0400 Subject: goldtype: New theme, based on blueview, contributed by Lars Wirzenius. --- debian/changelog | 1 + debian/copyright | 4 ++++ doc/themes.mdwn | 9 +++++++-- doc/themes/goldtype_small.png | Bin 0 -> 19240 bytes 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 doc/themes/goldtype_small.png (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fae2f15b4..ea6356f72 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low need to re-login. (smcv) * inline: Display feed buttons for nested inlines, linking to the inlined page's feed. (Giuseppe Bilotta) + * goldtype: New theme, based on blueview, contributed by Lars Wirzenius. -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 diff --git a/debian/copyright b/debian/copyright index 74391e2cf..300dd110b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -214,6 +214,10 @@ Files: underlays/themes/blueview/* Copyright: © 2009,2010 Bernd Zeimetz License: GPL-2+ +Files: underlays/themes/goldtype/* +Copyright: © Lars Wirzenius +License: GPL-2+ + License: BSD-C2 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/doc/themes.mdwn b/doc/themes.mdwn index cf1932fcb..57f899677 100644 --- a/doc/themes.mdwn +++ b/doc/themes.mdwn @@ -5,17 +5,22 @@ free for you to further customize. Ikiwiki now comes with several themes contributed by users. You can enable the [[theme_plugin|plugins/theme]] to use any of these: -[[!img actiontabs_small.png align=left]] The actiontabs theme, contributed by +[[!img actiontabs_small.png align=left]] The **actiontabs** theme, contributed by [[svend]]. This style sheet displays the action list (Edit, RecentChanges, etc.) as tabs.
-[[!img blueview_small.png align=left]] The blueview theme, contributed by +[[!img blueview_small.png align=left]] The **blueview** theme, contributed by [[BerndZeimetz]], featuring a tiling panoramic photo he took.
+[[!img goldtype_small.png align=left]] The **goldtype** theme, based on +blueview and featuring the photography of Lars Wirzenius. + +
+ [[!img none_small.png align=left]] For completeness, ikiwiki's default anti-theme. diff --git a/doc/themes/goldtype_small.png b/doc/themes/goldtype_small.png new file mode 100644 index 000000000..a011bb200 Binary files /dev/null and b/doc/themes/goldtype_small.png differ -- cgit v1.2.3