From 830c9e59b2c4d5c90e4316d8e81558e1aeb132f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2009 21:41:33 -0400 Subject: Add discussionpage configuration setting By adding this setting, we get both more configurability, and a minor optimisation too, since gettext does not need to be called continually to get the Discussion value. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ed7854e8a..5e5149927 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low the old version, but continue. Closes: #541205 * inline: Avoid use of my $_ as it fails with older perls. Closes: #541215 + * Add discussionpage configuration setting. + * Small optimisations. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From 82bb3af579db809b884c7be5f49012469902bf52 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Aug 2009 01:11:53 -0400 Subject: optimise brokenlinks by gathering the data when calculating backlinks During backlink calulation, all links are examined and broken links can be detected for free, so store a list of broken links and have brokenlinks use it. Exposing the %brokenlinks structure is a bit ugly, but the speedup seems worth it: Around 1 second for wikis the size of the doc wiki that use brokenlinks. --- IkiWiki/Plugin/brokenlinks.pm | 30 +++++++++++++----------------- IkiWiki/Render.pm | 23 ++++++++++++++--------- debian/changelog | 3 ++- 3 files changed, 29 insertions(+), 27 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm index 5ad4c917c..eb698b0be 100644 --- a/IkiWiki/Plugin/brokenlinks.pm +++ b/IkiWiki/Plugin/brokenlinks.pm @@ -27,31 +27,27 @@ sub preprocess (@) { # register a dependency. add_depends($params{page}, $params{pages}); - my %broken; - foreach my $page (pagespec_match_list([keys %links], - $params{pages}, location => $params{page})) { - my %seen; - foreach my $link (@{$links{$page}}) { - next if $seen{$link}; - $seen{$link}=1; - next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion}; - my $bestlink=bestlink($page, $link); - next if length $bestlink; - push @{$broken{$link}}, $page; + my @broken; + foreach my $link (keys %IkiWiki::brokenlinks) { + next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion}; + + my @pages; + foreach my $page (@{$IkiWiki::brokenlinks{$link}}) { + push @pages, $page + if pagespec_match($page, $params{pages}, location => $params{page}); } - } + next unless @pages; - my @broken; - foreach my $link (keys %broken) { - my $page=$broken{$link}->[0]; + my $page=$IkiWiki::brokenlinks{$link}->[0]; push @broken, sprintf(gettext("%s from %s"), htmllink($page, $params{destpage}, $link, noimageinline => 1), join(", ", map { htmllink($params{page}, $params{destpage}, $_, noimageinline => 1) - } @{$broken{$link}})); + } @pages) + ); } - return gettext("There are no broken links!") unless %broken; + return gettext("There are no broken links!") unless @broken; return "
    \n" .join("\n", map { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index d5e81f1b9..578142d2e 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -8,26 +8,31 @@ use IkiWiki; use Encode; my %backlinks; -my $backlinks_calculated=0; +our %brokenlinks; +my $links_calculated=0; -sub calculate_backlinks () { - return if $backlinks_calculated; - %backlinks=(); +sub calculate_links () { + return if $links_calculated; + %backlinks=%brokenlinks=(); foreach my $page (keys %links) { foreach my $link (@{$links{$page}}) { my $bestlink=bestlink($page, $link); - if (length $bestlink && $bestlink ne $page) { - $backlinks{$bestlink}{$page}=1; + if (length $bestlink) { + $backlinks{$bestlink}{$page}=1 + if $bestlink ne $page; + } + else { + push @{$brokenlinks{$link}}, $page; } } } - $backlinks_calculated=1; + $links_calculated=1; } sub backlink_pages ($) { my $page=shift; - calculate_backlinks(); + calculate_links(); return keys %{$backlinks{$page}}; } @@ -416,7 +421,7 @@ sub refresh () { debug(sprintf(gettext("scanning %s"), $file)); scan($file); } - calculate_backlinks(); + calculate_links(); foreach my $file (@needsbuild) { debug(sprintf(gettext("building %s"), $file)); render($file); diff --git a/debian/changelog b/debian/changelog index 5e5149927..147d279bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * inline: Avoid use of my $_ as it fails with older perls. Closes: #541215 * Add discussionpage configuration setting. - * Small optimisations. + * Several optimisations, including speedups to orphans and brokenlinks + calculation. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From c258160725a79953f28f799b31959b73e4beac77 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 13:59:04 -0400 Subject: review of ready branch --- debian/changelog | 1 + doc/todo/should_optimise_pagespecs.mdwn | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 147d279bb..5bef06aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Add discussionpage configuration setting. * Several optimisations, including speedups to orphans and brokenlinks calculation. + * meta, img: Fix bugs in dependency code. (smcv) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 3ccef62fe..1919e3584 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -105,4 +105,33 @@ I can think about reducung the size of my wiki source and making it available on >>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support >>>>> future features like [[tracking_bugs_with_dependencies]]). --[[smcv]] +--- + +Some questions on your optimize-depends branch. --[[Joey]] + +In saveindex it still or'd together the depends list, but the `{depends}` +field seems only useful for backwards compatability (ie, ikiwiki-transition +uses it still), and otherwise just bloats the index. + +Is an array the right data structure? `add_depends` has to loop through the +array to avoid dups, it would be better if a hash were used there. Since +inline (and other plugins) explicitly add all linked pages, each as a +separate item, the list can get rather long, and that single add_depends +loop has suddenly become O(N^2) to the number of pages, which is something +to avoid.. + +Also, since a lot of places are calling add_depends in a loop, it probably +makes sense to just make it accept a list of dependencies to add. It'll be +marginally faster, probably, and should allow for better optimisation +when adding a lot of depends at once. + +In Render.pm, we now have a triply nested loop, which is a bit +scary for efficiency. It seems there should be a way to +rework this code so it can use the optimised `pagespec_match_list`, +and/or hoist some of the inner loop calculations (like the `pagename`) +out. + +Very good catch on img/meta using the wrong dependency; verified in the wild! +(I've cherry-picked those bug fixes.) + [[!tag wishlist patch patch/core]] -- cgit v1.2.3 From 04760df3813a1b44043176e95bcd3eae6ba0507c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 14:10:39 -0400 Subject: Allow building ikiwiki on systems w/o po4a -- building of the translated underlays will be skipped in this case. --- debian/changelog | 2 + doc/bugs/po_plugin_adds_new_dependency.mdwn | 3 + po/Makefile | 7 +- po/bg.po | 129 ++++++++++++++------------- po/cs.po | 129 ++++++++++++++------------- po/da.po | 129 ++++++++++++++------------- po/de.po | 129 ++++++++++++++------------- po/es.po | 131 ++++++++++++++-------------- po/fr.po | 129 ++++++++++++++------------- po/gu.po | 129 ++++++++++++++------------- po/ikiwiki.pot | 126 +++++++++++++------------- po/pl.po | 129 ++++++++++++++------------- po/sv.po | 129 ++++++++++++++------------- po/vi.po | 129 ++++++++++++++------------- 14 files changed, 712 insertions(+), 718 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5bef06aec..39ff60717 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Several optimisations, including speedups to orphans and brokenlinks calculation. * meta, img: Fix bugs in dependency code. (smcv) + * Allow building ikiwiki on systems w/o po4a -- + building of the translated underlays will be skipped in this case. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn index 3da326f48..3ddcc30f2 100644 --- a/doc/bugs/po_plugin_adds_new_dependency.mdwn +++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn @@ -1,5 +1,8 @@ Was it intended that the po plugin add a new dependency? +> Yes; see debian/control Build-Depends. However, I have made it disable +> building that is po4a is not available. [[done]] --[[Joey]] + PERL5LIB=.. ./po2wiki underlay.setup Failed to load plugin IkiWiki::Plugin::po: Can't locate Locale/Po4a/Common.pm in @INC (@INC contains: .. /Library/Perl/Updates/5.8.8 /System/Library/Perl/5.8.8/darwin-thread-multi-2level /System/Library/Perl/5.8.8 /Library/Perl/5.8.8/darwin-thread-multi-2level /Library/Perl/5.8.8 /Library/Perl /Network/Library/Perl/5.8.8/darwin-thread-multi-2level /Network/Library/Perl/5.8.8 /Network/Library/Perl /System/Library/Perl/Extras/5.8.8/darwin-thread-multi-2level /System/Library/Perl/Extras/5.8.8 /Library/Perl/5.8.6 /Library/Perl/5.8.1 /sw/lib/perl5/5.8.8/darwin-thread-multi-2level /sw/lib/perl5/5.8.8 /sw/lib/perl5/darwin-thread-multi-2level /sw/lib/perl5 /sw/lib/perl5/darwin /usr/local/lib/perl5/site_perl/5.8.8/darwin-thread-multi-2level /usr/local/lib/perl5/site_perl/5.8.8 /usr/local/lib/perl5/site_perl .) at ../IkiWiki/Plugin/po.pm line 13. BEGIN failed--compilation aborted at ../IkiWiki/Plugin/po.pm line 13. diff --git a/po/Makefile b/po/Makefile index d67c3a4ff..d094733b1 100644 --- a/po/Makefile +++ b/po/Makefile @@ -5,7 +5,10 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \ POFILES=$(wildcard *.po) MOFILES=$(POFILES:.po=.mo) -all: ikiwiki.pot mo ../underlays/locale +# Translated underlays can only be generated if po4a is available. +TRANSLATED_UNDERLAYS=$(shell if perl -e 'use Locale::Po4a::Common' 2>/dev/null; then echo ../underlays/locale; fi) + +all: ikiwiki.pot mo $(TRANSLATED_UNDERLAYS) mo: $(MOFILES) @@ -83,7 +86,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp ../Makefile: ../Makefile.PL cd .. && ./Makefile.PL -../underlays/locale: po2wiki_stamp +$(TRANSLATED_UNDERLAYS): po2wiki_stamp po2wiki_stamp: po2wiki underlays_copy_stamp PERL5LIB=.. ./po2wiki underlay.setup touch $@ diff --git a/po/bg.po b/po/bg.po index 8ffbf26a4..d29f81723 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Грешка" @@ -188,20 +188,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Дискусия" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" @@ -296,14 +288,14 @@ msgstr "премахване на старата страница „%s”" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "промяна на %s" @@ -371,7 +363,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -447,30 +439,30 @@ msgstr "шаблонът „%s” не е намерен" msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -501,7 +493,7 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" @@ -535,7 +527,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Получаване на OpenID номер" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." @@ -595,103 +587,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "дискусия" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1043,54 +1035,54 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1169,31 +1161,35 @@ msgstr "обновяване на уики..." msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Дискусия" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1218,6 +1214,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "дискусия" + #~ msgid "rendering %s" #~ msgstr "обновяване на страницата „%s”" diff --git a/po/cs.po b/po/cs.po index e377b0cf2..657d2852c 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -53,7 +53,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Chyba" @@ -185,20 +185,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskuse" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" @@ -293,14 +285,14 @@ msgstr "odstraňuji starou stránku %s" msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "upravuji %s" @@ -368,7 +360,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -441,30 +433,30 @@ msgstr "zdroj nebyl nalezen" msgid "missing pages parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -491,7 +483,7 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" @@ -525,7 +517,7 @@ msgstr "Přihlásit pomocí" msgid "Get an OpenID" msgstr "Získat OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." @@ -585,103 +577,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "diskuse" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "nelze zapsat %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1029,54 +1021,54 @@ msgstr "" msgid "bad file name %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -1155,29 +1147,33 @@ msgstr "znovu vytvářím wiki..." msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskuse" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "nemohu číst %s: %s" @@ -1202,6 +1198,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "diskuse" + #~ msgid "rendering %s" #~ msgstr "zpracovávám %s" diff --git a/po/da.po b/po/da.po index 9ced576d8..b4e06535b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Fejl" @@ -193,20 +193,12 @@ msgstr "" "Beklager, men det ligner spam til blogspam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s fra %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" @@ -301,14 +293,14 @@ msgstr "fjerner gammelt smugkig %s" msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -372,7 +364,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:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "sideredigering er ikke tilladt" msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -496,7 +488,7 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "henvisningsside ikke fundet" @@ -528,7 +520,7 @@ msgstr "Log på med" msgid "Get an OpenID" msgstr "Skaf en OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 msgid "All pages have other pages linking to them." msgstr "Alle sider har henvisninger fra andre sider." @@ -587,12 +579,16 @@ msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)" msgid "LWP not found, not pinging" msgstr "LWP ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -600,7 +596,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -608,25 +604,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "diskussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -634,7 +626,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -642,55 +634,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, perl-format msgid "failed to read %s" msgstr "læsning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 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" @@ -1034,7 +1026,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1043,47 +1035,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1162,30 +1154,34 @@ msgstr "genopbygger wiki..." msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskussion" + +#: ../IkiWiki.pm:494 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:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, 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:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1209,3 +1205,6 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" + +#~ msgid "discussion" +#~ msgstr "diskussion" diff --git a/po/de.po b/po/de.po index 83a70bd9c..51c1b0fca 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Fehler" @@ -190,20 +190,12 @@ msgstr "" "Entschuldigung, aber blogspam stuft das " "als Spam ein: " -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s von %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" @@ -299,14 +291,14 @@ msgstr "entferne alte Vorschau %s" msgid "%s is not an editable page" msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "bearbeite %s" @@ -370,7 +362,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:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "bearbeiten der Seiten nicht erlaubt" msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -497,7 +489,7 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" @@ -529,7 +521,7 @@ msgstr "Anmelden mit" msgid "Get an OpenID" msgstr "Eine OpenID anfordern" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." @@ -590,12 +582,16 @@ msgstr "Ignoriere die ping Anweisung für das Wiki %s (dieses Wiki ist %s)" msgid "LWP not found, not pinging" msgstr "LWP nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -603,7 +599,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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -611,25 +607,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, 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:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -637,7 +629,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -645,55 +637,55 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, perl-format msgid "failed to read %s" msgstr "lesen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 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 " @@ -1043,7 +1035,7 @@ msgstr "" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1052,47 +1044,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1174,32 +1166,36 @@ msgstr "erzeuge Wiki neu.." msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1223,3 +1219,6 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" + +#~ msgid "discussion" +#~ msgstr "Diskussion" diff --git a/po/es.po b/po/es.po index 65ad72140..77f1cea6e 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Error" @@ -195,20 +195,12 @@ msgstr "" "Lo siento, pero el analizador blogspam " "dice que el texto puede ser spam." -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Comentarios" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s desde la página %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" @@ -303,14 +295,14 @@ msgstr "eliminando la antigua previsualización %s" msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "modificando página %s" @@ -374,7 +366,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:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -449,32 +441,32 @@ msgstr "no está permitida la modificación de páginas" msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -503,7 +495,7 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "falta la página a donde redirigir" @@ -535,7 +527,7 @@ msgstr "Identificarse mediante " msgid "Get an OpenID" msgstr "Consiga un identificador OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Todas las páginas están referenciadas entre sí." @@ -598,104 +590,103 @@ msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)" msgid "LWP not found, not pinging" msgstr "No he encontrado el componente LWP, no envío señal alguna" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -#, fuzzy -msgid "discussion" -msgstr "Comentarios" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, 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:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, 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:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1044,7 +1035,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1053,49 +1044,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1176,33 +1167,37 @@ msgstr "reconstruyendo el wiki.." msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Comentarios" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1230,6 +1225,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#, fuzzy +#~ msgid "discussion" +#~ msgstr "Comentarios" + #~ msgid "rendering %s" #~ msgstr "convirtiendo %s" diff --git a/po/fr.po b/po/fr.po index a27420254..c151bcf68 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-06-29 16:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Erreur" @@ -191,20 +191,12 @@ msgstr "" "Désolé, mais ceci ressemble à un spam à destination de blogspam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Discussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s sur %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Aucun lien cassé !" @@ -299,14 +291,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s" msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "Édition de %s" @@ -370,7 +362,7 @@ msgstr "Vous ne pouvez 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:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "Modification de page interdite" msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -495,7 +487,7 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "Page de redirection introuvable" @@ -527,7 +519,7 @@ msgstr "S'identifier en tant que" msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -590,103 +582,103 @@ msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)" msgid "LWP not found, not pinging" msgstr "LWP est introuvable. Pas de réponse au ping" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "Discussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "va envoyer un ping à %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1035,7 +1027,7 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1044,47 +1036,47 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1168,30 +1160,34 @@ msgstr "Reconstruction du wiki..." msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Discussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1217,6 +1213,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 "discussion" +#~ msgstr "Discussion" + #~ msgid "rendering %s" #~ msgstr "Reconstruction de %s" diff --git a/po/gu.po b/po/gu.po index ce76f8612..d7e6eaa6a 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "ક્ષતિ" @@ -186,20 +186,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "ચર્ચા" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" @@ -294,14 +286,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s" msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" @@ -369,7 +361,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -442,30 +434,30 @@ msgstr "ફીડ મળ્યું નહી" msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -491,7 +483,7 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" @@ -525,7 +517,7 @@ msgstr "" msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." @@ -585,103 +577,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "ચર્ચા" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1029,54 +1021,54 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1155,29 +1147,33 @@ msgstr "વીકી ફરીથી બનાવે છે.." msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "ચર્ચા" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1202,6 +1198,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "ચર્ચા" + #~ msgid "rendering %s" #~ msgstr "રેન્ડર કરે છે %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 8ba10ecbb..a9c0fbb99 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "" @@ -183,20 +183,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "" @@ -291,14 +283,14 @@ msgstr "" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "" @@ -361,7 +353,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -431,30 +423,30 @@ msgstr "" msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -480,7 +472,7 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "" @@ -512,7 +504,7 @@ msgstr "" msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 msgid "All pages have other pages linking to them." msgstr "" @@ -570,102 +562,102 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, perl-format msgid "failed to read %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1004,54 +996,54 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1130,29 +1122,33 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/pl.po b/po/pl.po index 3e8d08523..6ecda8d88 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Błąd" @@ -190,20 +190,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Dyskusja" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" @@ -298,14 +290,14 @@ msgstr "usuwanie starej strony %s" msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "edycja %s" @@ -373,7 +365,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -449,30 +441,30 @@ msgstr "nieznaleziony kanał RSS" msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -504,7 +496,7 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" @@ -538,7 +530,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Pobierz OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" @@ -598,103 +590,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "dyskusja" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1051,54 +1043,54 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1177,31 +1169,35 @@ msgstr "przebudowywanie wiki..." msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Dyskusja" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1226,6 +1222,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "dyskusja" + #~ msgid "rendering %s" #~ msgstr "renderowanie %s" diff --git a/po/sv.po b/po/sv.po index ff8d3aa0d..075de56d0 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Fel" @@ -187,20 +187,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" @@ -295,14 +287,14 @@ msgstr "tar bort gammal sida %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "redigerar %s" @@ -370,7 +362,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "mallen %s hittades inte" msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -497,7 +489,7 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" @@ -531,7 +523,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Skaffa ett OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." @@ -591,103 +583,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "diskussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1038,54 +1030,54 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1164,29 +1156,33 @@ msgstr "bygger om wiki.." msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Måste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1211,6 +1207,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "diskussion" + #~ msgid "rendering %s" #~ msgstr "ritar upp %s" diff --git a/po/vi.po b/po/vi.po index 7cf911b16..b500ed581 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: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Lỗi" @@ -188,20 +188,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Thảo luận" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." @@ -296,14 +288,14 @@ msgstr "đang gỡ bỏ trang cũ %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "đang sửa %s" @@ -371,7 +363,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -447,30 +439,30 @@ msgstr "không tìm thấy mẫu %s" msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 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" @@ -498,7 +490,7 @@ 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:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" @@ -532,7 +524,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Lấy OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." @@ -592,103 +584,103 @@ msgstr "" 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" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, 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:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "thảo luận" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 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:464 +#: ../IkiWiki/Plugin/po.pm:468 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:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1039,54 +1031,54 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format 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:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1165,29 +1157,33 @@ msgstr "đang xây dựng lại wiki.." msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Thảo luận" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1212,6 +1208,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "thảo luận" + #~ msgid "rendering %s" #~ msgstr "đang vẽ %s" -- cgit v1.2.3 From 54c2e05ccf8fad1e77d4ee717c48f3622f60b4e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 16:33:54 -0400 Subject: Add basic styling of po plugin's languages list. --- debian/changelog | 1 + doc/style.css | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 39ff60717..88fac32ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * meta, img: Fix bugs in dependency code. (smcv) * Allow building ikiwiki on systems w/o po4a -- building of the translated underlays will be skipped in this case. + * Add basic styling of po plugin's languages list. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/style.css b/doc/style.css index e6512aed8..4fa48b140 100644 --- a/doc/style.css +++ b/doc/style.css @@ -32,6 +32,15 @@ border-bottom: 0; } +#otherlanguages ul { + margin: 0; + padding: 6px; + list-style-type: none; +} +.pageheader #otherlanguages { + border-bottom: 1px solid #000; +} + div.inlinecontent { margin-top: .4em; } -- cgit v1.2.3 From 5d8bfe9f3704d4cc81ee3ac312a703bb48d6f976 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 13:49:56 -0400 Subject: changelog --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88fac32ee..4fcd13d5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Allow building ikiwiki on systems w/o po4a -- building of the translated underlays will be skipped in this case. * Add basic styling of po plugin's languages list. + * inline: Display an error if feedpages is specified and fails to match + due to a problem such as created_before being told to check against + a page that does not exist. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From e03d5c6a7c3f64a591ff6d639c8e4b92c11e1cec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 14:32:10 -0400 Subject: Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective pages from the basewiki. --- debian/changelog | 2 ++ underlays/basewiki/ikiwiki/blog.mdwn | 8 -------- underlays/basewiki/ikiwiki/preprocessordirective.mdwn | 7 ------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 underlays/basewiki/ikiwiki/blog.mdwn delete mode 100644 underlays/basewiki/ikiwiki/preprocessordirective.mdwn (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4fcd13d5b..b07fe94a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * inline: Display an error if feedpages is specified and fails to match due to a problem such as created_before being told to check against a page that does not exist. + * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective + pages from the basewiki. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/underlays/basewiki/ikiwiki/blog.mdwn b/underlays/basewiki/ikiwiki/blog.mdwn deleted file mode 100644 index 0a5a5247d..000000000 --- a/underlays/basewiki/ikiwiki/blog.mdwn +++ /dev/null @@ -1,8 +0,0 @@ -[[!meta robots="noindex, follow"]] - -This page has been removed from ikiwiki's basewiki. For documentation about -creating a blog with ikiwiki, see the documentation of the -[[!iki ikiwiki/directive/inline desc=inline]] directive. - -Please update your links, as this redirection page will be removed in a -future ikiwiki release. diff --git a/underlays/basewiki/ikiwiki/preprocessordirective.mdwn b/underlays/basewiki/ikiwiki/preprocessordirective.mdwn deleted file mode 100644 index bd12895cc..000000000 --- a/underlays/basewiki/ikiwiki/preprocessordirective.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -[[!meta redir=ikiwiki/directive delay=10]] -[[!meta robots="noindex, follow"]] - -This page has moved to -[[ikiwiki/directive|ikiwiki/directive]]. Please -update your links, as this redirection page will be removed in a future -ikiwiki release. -- cgit v1.2.3 From 65bf1dab5f8ce4b1d1170113e5dbb1ff50c04502 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Aug 2009 12:26:51 -0400 Subject: Updated French program translation from Philippe Batailler. Closes: #542036 --- debian/changelog | 2 + po/fr.po | 115 +++++++++++++++++++++++++++---------------------------- 2 files changed, 58 insertions(+), 59 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b07fe94a9..ddf69f284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low a page that does not exist. * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective pages from the basewiki. + * Updated French program translation from Philippe Batailler. + Closes: #542036 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/po/fr.po b/po/fr.po index c151bcf68..08ca06d0b 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: 2009-08-15 14:07-0400\n" -"PO-Revision-Date: 2009-06-29 16:42+0200\n" +"PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -148,17 +148,14 @@ msgid "Must specify %s" msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -#, fuzzy msgid "Failed to create S3 bucket: " msgstr "Impossible de créer un compartiment S3 :" #: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy msgid "Failed to save file to S3: " msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" #: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy msgid "Failed to delete file from S3: " msgstr "Échec lors de la suppression du fichier sur S3 :" @@ -187,9 +184,7 @@ msgstr "Génération de l'index automatique" msgid "" "Sorry, but that looks like spam to blogspam: " -msgstr "" -"Désolé, mais ceci ressemble à un spam à destination de blogspam: " +msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -338,14 +333,13 @@ msgid "The page %s does not exist." msgstr "La page %s n'existe pas." #: ../IkiWiki/Plugin/getsource.pm:73 -#, fuzzy msgid "not a page" -msgstr "Impossible de trouver les pages %s" +msgstr "Ce n'est pas une page." #: ../IkiWiki/Plugin/getsource.pm:75 -#, fuzzy, perl-format +#, perl-format msgid "%s is an attachment, not a page." -msgstr "%s n'est pas une page éditable" +msgstr "%s est une pièce jointe, pas une page." #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 @@ -356,7 +350,7 @@ msgstr "Vous n'êtes pas autorisé à modifier %s" #: ../IkiWiki/Plugin/git.pm:666 #, perl-format msgid "you cannot act on a file with mode %s" -msgstr "Vous ne pouvez modifier un fichier dont le mode est %s" +msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" #: ../IkiWiki/Plugin/git.pm:670 msgid "you are not allowed to change file modes" @@ -364,13 +358,13 @@ msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" #: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 -#, fuzzy, perl-format +#, perl-format msgid "Must specify %s when using the %s plugin" -msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »." +msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "Impossible d'analyser l'url, pas de nom de domaine" +msgstr "Impossible d'analyser l'URL, pas de nom de domaine" #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" @@ -404,7 +398,7 @@ msgstr "Image::Magick n'est pas installé" #: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" -msgstr "" +msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" #: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 #: ../IkiWiki/Plugin/img.pm:104 @@ -439,7 +433,7 @@ msgstr "Paramètre « pages » manquant" #: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" -msgstr "" +msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." #: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" @@ -520,7 +514,6 @@ msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" #: ../IkiWiki/Plugin/orphans.pm:45 -#, fuzzy msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -538,9 +531,7 @@ msgstr "Erreur lors de la création du compte." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "" -"Pas d'adresse spécifiée. Impossible d'envoyer les instructions pour " -"réinitialiser le mot de passe." +msgstr "Aucune adresse indiquée. Impossible d'envoyer les instructions pour réinitialiser le mot de passe." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -566,7 +557,7 @@ msgstr "Ping reçu" #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "les paramètres 'from' et 'to' sont nécessaires" +msgstr "les paramètres « from » et « to » sont nécessaires." #: ../IkiWiki/Plugin/pinger.pm:58 #, perl-format @@ -585,102 +576,115 @@ msgstr "LWP est introuvable. Pas de réponse au ping" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" +"Note : ancienne version de po4a détectée. Il est recommandé d'installer la " +"version 0.35." #: ../IkiWiki/Plugin/po.pm:136 -#, fuzzy, perl-format +#, perl-format msgid "%s is not a valid language code" -msgstr "%s n'est pas un fichier" +msgstr "%s n'est pas un code de langue valable" #: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" +"%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " +"défaut." #: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" +"po_link_to=negotiated nécessite que usedirs soit activé, retour à " +"po_link_to=default." #: ../IkiWiki/Plugin/po.pm:383 #, 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:387 ../IkiWiki/Render.pm:426 -#, fuzzy, perl-format +#, perl-format msgid "building %s" -msgstr "va envoyer un ping à %s" +msgstr "construction de %s" #: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" -msgstr "" +msgstr "Fichiers PO mis à jour." #: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" +"Impossible de supprimer cette traduction. Si la page maître est supprimée, " +"alors ses traductions seront supprimées." #: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." 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:829 -#, fuzzy, perl-format +#, perl-format msgid "POT file (%s) does not exist" -msgstr "La page %s n'existe pas." +msgstr "Le fichier POT %s n'existe pas." #: ../IkiWiki/Plugin/po.pm:843 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy underlay PO file to %s" -msgstr "Échec de la compilation de %s" +msgstr "Impossible de copier le fichier PO underlay dans %s" #: ../IkiWiki/Plugin/po.pm:852 -#, fuzzy, perl-format +#, perl-format msgid "failed to update %s" -msgstr "Échec de la compilation de %s" +msgstr "Impossible de mettre à jour %s" #: ../IkiWiki/Plugin/po.pm:858 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy the POT file to %s" -msgstr "Échec de la compilation de %s" +msgstr "Impossible de copier le fichier POT dans %s" #: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" -msgstr "" +msgstr "N/A" #: ../IkiWiki/Plugin/po.pm:907 -#, fuzzy, perl-format +#, perl-format msgid "failed to translate %s" -msgstr "Échec du redimensionnement : %s" +msgstr "Impossible de traduire %s" #: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" -msgstr "" +msgstr "Fichiers PO obsolètes supprimés." #: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 #: ../IkiWiki/Plugin/po.pm:1100 -#, fuzzy, perl-format +#, perl-format msgid "failed to write %s" -msgstr "Échec du redimensionnement : %s" +msgstr "Impossible de modifier %s" #: ../IkiWiki/Plugin/po.pm:1058 -#, fuzzy msgid "failed to translate" -msgstr "Échec du lancement de dot" +msgstr "Impossible de traduire" #: ../IkiWiki/Plugin/po.pm:1063 -#, fuzzy, perl-format +#, perl-format msgid "failed to read %s" -msgstr "Échec de la lecture de %s : %s" +msgstr "Impossible de lire %s" #: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +"Données gettext incorrectes, retour à la page précédente pour la poursuite " +"des modifications." #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -898,12 +902,10 @@ msgid "parse error" msgstr "Erreur d'analyse" #: ../IkiWiki/Plugin/sparkline.pm:78 -#, fuzzy msgid "invalid featurepoint diameter" msgstr "Diamètre du point incorrect" #: ../IkiWiki/Plugin/sparkline.pm:88 -#, fuzzy msgid "invalid featurepoint location" msgstr "Emplacement du point incorrect" @@ -912,7 +914,6 @@ msgid "missing values" msgstr "Il manque des valeurs" #: ../IkiWiki/Plugin/sparkline.pm:104 -#, fuzzy msgid "invalid height value" msgstr "Hauteur incorrecte" @@ -921,7 +922,6 @@ msgid "missing width parameter" msgstr "Le paramètre largeur manque" #: ../IkiWiki/Plugin/sparkline.pm:115 -#, fuzzy msgid "invalid width value" msgstr "Largeur incorrecte" @@ -1057,27 +1057,27 @@ msgid "scanning %s" msgstr "Examen de %s" #: ../IkiWiki/Render.pm:447 -#, fuzzy, perl-format +#, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" #: ../IkiWiki/Render.pm:468 -#, fuzzy, perl-format +#, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" #: ../IkiWiki/Render.pm:507 -#, fuzzy, perl-format +#, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" #: ../IkiWiki/Render.pm:519 -#, fuzzy, perl-format +#, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" #: ../IkiWiki/Render.pm:543 -#, fuzzy, perl-format +#, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1106,9 +1106,7 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "" -"** désactivation du greffon %s, car échec de l'installation, avec le message " -"suivant :" +msgstr "** Désactivation du greffon %s, l'installation a échoué avec le message suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1181,7 +1179,7 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s #: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i" +msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" #: ../IkiWiki.pm:1783 msgid "yes" @@ -1205,7 +1203,6 @@ msgid "What revision control system to use?" msgstr "Système de contrôle de version utilisé :" #: ../auto.setup:20 -#, fuzzy msgid "Which user (wiki account or openid) will be admin?" msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" -- cgit v1.2.3 From 9b799ccc851afc70b5b068e088f095e14005bda8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Aug 2009 14:05:59 -0400 Subject: po: Fixed to run rcs_add ralative to srcdir. --- IkiWiki/Plugin/po.pm | 2 +- debian/changelog | 1 + doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index aa3d72b90..414906999 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -414,7 +414,7 @@ sub change (@) { } if (@pofiles) { refreshpofiles($masterfile, @pofiles); - map { IkiWiki::rcs_add($_) } @pofiles if $config{rcs}; + map { s/^\Q$config{srcdir}\E\/*//; IkiWiki::rcs_add($_) } @pofiles if $config{rcs}; $updated_po_files=1; } } diff --git a/debian/changelog b/debian/changelog index ddf69f284..4bb450a55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low pages from the basewiki. * Updated French program translation from Philippe Batailler. Closes: #542036 + * po: Fixed to run rcs_add ralative to srcdir. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn index f87457080..6fadff07e 100644 --- a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn +++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn @@ -5,3 +5,10 @@ I have set absolute path for srcdir = '/path/to/repo/doc/'. The root of my git r I have no problem when I use an relative path like srcdir = '.'. I have an other issue with the po plugin when I set the srcdir to './doc/' (provided that my config file is in /path/to/repo). In this case the po plugin try to add 'doc/doc/index.fr.po' which does not exists (seems like the srcdir path is prepended twice). + +> You should never use a relative srcdir path with ikiwiki. +> +> I wonder what version of git you have there, since it works ok with the +> version I have here. But, the po plugin is definitly doing the wrong +> thing; it's telling git to add the po file with the full scrdir path +> rather than relative to its root. Fixed that. [[done]] --[[Joey]] -- cgit v1.2.3 From df9d39698f93d803acdf37d1c94f74f58719634e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 20 Aug 2009 12:29:19 -0400 Subject: Italian program translation from Luca Bruno. --- debian/changelog | 1 + po/it.po | 1176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1177 insertions(+) create mode 100644 po/it.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4bb450a55..5b021ec24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Updated French program translation from Philippe Batailler. Closes: #542036 * po: Fixed to run rcs_add ralative to srcdir. + * Italian program translation from Luca Bruno. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/po/it.po b/po/it.po new file mode 100644 index 000000000..53fb3e3f4 --- /dev/null +++ b/po/it.po @@ -0,0 +1,1176 @@ +# Italian translation of ikiwiki. +# This file is distributed under the same license as the ikiwiki package. +# Luca Bruno , 2009. +msgid "" +msgstr "" +"Project-Id-Version: Ikiwiki\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"PO-Revision-Date: 2009-08-16 11:01+0100\n" +"Last-Translator: Luca Bruno \n" +"Language-Team: Italian TP \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../IkiWiki/CGI.pm:113 +msgid "You need to log in first." +msgstr "Occorre prima effettuare l'accesso." + +#: ../IkiWiki/CGI.pm:146 +msgid "probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https" +msgstr "possibile errore di configurazione: sslcookie è impostato, ma si sta tentando un accesso via http, non https" + +#: ../IkiWiki/CGI.pm:149 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" + +#: ../IkiWiki/CGI.pm:168 +#: ../IkiWiki/CGI.pm:299 +msgid "Your login session has expired." +msgstr "La sessione è scaduta." + +#: ../IkiWiki/CGI.pm:189 +msgid "Login" +msgstr "Entra" + +#: ../IkiWiki/CGI.pm:190 +msgid "Preferences" +msgstr "Preferenze" + +#: ../IkiWiki/CGI.pm:191 +msgid "Admin" +msgstr "Amministrazione" + +#: ../IkiWiki/CGI.pm:231 +msgid "Preferences saved." +msgstr "Preferenze salvate." + +#: ../IkiWiki/CGI.pm:262 +msgid "You are banned." +msgstr "Avete ricevuto un ban." + +#: ../IkiWiki/CGI.pm:390 +#: ../IkiWiki/CGI.pm:391 +#: ../IkiWiki.pm:1260 +msgid "Error" +msgstr "Errore" + +#: ../IkiWiki/Plugin/aggregate.pm:84 +msgid "Aggregation triggered via web." +msgstr "Aggregazione attivata dal web." + +#: ../IkiWiki/Plugin/aggregate.pm:93 +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 +#, perl-format +msgid "missing %s parameter" +msgstr "parametro %s mancante" + +#: ../IkiWiki/Plugin/aggregate.pm:255 +msgid "new feed" +msgstr "nuovo notiziario" + +#: ../IkiWiki/Plugin/aggregate.pm:269 +msgid "posts" +msgstr "articoli" + +#: ../IkiWiki/Plugin/aggregate.pm:271 +msgid "new" +msgstr "nuovo" + +#: ../IkiWiki/Plugin/aggregate.pm:441 +#, perl-format +msgid "expiring %s (%s days old)" +msgstr "in scadenza %s (vecchio di %s giorni)" + +#: ../IkiWiki/Plugin/aggregate.pm:448 +#, perl-format +msgid "expiring %s" +msgstr "in scadenza %s" + +#: ../IkiWiki/Plugin/aggregate.pm:475 +#, perl-format +msgid "last checked %s" +msgstr "ultimo controllo %s" + +#: ../IkiWiki/Plugin/aggregate.pm:479 +#, perl-format +msgid "checking feed %s ..." +msgstr "controllo notiziario %s..." + +#: ../IkiWiki/Plugin/aggregate.pm:484 +#, perl-format +msgid "could not find feed at %s" +msgstr "impossibile trovare il notiziario %s" + +#: ../IkiWiki/Plugin/aggregate.pm:503 +msgid "feed not found" +msgstr "notiziario non trovato" + +#: ../IkiWiki/Plugin/aggregate.pm:514 +#, perl-format +msgid "(invalid UTF-8 stripped from feed)" +msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" + +#: ../IkiWiki/Plugin/aggregate.pm:522 +#, perl-format +msgid "(feed entities escaped)" +msgstr "(entità del notiziario espanse con escape)" + +#: ../IkiWiki/Plugin/aggregate.pm:530 +msgid "feed crashed XML::Feed!" +msgstr "il notiziario ha fatto andare in crash XML::Feed." + +#: ../IkiWiki/Plugin/aggregate.pm:616 +#, perl-format +msgid "creating new page %s" +msgstr "creazione nuova pagina %s" + +#: ../IkiWiki/Plugin/amazon_s3.pm:31 +msgid "deleting bucket.." +msgstr "eliminazione contenitore..." + +#: ../IkiWiki/Plugin/amazon_s3.pm:38 +#: ../ikiwiki.in:210 +msgid "done" +msgstr "fatto" + +#: ../IkiWiki/Plugin/amazon_s3.pm:97 +#, perl-format +msgid "Must specify %s" +msgstr "Occorre specificare %s" + +#: ../IkiWiki/Plugin/amazon_s3.pm:136 +msgid "Failed to create S3 bucket: " +msgstr "Impossibile creare il contenitore S3: " + +#: ../IkiWiki/Plugin/amazon_s3.pm:221 +msgid "Failed to save file to S3: " +msgstr "Impossibile salvare il file sul S3: " + +#: ../IkiWiki/Plugin/amazon_s3.pm:243 +msgid "Failed to delete file from S3: " +msgstr "Impossibile eliminare il file dal S3: " + +#: ../IkiWiki/Plugin/attachment.pm:49 +#, perl-format +msgid "there is already a page named %s" +msgstr "esiste già una pagina chiamata %s" + +#: ../IkiWiki/Plugin/attachment.pm:65 +msgid "prohibited by allowed_attachments" +msgstr "non permesso da allowed_attachments" + +#: ../IkiWiki/Plugin/attachment.pm:140 +msgid "bad attachment filename" +msgstr "nome file dell'allegato non valido" + +#: ../IkiWiki/Plugin/attachment.pm:182 +msgid "attachment upload" +msgstr "carica allegato" + +#: ../IkiWiki/Plugin/autoindex.pm:105 +msgid "automatic index generation" +msgstr "generazione automatica dell'indice" + +#: ../IkiWiki/Plugin/blogspam.pm:108 +msgid "Sorry, but that looks like spam to blogspam: " +msgstr "È stato riconosciuto come spam da blogspam: " + +#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#, perl-format +msgid "%s from %s" +msgstr "%s da %s" + +#: ../IkiWiki/Plugin/brokenlinks.pm:50 +msgid "There are no broken links!" +msgstr "Non ci sono collegamenti rotti." + +#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/format.pm:38 +#, perl-format +msgid "unsupported page format %s" +msgstr "formato pagina %s non supportato" + +#: ../IkiWiki/Plugin/comments.pm:129 +msgid "comment must have content" +msgstr "i commenti devono avere un contenuto" + +#: ../IkiWiki/Plugin/comments.pm:185 +msgid "Anonymous" +msgstr "Anonimo" + +#: ../IkiWiki/Plugin/comments.pm:340 +#: ../IkiWiki/Plugin/editpage.pm:97 +msgid "bad page name" +msgstr "nome pagina non valido" + +#: ../IkiWiki/Plugin/comments.pm:345 +#, perl-format +msgid "commenting on %s" +msgstr "commento su %s" + +#: ../IkiWiki/Plugin/comments.pm:363 +#, perl-format +msgid "page '%s' doesn't exist, so you can't comment" +msgstr "la pagina «%s» non esiste, impossibile commentarla" + +#: ../IkiWiki/Plugin/comments.pm:370 +#, perl-format +msgid "comments on page '%s' are closed" +msgstr "i commenti per la pagina «%s» sono chiusi" + +#: ../IkiWiki/Plugin/comments.pm:464 +msgid "comment stored for moderation" +msgstr "commento trattenuto per moderazione" + +#: ../IkiWiki/Plugin/comments.pm:466 +msgid "Your comment will be posted after moderator review" +msgstr "Il commento sarà pubblicato dopo la verifica del moderatore" + +#: ../IkiWiki/Plugin/comments.pm:479 +msgid "Added a comment" +msgstr "Aggiunto commento" + +#: ../IkiWiki/Plugin/comments.pm:483 +#, perl-format +msgid "Added a comment: %s" +msgstr "Aggiunto commento: %s" + +#: ../IkiWiki/Plugin/comments.pm:525 +#: ../IkiWiki/Plugin/websetup.pm:236 +msgid "you are not logged in as an admin" +msgstr "non siete autenticati come amministratore" + +#: ../IkiWiki/Plugin/comments.pm:576 +msgid "Comment moderation" +msgstr "Moderazione commenti" + +#: ../IkiWiki/Plugin/comments.pm:615 +msgid "comment moderation" +msgstr "moderazione commento" + +#: ../IkiWiki/Plugin/comments.pm:766 +msgid "Comments" +msgstr "Commenti" + +#: ../IkiWiki/Plugin/conditional.pm:27 +#: ../IkiWiki/Plugin/cutpaste.pm:30 +#: ../IkiWiki/Plugin/cutpaste.pm:45 +#: ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/testpagespec.pm:26 +#, perl-format +msgid "%s parameter is required" +msgstr "parametro %s necessario" + +#: ../IkiWiki/Plugin/cutpaste.pm:66 +msgid "no text was copied in this page" +msgstr "nessun testo è stato copiato in questa pagina" + +#: ../IkiWiki/Plugin/cutpaste.pm:69 +#, perl-format +msgid "no text was copied in this page with id %s" +msgstr "nessun testo è stato copiato in questa pagina con l'id %s" + +#: ../IkiWiki/Plugin/editpage.pm:40 +#, perl-format +msgid "removing old preview %s" +msgstr "rimozione vecchia anteprima %s" + +#: ../IkiWiki/Plugin/editpage.pm:113 +#, perl-format +msgid "%s is not an editable page" +msgstr "%s non è una pagina modificabile" + +#: ../IkiWiki/Plugin/editpage.pm:292 +#, perl-format +msgid "creating %s" +msgstr "creazione %s" + +#: ../IkiWiki/Plugin/editpage.pm:310 +#: ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 +#: ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 +#, perl-format +msgid "editing %s" +msgstr "modifica %s" + +#: ../IkiWiki/Plugin/edittemplate.pm:51 +msgid "template not specified" +msgstr "modello non specificato" + +#: ../IkiWiki/Plugin/edittemplate.pm:54 +msgid "match not specified" +msgstr "corrispondenza non specificata" + +#: ../IkiWiki/Plugin/edittemplate.pm:62 +#, perl-format +msgid "edittemplate %s registered for %s" +msgstr "edittemplate %s registrato per %s" + +#: ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process" +msgstr "errore nell'elaborazione" + +#: ../IkiWiki/Plugin/format.pm:20 +msgid "must specify format and text" +msgstr "occorre specificare formato e testo" + +#: ../IkiWiki/Plugin/fortune.pm:27 +msgid "fortune failed" +msgstr "errore nel fortune" + +#: ../IkiWiki/Plugin/getsource.pm:62 +#: ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "pagina mancante" + +#: ../IkiWiki/Plugin/getsource.pm:64 +#: ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "La pagina %s non esiste." + +#: ../IkiWiki/Plugin/getsource.pm:73 +msgid "not a page" +msgstr "non è una pagina" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "%s è un allegato, non una pagina." + +#: ../IkiWiki/Plugin/git.pm:626 +#: ../IkiWiki/Plugin/git.pm:644 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "non è permesso modificare %s" + +#: ../IkiWiki/Plugin/git.pm:666 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "non è permesso lavorare su un file in modalità %s" + +#: ../IkiWiki/Plugin/git.pm:670 +msgid "you are not allowed to change file modes" +msgstr "non è permesso cambiare la modalità del file" + +#: ../IkiWiki/Plugin/google.pm:27 +#: ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/search.pm:36 +#, perl-format +msgid "Must specify %s when using the %s plugin" +msgstr "Occorre specificare %s quando si usa il plugin %s" + +#: ../IkiWiki/Plugin/google.pm:31 +msgid "Failed to parse url, cannot determine domain name" +msgstr "Errore nell'interpretazione dell'URL, impossibile determinare il nome del dominio" + +#: ../IkiWiki/Plugin/graphviz.pm:67 +msgid "failed to run graphviz" +msgstr "errore nell'eseguire graphviz" + +#: ../IkiWiki/Plugin/graphviz.pm:94 +msgid "prog not a valid graphviz program" +msgstr "prog non è un programma graphviz valido" + +#: ../IkiWiki/Plugin/highlight.pm:47 +#, perl-format +msgid "tohighlight contains unknown file type '%s'" +msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" + +#: ../IkiWiki/Plugin/highlight.pm:58 +#, perl-format +msgid "Source code: %s" +msgstr "Sorgente: %s" + +#: ../IkiWiki/Plugin/highlight.pm:123 +msgid "warning: highlight perl module not available; falling back to pass through" +msgstr "attenzione: modulo perl highlight non trovato, verrà passato inalterato" + +#: ../IkiWiki/Plugin/img.pm:63 +msgid "Image::Magick is not installed" +msgstr "Image::Magick non è installato" + +#: ../IkiWiki/Plugin/img.pm:72 +#, perl-format +msgid "wrong size format \"%s\" (should be WxH)" +msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" + +#: ../IkiWiki/Plugin/img.pm:83 +#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 +#, perl-format +msgid "failed to read %s: %s" +msgstr "impossibile leggere %s: %s" + +#: ../IkiWiki/Plugin/img.pm:90 +#, perl-format +msgid "failed to resize: %s" +msgstr "impossibile ridimensionare: %s" + +#: ../IkiWiki/Plugin/img.pm:119 +#, perl-format +msgid "failed to determine size of image %s" +msgstr "impossibile determinare la dimensione dell'immagine %s" + +#: ../IkiWiki/Plugin/inline.pm:92 +msgid "Must specify url to wiki with --url when using --rss or --atom" +msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" + +#: ../IkiWiki/Plugin/inline.pm:138 +msgid "page editing not allowed" +msgstr "modifica della pagina non ammessa" + +#: ../IkiWiki/Plugin/inline.pm:155 +msgid "missing pages parameter" +msgstr "parametro pagine mancante" + +#: ../IkiWiki/Plugin/inline.pm:191 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "i parametri %s e %s non possono essere usati insieme" + +#: ../IkiWiki/Plugin/inline.pm:212 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" + +#: ../IkiWiki/Plugin/inline.pm:223 +#, perl-format +msgid "unknown sort type %s" +msgstr "ordinamento %s sconosciuto" + +#: ../IkiWiki/Plugin/inline.pm:327 +msgid "Add a new post titled:" +msgstr "Aggiungere un nuovo articolo dal titolo:" + +#: ../IkiWiki/Plugin/inline.pm:347 +#, perl-format +msgid "nonexistant template %s" +msgstr "modello %s non esistente" + +#: ../IkiWiki/Plugin/inline.pm:612 +msgid "RPC::XML::Client not found, not pinging" +msgstr "RPC::XML::Client non trovato, impossibile inviare ping" + +#: ../IkiWiki/Plugin/linkmap.pm:106 +msgid "failed to run dot" +msgstr "impossibile eseguire dot" + +#: ../IkiWiki/Plugin/lockedit.pm:47 +#, perl-format +msgid "%s is locked and cannot be edited" +msgstr "%s è bloccata e non può essere modificata" + +#: ../IkiWiki/Plugin/mdwn.pm:44 +msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" +msgstr "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" + +#: ../IkiWiki/Plugin/mdwn.pm:67 +#, perl-format +msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" +msgstr "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" + +#: ../IkiWiki/Plugin/meta.pm:158 +msgid "stylesheet not found" +msgstr "foglio di stile non trovato" + +#: ../IkiWiki/Plugin/meta.pm:196 +msgid "redir page not found" +msgstr "pagina di reindirizzamento non trovata" + +#: ../IkiWiki/Plugin/meta.pm:210 +msgid "redir cycle is not allowed" +msgstr "ciclo di reindirizzamento non ammesso" + +#: ../IkiWiki/Plugin/mirrorlist.pm:42 +msgid "Mirrors" +msgstr "Mirror" + +#: ../IkiWiki/Plugin/mirrorlist.pm:42 +msgid "Mirror" +msgstr "Mirror" + +#: ../IkiWiki/Plugin/more.pm:8 +msgid "more" +msgstr "altro" + +#: ../IkiWiki/Plugin/norcs.pm:65 +msgid "getctime not implemented" +msgstr "getctime non implementata" + +#: ../IkiWiki/Plugin/openid.pm:61 +msgid "Log in with" +msgstr "Accedi tramite" + +#: ../IkiWiki/Plugin/openid.pm:64 +msgid "Get an OpenID" +msgstr "Ottieni un OpenID" + +#: ../IkiWiki/Plugin/orphans.pm:45 +msgid "All pages have other pages linking to them." +msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." + +#: ../IkiWiki/Plugin/pagetemplate.pm:30 +msgid "bad or missing template" +msgstr "modello errato o mancante" + +#: ../IkiWiki/Plugin/passwordauth.pm:248 +msgid "Account creation successful. Now you can Login." +msgstr "Account creato con successo. È ora possibile effettuare l'accesso." + +#: ../IkiWiki/Plugin/passwordauth.pm:251 +msgid "Error creating account." +msgstr "Errore nella creazione dell'account." + +#: ../IkiWiki/Plugin/passwordauth.pm:258 +msgid "No email address, so cannot email password reset instructions." +msgstr "Nessun indirizzo email, impossibile inviare per email le istruzioni per reimpostare la password." + +#: ../IkiWiki/Plugin/passwordauth.pm:292 +msgid "Failed to send mail" +msgstr "Impossibile spedire il messaggio" + +#: ../IkiWiki/Plugin/passwordauth.pm:294 +msgid "You have been mailed password reset instructions." +msgstr "Il messaggio con le istruzioni per reimpostare la password è stato inviato." + +#: ../IkiWiki/Plugin/passwordauth.pm:329 +msgid "incorrect password reset url" +msgstr "url per il reset della password non corretto" + +#: ../IkiWiki/Plugin/passwordauth.pm:332 +msgid "password reset denied" +msgstr "reset della password non permesso" + +#: ../IkiWiki/Plugin/pingee.pm:30 +msgid "Ping received." +msgstr "Ping ricevuto." + +#: ../IkiWiki/Plugin/pinger.pm:53 +msgid "requires 'from' and 'to' parameters" +msgstr "sono richiesti i parametri \"to\" e \"from\"" + +#: ../IkiWiki/Plugin/pinger.pm:58 +#, perl-format +msgid "Will ping %s" +msgstr "Verrà inviato un ping a %s" + +#: ../IkiWiki/Plugin/pinger.pm:61 +#, 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 +msgid "LWP not found, not pinging" +msgstr "LWP non trovato, ping non inviato" + +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno alla versione 0.35." + +#: ../IkiWiki/Plugin/po.pm:136 +#, perl-format +msgid "%s is not a valid language code" +msgstr "%s non è una codifica di lingua valida" + +#: ../IkiWiki/Plugin/po.pm:148 +#, 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:153 +msgid "po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default" +msgstr "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato po_link_to=default" + +#: ../IkiWiki/Plugin/po.pm:383 +#, 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:387 +#: ../IkiWiki/Render.pm:426 +#, perl-format +msgid "building %s" +msgstr "compilazione di %s" + +#: ../IkiWiki/Plugin/po.pm:424 +msgid "updated PO files" +msgstr "file PO aggiornati" + +#: ../IkiWiki/Plugin/po.pm:448 +msgid "Can not remove a translation. If the master page is removed, however, its translations will be removed as well." +msgstr "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è stata eliminata anche le traduzioni lo saranno." + +#: ../IkiWiki/Plugin/po.pm:468 +msgid "Can not rename a translation. If the master page is renamed, however, its translations will be renamed as well." +msgstr "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è stata rinominata anche le traduzioni lo saranno." + +#: ../IkiWiki/Plugin/po.pm:829 +#, perl-format +msgid "POT file (%s) does not exist" +msgstr "Il file POT (%s) non esiste" + +#: ../IkiWiki/Plugin/po.pm:843 +#, 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:852 +#, perl-format +msgid "failed to update %s" +msgstr "impossibile aggiornare %s" + +#: ../IkiWiki/Plugin/po.pm:858 +#, perl-format +msgid "failed to copy the POT file to %s" +msgstr "impossibile copiare il file POT in %s" + +#: ../IkiWiki/Plugin/po.pm:894 +msgid "N/A" +msgstr "N/D" + +#: ../IkiWiki/Plugin/po.pm:907 +#, perl-format +msgid "failed to translate %s" +msgstr "impossibile tradurre %s" + +#: ../IkiWiki/Plugin/po.pm:983 +msgid "removed obsolete PO files" +msgstr "file PO obsoleti rimossi" + +#: ../IkiWiki/Plugin/po.pm:1046 +#: ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 +#, perl-format +msgid "failed to write %s" +msgstr "impossibile scrivere %s" + +#: ../IkiWiki/Plugin/po.pm:1058 +msgid "failed to translate" +msgstr "impossibile tradurre" + +#: ../IkiWiki/Plugin/po.pm:1063 +#, perl-format +msgid "failed to read %s" +msgstr "impossibile leggere %s" + +#: ../IkiWiki/Plugin/po.pm:1112 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "dati gettext non validi, tornare alle pagina precedente per continuare le modifiche" + +#: ../IkiWiki/Plugin/poll.pm:69 +msgid "vote" +msgstr "voto" + +#: ../IkiWiki/Plugin/poll.pm:77 +msgid "Total votes:" +msgstr "Voti totali:" + +#: ../IkiWiki/Plugin/polygen.pm:41 +msgid "polygen not installed" +msgstr "polygen non è installato" + +#: ../IkiWiki/Plugin/polygen.pm:60 +msgid "command failed" +msgstr "errore nel comando" + +#: ../IkiWiki/Plugin/postsparkline.pm:41 +msgid "missing formula" +msgstr "formula mancante" + +#: ../IkiWiki/Plugin/postsparkline.pm:48 +msgid "unknown formula" +msgstr "formula sconosciuta" + +#. translators: These descriptions of times of day are used +#. translators: in messages like "last edited ". +#. translators: %A is the name of the day of the week, while +#. translators: %A- is the name of the previous day. +#: ../IkiWiki/Plugin/prettydate.pm:15 +msgid "late %A- night" +msgstr "%A- a tarda notte" + +#: ../IkiWiki/Plugin/prettydate.pm:17 +msgid "in the wee hours of %A- night" +msgstr "%A prima dell'alba" + +#: ../IkiWiki/Plugin/prettydate.pm:20 +msgid "terribly early %A morning" +msgstr "%A mattina molto presto" + +#: ../IkiWiki/Plugin/prettydate.pm:22 +msgid "early %A morning" +msgstr "%A mattina presto" + +#: ../IkiWiki/Plugin/prettydate.pm:25 +msgid "mid-morning %A" +msgstr "%A metà mattina" + +#: ../IkiWiki/Plugin/prettydate.pm:26 +msgid "late %A morning" +msgstr "%A mattina tardi" + +#: ../IkiWiki/Plugin/prettydate.pm:27 +msgid "at lunch time on %A" +msgstr "%A all'ora di pranzo" + +#: ../IkiWiki/Plugin/prettydate.pm:29 +msgid "%A afternoon" +msgstr "%A pomeriggio" + +#: ../IkiWiki/Plugin/prettydate.pm:32 +msgid "late %A afternoon" +msgstr "%A pomeriggio tardo" + +#: ../IkiWiki/Plugin/prettydate.pm:33 +msgid "%A evening" +msgstr "%A sera" + +#: ../IkiWiki/Plugin/prettydate.pm:35 +msgid "late %A evening" +msgstr "%A sera tardi" + +#: ../IkiWiki/Plugin/prettydate.pm:37 +msgid "%A night" +msgstr "%A notte" + +#: ../IkiWiki/Plugin/prettydate.pm:101 +msgid "at teatime on %A" +msgstr "%A all'ora di merenda" + +#: ../IkiWiki/Plugin/prettydate.pm:105 +msgid "at midnight" +msgstr "a mezzanotte" + +#: ../IkiWiki/Plugin/prettydate.pm:108 +msgid "at noon on %A" +msgstr "%A a mezzogiorno" + +#: ../IkiWiki/Plugin/progress.pm:34 +#, perl-format +msgid "illegal percent value %s" +msgstr "valore percentuale %s non ammesso" + +#: ../IkiWiki/Plugin/progress.pm:59 +msgid "need either `percent` or `totalpages` and `donepages` parameters" +msgstr "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e \"donepages\"" + +#: ../IkiWiki/Plugin/recentchangesdiff.pm:37 +msgid "(Diff truncated)" +msgstr "(Diff troncato)" + +#: ../IkiWiki/Plugin/remove.pm:31 +#: ../IkiWiki/Plugin/rename.pm:36 +#, perl-format +msgid "%s does not exist" +msgstr "%s non esiste" + +#: ../IkiWiki/Plugin/remove.pm:38 +#, perl-format +msgid "%s is not in the srcdir, so it cannot be deleted" +msgstr "%s non è in src, quindi non può essere eliminato" + +#: ../IkiWiki/Plugin/remove.pm:41 +#: ../IkiWiki/Plugin/rename.pm:45 +#, perl-format +msgid "%s is not a file" +msgstr "%s non è un file" + +#: ../IkiWiki/Plugin/remove.pm:134 +#, perl-format +msgid "confirm removal of %s" +msgstr "conferma rimozione di %s" + +#: ../IkiWiki/Plugin/remove.pm:171 +msgid "Please select the attachments to remove." +msgstr "Selezionare l'allegato da rimuovere." + +#: ../IkiWiki/Plugin/remove.pm:211 +msgid "removed" +msgstr "rimosso" + +#: ../IkiWiki/Plugin/rename.pm:42 +#, perl-format +msgid "%s is not in the srcdir, so it cannot be renamed" +msgstr "%s non è in src, quindi non può essere rinominato" + +#: ../IkiWiki/Plugin/rename.pm:62 +msgid "no change to the file name was specified" +msgstr "non è stata specificata nessuna modifica al nome del file" + +#: ../IkiWiki/Plugin/rename.pm:68 +#, perl-format +msgid "illegal name" +msgstr "nome non valido" + +#: ../IkiWiki/Plugin/rename.pm:73 +#, perl-format +msgid "%s already exists" +msgstr "%s esiste già" + +#: ../IkiWiki/Plugin/rename.pm:79 +#, perl-format +msgid "%s already exists on disk" +msgstr "%s già presente su disco" + +#: ../IkiWiki/Plugin/rename.pm:122 +#, perl-format +msgid "rename %s" +msgstr "rinomina di %s" + +#: ../IkiWiki/Plugin/rename.pm:161 +msgid "Also rename SubPages and attachments" +msgstr "Rinomina anche SottoPagine e allegati" + +#: ../IkiWiki/Plugin/rename.pm:247 +msgid "Only one attachment can be renamed at a time." +msgstr "Si può rinominare un solo allegato alla volta." + +#: ../IkiWiki/Plugin/rename.pm:250 +msgid "Please select the attachment to rename." +msgstr "Selezionare l'allegato da rinominare." + +#: ../IkiWiki/Plugin/rename.pm:347 +#, perl-format +msgid "rename %s to %s" +msgstr "rinomina %s in %s" + +#: ../IkiWiki/Plugin/rename.pm:571 +#, perl-format +msgid "update for rename of %s to %s" +msgstr "aggiornamento per rinomina di %s in %s" + +#: ../IkiWiki/Plugin/search.pm:182 +#, perl-format +msgid "need Digest::SHA1 to index %s" +msgstr "è necessario Digest::SHA1 per l'indice di %s" + +#: ../IkiWiki/Plugin/search.pm:217 +msgid "search" +msgstr "cerca" + +#: ../IkiWiki/Plugin/shortcut.pm:31 +#, perl-format +msgid "shortcut plugin will not work without %s" +msgstr "il plugin scorciatoia non può funzionare senza %s" + +#: ../IkiWiki/Plugin/shortcut.pm:44 +msgid "missing name or url parameter" +msgstr "parametro nome o url mancante" + +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:54 +#, perl-format +msgid "shortcut %s points to %s" +msgstr "la scorciatoia %s punta a %s" + +#: ../IkiWiki/Plugin/smiley.pm:43 +msgid "failed to parse any smileys" +msgstr "impossibile interpretare gli smile" + +#: ../IkiWiki/Plugin/sparkline.pm:72 +msgid "parse error" +msgstr "errore nell'interpretazione" + +#: ../IkiWiki/Plugin/sparkline.pm:78 +msgid "invalid featurepoint diameter" +msgstr "Diametro featurepoint non valido" + +#: ../IkiWiki/Plugin/sparkline.pm:88 +msgid "invalid featurepoint location" +msgstr "Posizione featurepoint non valida" + +#: ../IkiWiki/Plugin/sparkline.pm:99 +msgid "missing values" +msgstr "valori mancanti" + +#: ../IkiWiki/Plugin/sparkline.pm:104 +msgid "invalid height value" +msgstr "valore altezza non valido" + +#: ../IkiWiki/Plugin/sparkline.pm:111 +msgid "missing width parameter" +msgstr "parametro larghezza mancante" + +#: ../IkiWiki/Plugin/sparkline.pm:115 +msgid "invalid width value" +msgstr "valore larghezza non valido" + +#: ../IkiWiki/Plugin/sparkline.pm:153 +msgid "failed to run php" +msgstr "impossibile eseguire php" + +#: ../IkiWiki/Plugin/table.pm:31 +msgid "cannot find file" +msgstr "impossibile trovare il file" + +#: ../IkiWiki/Plugin/table.pm:87 +msgid "unknown data format" +msgstr "formato dati sconosiuto" + +#: ../IkiWiki/Plugin/table.pm:95 +msgid "empty data" +msgstr "nessun dato" + +#: ../IkiWiki/Plugin/table.pm:114 +msgid "Direct data download" +msgstr "Scaricamento diretto dei dati" + +#: ../IkiWiki/Plugin/table.pm:148 +#, perl-format +msgid "parse fail at line %d: %s" +msgstr "errore di interpretazione alla riga %d: %s" + +#: ../IkiWiki/Plugin/template.pm:29 +msgid "missing id parameter" +msgstr "parametro id mancante" + +#: ../IkiWiki/Plugin/template.pm:36 +#, perl-format +msgid "template %s not found" +msgstr "modello %s non trovato" + +#: ../IkiWiki/Plugin/template.pm:55 +msgid "failed to process:" +msgstr "errore nell'elaborazione:" + +#: ../IkiWiki/Plugin/teximg.pm:70 +msgid "missing tex code" +msgstr "codice tex mancante" + +#: ../IkiWiki/Plugin/teximg.pm:77 +msgid "code includes disallowed latex commands" +msgstr "nel codice sono presenti comandi latex non permessi" + +#: ../IkiWiki/Plugin/teximg.pm:128 +msgid "failed to generate image from code" +msgstr "impossibile generare l'immagine dal codice" + +#: ../IkiWiki/Plugin/websetup.pm:89 +msgid "plugin" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:108 +#, perl-format +msgid "enable %s?" +msgstr "abilitare %s?" + +#: ../IkiWiki/Plugin/websetup.pm:240 +msgid "setup file for this wiki is not known" +msgstr "il file di setup di questo wiki non è noto" + +#: ../IkiWiki/Plugin/websetup.pm:256 +msgid "main" +msgstr "principale" + +#: ../IkiWiki/Plugin/websetup.pm:257 +msgid "plugins" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:395 +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:399 +msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." +msgstr "Affinché le sottostanti modifiche alla configurazione abbiano effetto, occorre ricostruire il wiki." + +#: ../IkiWiki/Plugin/websetup.pm:436 +#, perl-format +msgid "Error: %s exited nonzero (%s). Discarding setup changes." +msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." + +#: ../IkiWiki/Receive.pm:35 +#, perl-format +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:264 +#, perl-format +msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this" +msgstr "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare allow_symlinks_before_srcdir per abilitare questa configurazione" + +#: ../IkiWiki/Render.pm:287 +#: ../IkiWiki/Render.pm:312 +#, perl-format +msgid "skipping bad filename %s" +msgstr "ignorato il file dal nome scorretto %s" + +#: ../IkiWiki/Render.pm:294 +#, perl-format +msgid "%s has multiple possible source pages" +msgstr "%s ha diverse pagine sorgenti possibili" + +#: ../IkiWiki/Render.pm:380 +#, perl-format +msgid "removing old page %s" +msgstr "rimozione della vecchia pagina %s" + +#: ../IkiWiki/Render.pm:421 +#, perl-format +msgid "scanning %s" +msgstr "scansione %s" + +#: ../IkiWiki/Render.pm:447 +#, perl-format +msgid "building %s, which links to %s" +msgstr "compilazione di %s, che è collegato a %s" + +#: ../IkiWiki/Render.pm:468 +#, perl-format +msgid "building %s, which depends on %s" +msgstr "compilazione di %s, che dipende da %s" + +#: ../IkiWiki/Render.pm:507 +#, perl-format +msgid "building %s, to update its backlinks" +msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" + +#: ../IkiWiki/Render.pm:519 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "rimozione di %s, non più richiesto da %s" + +#: ../IkiWiki/Render.pm:543 +#, perl-format +msgid "ikiwiki: cannot build %s" +msgstr "ikiwiki: impossibile compilare %s" + +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:19 +#, perl-format +msgid "cannot read %s: %s" +msgstr "impossibile leggere %s: %s" + +#: ../IkiWiki/Setup/Automator.pm:34 +msgid "you must enter a wikiname (that contains alphanumerics)" +msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" + +#: ../IkiWiki/Setup/Automator.pm:71 +#, perl-format +msgid "unsupported revision control system %s" +msgstr "sistema di controllo di revisione %s non supportato" + +#: ../IkiWiki/Setup/Automator.pm:97 +msgid "failed to set up the repository with ikiwiki-makerepo" +msgstr "impossibile creare un repository tramite ikiwiki-makerepo" + +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" + +#: ../IkiWiki/Wrapper.pm:16 +#, perl-format +msgid "%s doesn't seem to be executable" +msgstr "%s non sembra essere eseguibile" + +#: ../IkiWiki/Wrapper.pm:20 +msgid "cannot create a wrapper that uses a setup file" +msgstr "impossibile creare un contenitore che utilizzi un file di setup" + +#: ../IkiWiki/Wrapper.pm:24 +msgid "wrapper filename not specified" +msgstr "nome del file del contenitore non specificato" + +#. translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:152 +#, perl-format +msgid "failed to compile %s" +msgstr "errore nel compilare %s" + +#. translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:172 +#, perl-format +msgid "successfully generated %s" +msgstr "%s generato con successo" + +#: ../ikiwiki.in:13 +msgid "usage: ikiwiki [options] source dest" +msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" + +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr " ikiwiki --setup configfile" + +#: ../ikiwiki.in:91 +msgid "usage: --set var=value" +msgstr "utilizzo: --set var=valore" + +#: ../ikiwiki.in:140 +msgid "generating wrappers.." +msgstr "generazione contenitori..." + +#: ../ikiwiki.in:199 +msgid "rebuilding wiki.." +msgstr "ricostruzione wiki..." + +#: ../ikiwiki.in:202 +msgid "refreshing wiki.." +msgstr "aggiornamento wiki..." + +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Discussione" + +#: ../IkiWiki.pm:494 +msgid "Must specify url to wiki with --url when using --cgi" +msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" + +#: ../IkiWiki.pm:540 +msgid "cannot use multiple rcs plugins" +msgstr "impossibile usare più plugin rcs" + +#: ../IkiWiki.pm:569 +#, perl-format +msgid "failed to load external plugin needed for %s plugin: %s" +msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" + +#: ../IkiWiki.pm:1243 +#, perl-format +msgid "preprocessing loop detected on %s at depth %i" +msgstr "ciclo del preprocessore individuato su %s alla profondità %i" + +#: ../IkiWiki.pm:1783 +msgid "yes" +msgstr "sì" + +#: ../IkiWiki.pm:1915 +#, perl-format +msgid "cannot match pages: %s" +msgstr "impossibile trovare pagine corrispondenti: %s" + +#: ../auto.setup:16 +msgid "What will the wiki be named?" +msgstr "Quale sarà il nome del wiki?" + +#: ../auto.setup:16 +msgid "wiki" +msgstr "wiki" + +#: ../auto.setup:18 +msgid "What revision control system to use?" +msgstr "Che sistema di controllo di revisione usare?" + +#: ../auto.setup:20 +msgid "Which user (wiki account or openid) will be admin?" +msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" + +#: ../auto.setup:23 +msgid "What is the domain name of the web server?" +msgstr "Qual è il nome del dominio del server web?" + -- cgit v1.2.3 From 99626615ff41a257090414bf500a83674e8fdc27 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Aug 2009 13:39:33 -0400 Subject: Fix example blog's tags/life to not have a broken PageSpec. Closes: #543510 --- debian/changelog | 2 ++ doc/examples/blog/tags/life.mdwn | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b021ec24..cfe45c3b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low Closes: #542036 * po: Fixed to run rcs_add ralative to srcdir. * Italian program translation from Luca Bruno. + * Fix example blog's tags/life to not have a broken PageSpec. + Closes: #543510 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn index ddc2e646c..719f2b192 100644 --- a/doc/examples/blog/tags/life.mdwn +++ b/doc/examples/blog/tags/life.mdwn @@ -1,4 +1,4 @@ This feed contains pages in the "life" category. -[[!inline pages="link(tags/life) and ./posts/* and !*/Discussion" +[[!inline pages="link(tags/life) and !*/Discussion" show="10" actions=yes]] -- cgit v1.2.3 From 2ef6b15973290619fdcbda2e323dbb50224622cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Aug 2009 17:27:32 -0400 Subject: changelog and news file, also make postinst rebuild on upgrade --- debian/NEWS | 10 ++++++++++ debian/changelog | 10 ++++++++-- debian/postinst | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 75b6d0471..535708872 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,13 @@ +ikiwiki (3.1415926) UNRELEASED; urgency=low + + In order to fix a performance bug, all wikis need to be rebuilt on + upgrade to this version. If you listed your wiki in + /etc/ikiwiki/wikilist this will be done automatically when the + Debian package is upgraded. Or use ikiwiki-mass-rebuild to force + a rebuild. + + -- Joey Hess Tue, 25 Aug 2009 17:24:43 -0400 + ikiwiki (3.13) unstable; urgency=low The `ikiwiki-transition deduplinks` command introduced in the diff --git a/debian/changelog b/debian/changelog index cfe45c3b3..0d3f61e6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.141593) UNRELEASED; urgency=low +ikiwiki (3.1415926) UNRELEASED; urgency=low * po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205 @@ -22,6 +22,12 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Italian program translation from Luca Bruno. * Fix example blog's tags/life to not have a broken PageSpec. Closes: #543510 + * Optimize the dependencies list. This also fixes a bug + that could cause repeated refreshes of the wiki to grow + increasingly larger dependency lists, and get increasingly + slower. (smcv) + * Rebuild wikis on upgrade to this version to fix bloat caused + by the dependency bug. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 @@ -29,7 +35,7 @@ ikiwiki (3.141592) unstable; urgency=low * Add new hooks: canremove, canrename, rename. (intrigeri) * rename: Refactor subpage rename handling code into rename hook. (intrigeri) - * po: New plugin, suporting translation of wiki pages using po files. + * po: New plugin, suporting translation of wiki pages using po files. (intrigeri) * Add build machinery to build po files to translate the underlay wikis, * Add further build machinery to generate translated underlays from diff --git a/debian/postinst b/debian/postinst index 0a836a0b2..2ba26e5b6 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=2.52 +firstcompat=3.1415926 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then -- cgit v1.2.3 From 4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:24:51 -0400 Subject: htmltidy: Print a warning message if tidy fails. Closes: #543722 --- IkiWiki/Plugin/htmltidy.pm | 5 ++++- debian/changelog | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 6f3379ef4..fc0d3b1d6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -46,7 +46,10 @@ sub sanitize (@) { waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return "" if $sigpipe || ! defined $ret; + if ($sigpipe || ! defined $ret) { + print STDERR gettext("warning: tidy failed")."\n"; + return ""; + } return $ret; } diff --git a/debian/changelog b/debian/changelog index 0d3f61e6f..69e197e37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. + * htmltidy: Print a warning message if tidy fails. Closes: #543722 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From f8ad1bfec4e12944482d5f58a0961b0c476602c9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 15:50:43 -0400 Subject: fix cherry-picked --- debian/changelog | 1 + doc/plugins/po.mdwn | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 69e197e37..9f10c2913 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. * htmltidy: Print a warning message if tidy fails. Closes: #543722 + * po: Fix name of translated toplevel index page. (intrigeri) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 9c4d8ffbd..f020adac2 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -289,27 +289,6 @@ order, as `po_slave_languages` is a hash. It would need to be converted to an array to support this. (If twere done, twere best done quickly.) --[[Joey]] -Name of toplevel index page ---------------------------- - -Normally at the top index page of a wiki, you see the wiki name at -the top. However, at the top *translated* index page, you see something -like "index.da". --[[Joey]] - -> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'` -> test with a predicate call such as isindexpage($page). Such a predicate -> function could then be overriden by the po plugin. --[[intrigeri]] - ->> Could do that, but if you have such a function it's natural to want to ->> use it elsewhere. Not clear to me it would make sense for po to override ->> such a function if it were used in some of the other places that compare ->> to index. ->> ->> The other option would be for po to override the template setting. ->> --[[Joey]] - ->>> Great idea. Commit 6c0f9c691c3df3a in my po branch does it. --[[intrigeri]] - Pagespecs --------- -- cgit v1.2.3 From 18e4fa65399f2a21bd943b0e62b81a100f941d44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 15:54:44 -0400 Subject: fix merged --- debian/changelog | 1 + doc/plugins/po.mdwn | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f10c2913..b4169c576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low by the dependency bug. * htmltidy: Print a warning message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) + * po: Fix display of links from a translated page to itself (ntrigeri) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index f020adac2..57459c1ef 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -253,33 +253,6 @@ once [[intrigeri]]'s `meta` branch is merged. An integration branch, called `meta-po`, merges [[intrigeri]]'s `po` and `meta` branches, and thus has this additional features. -Self links ----------- - -If a page contains a WikiLink to itself, ikiwiki does not normally -turn that into a hyperlink. However, if a translated page contains a -WikiLink to itself, a hyperlink is inserted, at least with the default -`po_link_to` the link points to the English version of the page. Is there a -good reason for that to be done? --[[Joey]] - -> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]] - ->> It may fix it in passing, but shouldn't it also be fixed for the other ->> `po_link_to` styles? - ->>> Other `po_link_to` styles already work ok: say there is ->>> a \[[dest]] link on a page called `dest`. When rendering ->>> `dest.LL`, `mybestlink` returns `dest.LL`, and `htmllink` is then ->>> able to detect, and manage correctly, that it is a self-link. ->>> --[[intrigeri]] - ->> (Also, if `mybestlink` is going to always just return `bestlink` in ->> this case, there seems no reason to inject it.) --[[Joey]] - ->>> Right. Commit cdc3576c8d1efb2 in my po branch prevents ->>> `mybestlink` to be injected when `po_link_to` is ->>> `default`. --[[intrigeri]] - Language display order ---------------------- -- cgit v1.2.3 From 0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 16:27:57 -0400 Subject: htmltidy: Return an error message if tidy fails. Closes: #543722 On second^Wthird^Wfourth thought, putting the message into the page seems better than using stderr. --- IkiWiki/Plugin/htmltidy.pm | 3 +-- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index fc0d3b1d6..e6d377f8a 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -47,8 +47,7 @@ sub sanitize (@) { $SIG{PIPE}="DEFAULT"; if ($sigpipe || ! defined $ret) { - print STDERR gettext("warning: tidy failed")."\n"; - return ""; + return gettext("htmltidy failed to parse this html"); } return $ret; diff --git a/debian/changelog b/debian/changelog index b4169c576..8cd5032cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. - * htmltidy: Print a warning message if tidy fails. Closes: #543722 + * htmltidy: Return an error message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) -- cgit v1.2.3 From 29e1c8e033880abd4541b99cbd436ab2c81d752e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 06:12:05 -0400 Subject: Czech basewiki enabled --- debian/changelog | 1 + po/underlay.setup | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8cd5032cd..045f27540 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * htmltidy: Return an error message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) + * Add Czech basewiki translation from Miroslav Kure. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/po/underlay.setup b/po/underlay.setup index 3e6c12566..76df2e29c 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -11,6 +11,7 @@ use IkiWiki::Setup::Standard { #'es' => 'Español', #'de' => 'Deutsch', 'da' => 'Dansk', + 'cs' =" 'česky', }, po_master_language => { 'code' => 'en', 'name' => 'English' }, po_translatable_pages => "*", -- cgit v1.2.3 From cc6000f0b9b82b19ea4635edcace2f6ba164adf1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 07:34:09 -0400 Subject: both changes picked --- debian/changelog | 3 +++ doc/plugins/po.mdwn | 2 ++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 045f27540..d10bc36cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) * Add Czech basewiki translation from Miroslav Kure. + * po: fix interdiction to create pages of type po (intrigeri) + * po: po: favor the type of linking page's masterpage on page creation + (intrigeri) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 3b152586e..fdef41e45 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -330,6 +330,8 @@ This code favors the type of the linking page's masterpage on page creation (when `from=page.LL`). This is commit c9301d2c296f682. --[[intrigeri]] +> Both cherry picked. --[[Joey]] + Documentation ------------- -- cgit v1.2.3 From 4e3a2a370cdc431091b32e8d5fa03c8718e6ea4a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 15:11:21 -0400 Subject: changelpg --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d10bc36cf..870abfdd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. + * Further optimisation of dependency handling by adding a special + case for simple page dependencies. (smcv) * htmltidy: Return an error message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) -- cgit v1.2.3 From 03449610d6c666ba24bea68f01d896613e522278 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 23:23:06 -0400 Subject: img: Don't generate new verison of image if it is scaled to be larger in either dimension. Although imagemagick handles even really large sizes sanely, using a page file, doing so would just waste time and disk space, since the browser can be told to resize it larger. --- IkiWiki/Plugin/img.pm | 39 ++++++++++++++++++++++++++++++++++++--- debian/changelog | 2 ++ 2 files changed, 38 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 5f97e3810..9ae85c4e6 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -65,6 +65,8 @@ sub preprocess (@) { my $imglink; my $r; + my ($dwidth, $dheight); + if ($params{size} ne 'full') { add_depends($params{page}, $image); @@ -86,7 +88,15 @@ sub preprocess (@) { $r = $im->Read($srcfile); error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; - $r = $im->Resize(geometry => "${w}x${h}"); + # don't resize any larger + my ($rw, $rh) = ($w, $h); + if ((length $rw && $rw > $im->Get("width")) || + (length $rh && $rh > $im->Get("height"))) { + $rw=$im->Get("width"); + $rh=$im->Get("height"); + } + + $r = $im->Resize(geometry => "${rw}x${rh}"); error sprintf(gettext("failed to resize: %s"), $r) if $r; # don't actually write file in preview mode @@ -98,11 +108,34 @@ sub preprocess (@) { $imglink = $file; } } + + # since we don't really resize larger, set the display + # size, so the browser can scale the image up if necessary + if (length $w && length $h) { + ($dwidth, $dheight)=($w, $h); + } + # avoid division by zero on 0x0 image + elsif ($im->Get("width") == 0 || $im->Get("height") == 0) { + ($dwidth, $dheight)=(0, 0); + } + # calculate unspecified size from the other one, preserving + # aspect ratio + elsif (length $w) { + $dwidth=$w; + $dheight=$w / $im->Get("width") * $im->Get("height"); + } + elsif (length $h) { + $dheight=$h; + $dwidth=$h / $im->Get("height") * $im->Get("width"); + } + } else { $r = $im->Read($srcfile); error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; $imglink = $file; + $dwidth = $im->Get("width"); + $dheight = $im->Get("height"); } my ($fileurl, $imgurl); @@ -120,8 +153,8 @@ sub preprocess (@) { } my $imgtag=''.$params{alt}.' Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From 9f75d3b1f3c43820cff9ce554601f64c60d72b14 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 28 Aug 2009 23:07:27 -0700 Subject: teximg: Make TeX handle preventing unsafe things; remove insufficient blacklist TeX has configuration options that prevent unsafe things like shell escapes and insecure file reads/writes. Turn all of them on. teximg's regex-based blacklist does not suffice. For instance: [[!teximg code=""" \catcode`\%=0 %input{/etc/passwd} """]] Remove the blacklist, since the TeX configuration options seal off the underlying mechanisms more safely, and the blacklist blocks other TeX commands that can prove useful. --- IkiWiki/Plugin/teximg.pm | 40 ++-------------------------------------- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 38 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm index dba5372b5..f92ed0132 100644 --- a/IkiWiki/Plugin/teximg.pm +++ b/IkiWiki/Plugin/teximg.pm @@ -69,13 +69,7 @@ sub preprocess (@) { if (! defined $code && ! length $code) { error gettext("missing tex code"); } - - if (check($code)) { - return create($code, check_height($height), \%params); - } - else { - error gettext("code includes disallowed latex commands") - } + return create($code, check_height($height), \%params); } sub check_height ($) { @@ -155,7 +149,7 @@ sub gen_image ($$$$) { my $tmp = eval { create_tmp_dir($digest) }; if (! $@ && writefile("$digest.tex", $tmp, $tex) && - system("cd $tmp; latex --interaction=nonstopmode $tmp/$digest.tex > /dev/null") == 0 && + system("cd $tmp; shell_escape=f openout_any=p openin_any=p latex --interaction=nonstopmode $digest.tex < /dev/null > /dev/null") == 0 && # ensure destination directory exists writefile("$imagedir/$digest.png", $config{destdir}, "") && (($config{teximg_dvipng} && @@ -191,34 +185,4 @@ sub create_tmp_dir ($) { return $tmpdir; } -sub check ($) { - # Check if the code is ok - my $code = shift; - - my @badthings = ( - qr/\$\$/, - qr/\\include/, - qr/\\includegraphic/, - qr/\\usepackage/, - qr/\\newcommand/, - qr/\\renewcommand/, - qr/\\def/, - qr/\\input/, - qr/\\open/, - qr/\\loop/, - qr/\\errorstopmode/, - qr/\\scrollmode/, - qr/\\batchmode/, - qr/\\read/, - qr/\\write/, - ); - - foreach my $thing (@badthings) { - if ($code =~ m/$thing/ ) { - return 0; - } - } - return 1; -} - 1 diff --git a/debian/changelog b/debian/changelog index 992692566..a5b07aac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low + [ Joey Hess ] * po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205 * inline: Avoid use of my $_ as it fails with older perls. @@ -40,6 +41,10 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * img: Don't generate new verison of image if it is scaled to be larger in either dimension. + [ Josh Triplett ] + * teximg: Replace the insufficient blacklist with the built-in security + mechanisms of TeX. + -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 ikiwiki (3.141592) unstable; urgency=low -- cgit v1.2.3