From: Joey Hess Date: Sun, 26 Oct 2008 19:13:04 +0000 (-0400) Subject: do no-op post_commit test in wrapper X-Git-Tag: 2.68~62 X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=d3d399941061d95cd4aae6ae2cf7594a4e5e7452 do no-op post_commit test in wrapper This speeds up web commits by 1/4th of a second or so, since perl does not have to start up for the post commit hook. perl's locking is completly FuBar, since it's impossible to tell what perl flock() really does, and thus difficult to write code in other languages that interoperates with perl's locking. (Let alone interoperating with existing fcntl locking from perl...) In this particular case, I think I was able to find a way to avoid the insanity, mostly. The C code does a true flock(2), and if perl is using an incompatable lock method that does not use the same locking primative at the kernel level, then the C code's test will fail, and it will go ahead and run the perl code. Then the perl code's test will test the right thing. On Debian, at least lately, perl's flock() does a true flock(2), so the optimisation does work. --- diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index fd8a0e5b0..99237d3b5 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -31,7 +31,7 @@ sub gen_wrapper () { #{{{ HTTP_COOKIE REMOTE_USER HTTPS} if $config{cgi}; my $envsave=""; foreach my $var (@envsave) { - $envsave.=<<"EOF" + $envsave.=<<"EOF"; if ((s=getenv("$var"))) addenv("$var", s); EOF @@ -43,6 +43,31 @@ EOF $test_receive=IkiWiki::Receive::gen_wrapper(); } + my $check_commit_hook=""; + if ($config{post_commit}) { + # Optimise checking !commit_hook_enabled() , + # so that ikiwiki does not have to be started if the + # hook is disabled. + # + # Note that perl's flock may be implemented using fcntl + # or lockf on some systems. If so, and if there is no + # interop between the locking systems, the true C flock will + # always succeed, and this optimisation won't work. + # The perl code will later correctly check the lock, + # so the right thing will still happen, though without + # the benefit of this optimisation. + $check_commit_hook=<<"EOF"; + { + int fd=open("$config{wikistatedir}/commitlock", O_CREAT | O_RDWR); + if (fd != -1) { + if (flock(fd, LOCK_SH | LOCK_NB) != 0) + exit(0); + close(fd); + } + } +EOF + } + $Data::Dumper::Indent=0; # no newlines my $configstring=Data::Dumper->Dump([\%config], ['*config']); $configstring=~s/\\/\\\\/g; @@ -56,9 +81,12 @@ EOF /* A wrapper for ikiwiki, can be safely made suid. */ #include #include +#include +#include #include #include #include +#include extern char **environ; char *newenviron[$#envsave+6]; @@ -75,6 +103,7 @@ addenv(char *var, char *val) { int main (int argc, char **argv) { char *s; +$check_commit_hook $test_receive $envsave newenviron[i++]="HOME=$ENV{HOME}"; diff --git a/debian/changelog b/debian/changelog index d8e26e4c9..63556c941 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,8 +31,8 @@ ikiwiki (2.68) UNRELEASED; urgency=low * external: RPC functions can be injected to replace exported functions. * Updated Spanish translation from the ever vigilant Victor Moral. * Updated Danish translation from Jonas Smedegaard. Closes: #503117 - * Optimise the no-op post-commit hook in the web edit case by skipping - loading plugins. (Particularly a win when using external plugins.) + * Optimise the no-op post-commit hook, to speed up web edits by a fraction + of a second. * Add support for checking pushes from untrusted git committers. This can be used to set up anonymous git pushes, and other similar things. diff --git a/ikiwiki.in b/ikiwiki.in index f2407b8d0..af5cabdc0 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -119,11 +119,6 @@ sub getconfig () { #{{{ } delete $ENV{WRAPPED_OPTIONS}; - if ($config{post_commit} && ! commit_hook_enabled()) { - # optimisation for no-op post_commit - exit 0; - } - loadplugins(); checkconfig(); } diff --git a/po/bg.po b/po/bg.po index 9167079fa..471e03119 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: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -49,7 +49,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Грешка" @@ -131,7 +131,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "готово" @@ -212,6 +212,10 @@ msgstr "" msgid "removing old preview %s" msgstr "премахване на старата страница „%s”" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -253,6 +257,21 @@ msgstr "грешка при обработване на шаблона" msgid "fortune failed" msgstr "грешшка в приставката „fortune”" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -816,6 +835,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "пропускане на невалидното име на файл „%s”" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -908,19 +937,19 @@ msgstr "не е указан файл на обвивката" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "грешка при запис на файла „%s”: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -937,39 +966,39 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "генериране на обвивки..." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/cs.po b/po/cs.po index 80d8bf999..ece992c47 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: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -47,7 +47,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Chyba" @@ -128,7 +128,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "hotovo" @@ -209,6 +209,10 @@ msgstr "" msgid "removing old preview %s" msgstr "odstraňuji starou stránku %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -250,6 +254,21 @@ msgstr "nepodařilo se zpracovat:" msgid "fortune failed" msgstr "fortune selhal" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -797,6 +816,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "přeskakuji chybné jméno souboru %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -889,19 +918,19 @@ msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "nelze zapsat %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -918,37 +947,37 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "generuji obaly..." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "znovu vytvářím wiki..." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, 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:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/da.po b/po/da.po index 6582f7762..3d0deca8a 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-22 18:58+0200\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2008-10-22 19:13+0100\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -27,8 +27,7 @@ msgstr "Du skal først logge på." msgid "login failed, perhaps you need to turn on cookies?" msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?" -#: ../IkiWiki/CGI.pm:163 -#: ../IkiWiki/Plugin/editpage.pm:350 +#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:350 msgid "Your login session has expired." msgstr "Din kørsel (login session) er udløbet" @@ -52,9 +51,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:385 -#: ../IkiWiki/CGI.pm:386 -#: ../IkiWiki.pm:1166 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Fejl" @@ -95,8 +92,8 @@ msgstr "udløber %s" #: ../IkiWiki/Plugin/aggregate.pm:463 #, perl-format -msgid "processed ok at %s" -msgstr "korrekt dannet ved %s" +msgid "last checked %s" +msgstr "" #: ../IkiWiki/Plugin/aggregate.pm:467 #, perl-format @@ -135,8 +132,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 -#: ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "færdig" @@ -157,20 +153,20 @@ msgstr "Arkivering af fil i S3 mislykkedes: " msgid "Failed to delete file from S3: " msgstr "Sletning af fil fra S3 mislykkedes: " -#: ../IkiWiki/Plugin/attachment.pm:48 +#: ../IkiWiki/Plugin/attachment.pm:49 #, perl-format msgid "there is already a page named %s" msgstr "der er allerede en side ved navn %s" -#: ../IkiWiki/Plugin/attachment.pm:81 +#: ../IkiWiki/Plugin/attachment.pm:82 msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:189 +#: ../IkiWiki/Plugin/attachment.pm:190 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:231 +#: ../IkiWiki/Plugin/attachment.pm:232 msgid "attachment upload" msgstr "vedhæftningsoplægning" @@ -178,12 +174,9 @@ msgstr "vedhæftningsoplægning" msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 -#: ../IkiWiki/Plugin/editpage.pm:261 -#: ../IkiWiki/Plugin/inline.pm:327 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 -#: ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 +#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261 +#: ../IkiWiki/Plugin/inline.pm:327 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 #: ../IkiWiki/Render.pm:149 msgid "discussion" msgstr "diskussion" @@ -197,10 +190,8 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/conditional.pm:27 -#: ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 -#: ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../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" @@ -220,6 +211,11 @@ msgstr "ingen tekst blev kopieret i denne side med id %s" msgid "removing old preview %s" msgstr "fjerner gammelt smugkig %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +#, fuzzy +msgid "bad page name" +msgstr "dårligt vedhæftningsfilnavn" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -230,10 +226,8 @@ msgstr "%s er ikke en redigérbar side" msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:335 -#: ../IkiWiki/Plugin/editpage.pm:363 -#: ../IkiWiki/Plugin/editpage.pm:373 -#: ../IkiWiki/Plugin/editpage.pm:408 +#: ../IkiWiki/Plugin/editpage.pm:335 ../IkiWiki/Plugin/editpage.pm:363 +#: ../IkiWiki/Plugin/editpage.pm:373 ../IkiWiki/Plugin/editpage.pm:408 #: ../IkiWiki/Plugin/editpage.pm:453 #, perl-format msgid "editing %s" @@ -260,6 +254,22 @@ msgstr "dannelsen mislykkedes" msgid "fortune failed" msgstr "spådom (fortune) fejlede" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, fuzzy, perl-format +msgid "you are not allowed to change %s" +msgstr "du er ikke logget på som en administrator" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +#, fuzzy +msgid "you are not allowed to change file modes" +msgstr "du er ikke logget på som en administrator" + #: ../IkiWiki/Plugin/google.pm:27 #, perl-format msgid "Must specify %s when using the google search plugin" @@ -290,8 +300,7 @@ msgstr "Image::Magick ikke installeret" msgid "bad size \"%s\"" msgstr "forkert størrelse \"%s\"" -#: ../IkiWiki/Plugin/img.pm:80 -#: ../IkiWiki/Plugin/img.pm:84 +#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 #: ../IkiWiki/Plugin/img.pm:101 #, perl-format msgid "failed to read %s: %s" @@ -333,8 +342,7 @@ msgstr "Tilføj nyt indlæg med følgende titel:" msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:335 -#: ../IkiWiki/Render.pm:83 +#: ../IkiWiki/Plugin/inline.pm:335 ../IkiWiki/Render.pm:83 msgid "Discussion" msgstr "Diskussion" @@ -346,20 +354,22 @@ msgstr "RPC::XML::Client ikke fundet, pinger ikke" msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/lockedit.pm:49 -#: ../IkiWiki/Plugin/lockedit.pm:66 +#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s er låst og kan ikke redigeres" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" +msgstr "" +"multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" -msgstr "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) mislykkedes" +msgstr "" +"Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " +"mislykkedes" #: ../IkiWiki/Plugin/meta.pm:150 msgid "stylesheet not found" @@ -415,7 +425,8 @@ msgstr "Fejl ved kontooprettelse." #: ../IkiWiki/Plugin/passwordauth.pm:257 msgid "No email address, so cannot email password reset instructions." -msgstr "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner." +msgstr "" +"Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner." #: ../IkiWiki/Plugin/passwordauth.pm:291 msgid "Failed to send mail" @@ -565,8 +576,7 @@ msgstr "Siden %s eksisterer ikke." msgid "(Diff truncated)" msgstr "(Diff trunkeret)" -#: ../IkiWiki/Plugin/remove.pm:31 -#: ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 #, perl-format msgid "%s does not exist" msgstr "%s eksisterer ikke" @@ -576,8 +586,7 @@ msgstr "%s eksisterer ikke" msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s er ikke i srcdir, så kan ikke blive slettet" -#: ../IkiWiki/Plugin/remove.pm:41 -#: ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 #, perl-format msgid "%s is not a file" msgstr "%s er ikke en fil" @@ -784,25 +793,45 @@ msgid "plugins" msgstr "udvidelser" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i kraft." +msgid "" +"The configuration changes shown below require a wiki rebuild to take effect." +msgstr "" +"Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " +"kraft." #: ../IkiWiki/Plugin/websetup.pm:399 -msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." -msgstr "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du muligvis genopbygge wikien." +msgid "" +"For the configuration changes shown below to fully take effect, you may need " +"to rebuild the wiki." +msgstr "" +"For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " +"muligvis genopbygge wikien." #: ../IkiWiki/Plugin/websetup.pm:433 #, perl-format msgid "

Error: %s exited nonzero (%s)" msgstr "

Fejl: %s sluttede med fejl (%s)" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "udelader forkert filnavn %s" + #: ../IkiWiki/Render.pm:253 #, perl-format -msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this" -msgstr "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir for at tillade dette" +msgid "" +"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " +"allow this" +msgstr "" +"symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " +"for at tillade dette" -#: ../IkiWiki/Render.pm:277 -#: ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" @@ -887,19 +916,19 @@ msgstr "wrapper-navn ikke angivet" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "skrivning ad %s mislykkedes: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -916,37 +945,38 @@ msgstr " ikiwiki --setup opsætningsfil" msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "bygger wrappers.." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, 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" +msgstr "" +"indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1149 +#: ../IkiWiki.pm:1165 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1658 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "ja" @@ -970,3 +1000,5 @@ msgstr "Hvilken wiki bruger (eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er domænenavnet på webserveren?" +#~ msgid "processed ok at %s" +#~ msgstr "korrekt dannet ved %s" diff --git a/po/de.po b/po/de.po index b76ddeac9..bef54ad89 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 2.40\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2008-03-03 21:22+0100\n" "Last-Translator: Kai Wasserbäch \n" "Language-Team: German \n" @@ -47,7 +47,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Fehler" @@ -128,7 +128,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "fertig" @@ -209,6 +209,10 @@ msgstr "" msgid "removing old preview %s" msgstr "entferne alte Seite %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -247,6 +251,21 @@ msgstr "Bearbeitung fehlgeschlagen" msgid "fortune failed" msgstr "»fortune« fehlgeschlagen" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -792,6 +811,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "überspringe fehlerhaften Dateinamen %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -884,19 +913,19 @@ msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "schreiben von %s fehlgeschlagen: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -913,39 +942,39 @@ msgstr "" msgid "usage: --set var=value" msgstr "Benutzung: --set Variable=Wert" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "erzeuge Wrapper.." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife %s auf Seite %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/es.po b/po/es.po index ebe7bd06a..7afb45c14 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2008-10-22 13:54+0200\n" "Last-Translator: Víctor Moral \n" "Language-Team: Spanish \n" @@ -48,7 +48,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Error" @@ -130,7 +130,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "completado" @@ -209,6 +209,11 @@ msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina" msgid "removing old preview %s" msgstr "eliminando la antigua previsualización %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +#, fuzzy +msgid "bad page name" +msgstr "nombre de archivo adjunto erróneo" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -247,14 +252,33 @@ msgstr "fallo en el proceso" msgid "fortune failed" msgstr "el programa fortune ha fallado" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, fuzzy, perl-format +msgid "you are not allowed to change %s" +msgstr "No está registrado como un administrador" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +#, fuzzy +msgid "you are not allowed to change file modes" +msgstr "No está registrado como un administrador" + #: ../IkiWiki/Plugin/google.pm:27 #, perl-format msgid "Must specify %s when using the google search plugin" -msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda de google" +msgstr "" +"Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda de " +"google" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "Error en el análisis del URL, no puedo determinar el nombre del dominio" +msgstr "" +"Error en el análisis del URL, no puedo determinar el nombre del dominio" #: ../IkiWiki/Plugin/googlecalendar.pm:32 msgid "failed to find url in html" @@ -795,6 +819,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "

Error: %s finaliza con código distinto de cero (%s)" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "ignorando el archivo %s porque su nombre no es correcto" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -892,19 +926,19 @@ msgstr "el programa envoltorio no ha sido especificado" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "no puedo escribir en %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "ha fallado la compilación del programa %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -921,41 +955,41 @@ msgstr " ikiwiki --setup archivo_de_configuración" msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "generando programas auxiliares.." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, 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:1156 +#: ../IkiWiki.pm:1165 #, 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:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "si" @@ -974,7 +1008,8 @@ msgstr "¿ Qué sistema de control de versiones empleará ?" #: ../auto.setup:20 msgid "What wiki user (or openid) will be wiki admin?" msgstr "" -"¿ Qué usuario del wiki (ó identificador openid) será el administrador del wiki ? " +"¿ Qué usuario del wiki (ó identificador openid) será el administrador del " +"wiki ? " #: ../auto.setup:23 msgid "What is the domain name of the web server?" diff --git a/po/fr.po b/po/fr.po index 04145eeb7..c0c96c476 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2008-10-11 10:34+0200\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -51,7 +51,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Erreur" @@ -133,7 +133,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "suppression du compartiment (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "Terminé" @@ -216,6 +216,11 @@ msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" msgid "removing old preview %s" msgstr "Suppression de l'ancienne prévisualisation %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +#, fuzzy +msgid "bad page name" +msgstr "Mauvais nom de la pièce jointe" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -254,6 +259,22 @@ msgstr "Échec du traitement" msgid "fortune failed" msgstr "Échec du lancement de « fortune »" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, fuzzy, perl-format +msgid "you are not allowed to change %s" +msgstr "vous n'êtes pas authentifié comme administrateur" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +#, fuzzy +msgid "you are not allowed to change file modes" +msgstr "vous n'êtes pas authentifié comme administrateur" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -805,6 +826,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "

Erreur: %s a quitté nonzero (%s)" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "Omission du fichier au nom incorrect %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -902,19 +933,19 @@ msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "Échec de l'écriture de %s : %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -932,39 +963,39 @@ msgstr " ikiwiki --setup fichier de configuration" msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer une URL vers le wiki par --url lors de l'utilisation de " "--cgi" -#: ../IkiWiki.pm:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, fuzzy, 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:1156 +#: ../IkiWiki.pm:1165 #, 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:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "oui" diff --git a/po/gu.po b/po/gu.po index 82ecfad22..c48985eb5 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: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -48,7 +48,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "ક્ષતિ" @@ -129,7 +129,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "સંપૂર્ણ" @@ -210,6 +210,10 @@ msgstr "" msgid "removing old preview %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -251,6 +255,21 @@ msgstr "ક્રિયા કરવામાં નિષ્ફળ:" msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -797,6 +816,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -889,19 +918,19 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "%s લખવામાં નિષ્ફળ: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -918,37 +947,37 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "આવરણ બનાવે છે.." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4452ea8dc..cbae46752 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: 2008-10-21 17:51-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,7 +48,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1175 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "" @@ -129,7 +129,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "" @@ -208,6 +208,10 @@ msgstr "" msgid "removing old preview %s" msgstr "" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -246,6 +250,21 @@ msgstr "" msgid "fortune failed" msgstr "" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, perl-format msgid "Must specify %s when using the google search plugin" @@ -780,6 +799,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, perl-format +msgid "bad file name %s" +msgstr "" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -872,19 +901,19 @@ msgstr "" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "" @@ -901,37 +930,37 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:459 +#: ../IkiWiki.pm:466 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:505 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:534 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1158 +#: ../IkiWiki.pm:1165 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1667 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/pl.po b/po/pl.po index 4a216123d..6f262a2be 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: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -51,7 +51,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Błąd" @@ -133,7 +133,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "gotowe" @@ -214,6 +214,10 @@ msgstr "" msgid "removing old preview %s" msgstr "usuwanie starej strony %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -255,6 +259,21 @@ msgstr "awaria w trakcie przetwarzania:" msgid "fortune failed" msgstr "awaria fortunki" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -822,6 +841,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "pomijanie nieprawidłowej nazwy pliku %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -914,19 +943,19 @@ msgstr "nieokreślona nazwa pliku osłony" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "awaria w trakcie zapisu %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -943,39 +972,39 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "tworzenie osłon..." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, 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:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/sv.po b/po/sv.po index cdb02559f..cc83869cf 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: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -48,7 +48,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Fel" @@ -130,7 +130,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "klar" @@ -211,6 +211,10 @@ msgstr "" msgid "removing old preview %s" msgstr "tar bort gammal sida %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -252,6 +256,21 @@ msgstr "misslyckades med att behandla mall:" msgid "fortune failed" msgstr "fortune misslyckades" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -811,6 +830,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "hoppar över felaktigt filnamn %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -903,19 +932,19 @@ msgstr "filnamn för wrapper har inte angivits" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "misslyckades med att skriva %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -932,37 +961,37 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "genererar wrappers.." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr "" diff --git a/po/vi.po b/po/vi.po index 5b19ab48b..13d695880 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: 2008-10-19 19:12-0400\n" +"POT-Creation-Date: 2008-10-26 15:03-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -49,7 +49,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1173 +#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1182 msgid "Error" msgstr "Lỗi" @@ -131,7 +131,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:199 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:205 msgid "done" msgstr "xong" @@ -212,6 +212,10 @@ msgstr "" msgid "removing old preview %s" msgstr "đang gỡ bỏ trang cũ %s" +#: ../IkiWiki/Plugin/editpage.pm:125 +msgid "bad page name" +msgstr "" + #: ../IkiWiki/Plugin/editpage.pm:141 #, perl-format msgid "%s is not an editable page" @@ -253,6 +257,21 @@ msgstr "mẫu không xử lý được:" msgid "fortune failed" msgstr "fortune bị lỗi" +#: ../IkiWiki/Plugin/git.pm:617 ../IkiWiki/Plugin/git.pm:635 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:657 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:661 +msgid "you are not allowed to change file modes" +msgstr "" + #: ../IkiWiki/Plugin/google.pm:27 #, fuzzy, perl-format msgid "Must specify %s when using the google search plugin" @@ -812,6 +831,16 @@ msgstr "" msgid "

Error: %s exited nonzero (%s)" msgstr "" +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:85 +#, fuzzy, perl-format +msgid "bad file name %s" +msgstr "đang bỏ qua tên tập tin sai %s" + #: ../IkiWiki/Render.pm:253 #, perl-format msgid "" @@ -904,19 +933,19 @@ msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:48 +#: ../IkiWiki/Wrapper.pm:79 #, perl-format msgid "failed to write %s: %s" msgstr "lỗi ghi %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:99 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:119 +#: ../IkiWiki/Wrapper.pm:155 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -933,37 +962,37 @@ msgstr "" msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:137 +#: ../ikiwiki.in:138 msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:188 +#: ../ikiwiki.in:194 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:191 +#: ../ikiwiki.in:197 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:458 +#: ../IkiWiki.pm:466 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:504 +#: ../IkiWiki.pm:512 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:541 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1156 +#: ../IkiWiki.pm:1165 #, 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:1665 +#: ../IkiWiki.pm:1678 msgid "yes" msgstr ""