From: Joey Hess Date: Mon, 7 Jan 2008 21:34:13 +0000 (-0500) Subject: * Improved the canedit hook interface, allowing a callback function to be X-Git-Tag: 2.19~10 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c487b847e2053b13c4eea0ccfeecf5a41c396412 * Improved the canedit hook interface, allowing a callback function to be returned (and not run in some cases) rather than the plugins directly forcing a user to log in. * opendiscussion: allow editing of the toplevel discussion page, and, indirectly, allow creating new discussion pages. --- diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 197eabcf0..a6695b3a5 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -20,7 +20,7 @@ sub printheader ($) { #{{{ } } #}}} - + sub showform ($$$$) { #{{{ my $form=shift; my $buttons=shift; @@ -57,15 +57,22 @@ sub check_canedit ($$$;$) { #{{{ my $nonfatal=shift; my $canedit; + my $callback; run_hooks(canedit => sub { return if defined $canedit; my $ret=shift->($page, $q, $session); - if (defined $ret && $ret eq "") { - $canedit=1; - } - elsif (defined $ret) { - $canedit=0; - error($ret) unless $nonfatal; + if (defined $ret) { + if ($ret eq "") { + $canedit=1; + } + elsif (ref $ret eq 'CODE') { + $canedit=0; + $callback->() unless $nonfatal; + } + elsif (defined $ret) { + $canedit=0; + error($ret) unless $nonfatal; + } } }); return $canedit; diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index a829df1cf..5a4e2fc38 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -21,10 +21,15 @@ sub canedit ($$) { #{{{ foreach my $admin (@{$config{adminuser}}) { if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) { - IkiWiki::needsignin($cgi, $session) unless defined $user; - return sprintf(gettext("%s is locked by %s and cannot be edited"), - htmllink("", "", $page, noimageinline => 1), - IkiWiki::userlink($admin)); + if (! defined $user || + ! userinfo_get($session->param("name"), "regdate")) { + return sub { IkiWiki::needsignin($cgi, $session) }; + } + else { + return sprintf(gettext("%s is locked by %s and cannot be edited"), + htmllink("", "", $page, noimageinline => 1), + IkiWiki::userlink($admin)); + } } } diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm index 08932e2f6..d5729f702 100644 --- a/IkiWiki/Plugin/signinedit.pm +++ b/IkiWiki/Plugin/signinedit.pm @@ -18,8 +18,13 @@ sub canedit ($$$) { #{{{ # Have the user sign in, if they are not already. This is why the # hook runs last, so that any hooks that don't need the user to # signin can override this. - IkiWiki::needsignin($cgi, $session); - return ""; + if (! defined $session->param("name") || + ! userinfo_get($session->param("name"), "regdate")) { + return sub { IkiWiki::needsignin($cgi, $session) }; + } + else { + return ""; + } } #}}} 1 diff --git a/debian/changelog b/debian/changelog index 58dafaa3a..9bfdb6a58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,11 @@ ikiwiki (2.19) UNRELEASED; urgency=low * Only try postsignin if no other action matched. Fixes a bug where the user goes back from the signin screen and does something else. * Improve behavior when trying to sign in with no cookies. - * opendiscussion: allow editing of the toplevel discussion page + * Improved the canedit hook interface, allowing a callback function to be + returned (and not run in some cases) rather than the plugins directly + forcing a user to log in. + * opendiscussion: allow editing of the toplevel discussion page, + and, indirectly, allow creating new discussion pages. -- Joey Hess Mon, 07 Jan 2008 15:35:16 -0500 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 4ff5ff59e..34caf83f6 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -246,10 +246,16 @@ a page can be edited using the web interface (commits from revision control bypass it). When a page is edited, each registered canedit hook is called in turn, and passed the page name, a CGI object, and a session object. -If edit can proceed, the hook should return "". If the edit is not allowed -by this hook, the hook should return an error message for the user to see. If the hook has no opinion about whether the edit can proceed, return -`undef`, and the next plugin will be asked to decide. +`undef`, and the next plugin will be asked to decide. If edit can proceed, +the hook should return "". If the edit is not allowed by this hook, the +hook should return an error message for the user to see, or a function +that can be run to log the user in or perform other action necessary for +them to be able to edit the page. + +This hook should avoid directly redirecting the user to a signin page, +since it's sometimes used to test to see which pages in a set of pages a +user can edit. ### editcontent diff --git a/po/bg.po b/po/bg.po index 420ee62ee..484f83a47 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -16,58 +16,58 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Първо трябва да влезете." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 #, fuzzy msgid "Preferences" msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "дискусия" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, fuzzy, perl-format msgid "missing %s parameter" @@ -235,7 +235,7 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "" @@ -253,17 +253,17 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -475,19 +475,19 @@ msgstr "приставката „linkmap”: грешка при изпълне msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "грешка при запис на файла „%s”: %s" @@ -650,13 +650,13 @@ msgid "failed to write %s: %s" msgstr "грешка при запис на файла „%s”: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" diff --git a/po/cs.po b/po/cs.po index f35d6763e..90c4dfaba 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -15,57 +15,57 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Nejprve se musíte přihlásit." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "přihlášení selhalo; možná si musíte povolit cookies?" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "Přihlášení" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 msgid "Preferences" msgstr "Předvolby" -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "Správce" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "diskuse" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "přihlášení selhalo; možná si musíte povolit cookies?" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" @@ -227,7 +227,7 @@ msgstr "RPC::XML::Client nebyl nalezen, nepinkám" msgid "failed to run dot" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit" @@ -242,17 +242,17 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -457,19 +457,19 @@ msgstr "nepodařilo se spustit php" msgid "cannot find file" msgstr "nemohu najít soubor" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "neznámý formát dat" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "prázdná data" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "Stáhnout zdrojová data" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, perl-format msgid "parse fail at line %d: %s" msgstr "zpracovávání selhalo na řádku %d: %s" @@ -628,13 +628,13 @@ msgid "failed to write %s: %s" msgstr "nelze zapsat %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" diff --git a/po/da.po b/po/da.po index 709e826db..8863c1ccc 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-10-16 23:07+0100\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: Danish \n" @@ -18,57 +18,57 @@ msgstr "" "X-Poedit-Country: DENMARK\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Du skal først logge på." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "Pålogning fejlede, måske skal du tillade infokager (cookies)?" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "Pålogning" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 msgid "Preferences" msgstr "Indstillinger" -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "Admin" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Indstillinger gemt" -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "diskussion" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "Pålogning fejlede, måske skal du tillade infokager (cookies)?" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" @@ -230,7 +230,7 @@ msgstr "RPC::XML::Client ikke fundet, pinger ikke" msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "%s er låst af %s og kan ikke redigeres" @@ -246,17 +246,17 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -461,19 +461,19 @@ msgstr "php-kørsel mislykkedes" msgid "cannot find file" msgstr "kan ikke finde fil" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "ukendt dataformat" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "blanke data" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "Direkte datanedlastning" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, perl-format msgid "parse fail at line %d: %s" msgstr "afkodningsfejl på linje %d: %s" @@ -630,13 +630,13 @@ msgid "failed to write %s: %s" msgstr "skrivning ad %s mislykkedes: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" diff --git a/po/es.po b/po/es.po index 757bc27aa..725624878 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-12-20 11:25+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: Spanish \n" @@ -15,58 +15,58 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Antes es necesario identificarse." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" +"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "Identificación" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 msgid "Preferences" msgstr "Preferencias" -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "Administración" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "comentarios" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" -"registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" @@ -228,7 +228,7 @@ msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "La página %s está bloqueada por %s y no puede modificarse" @@ -244,15 +244,15 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "el metadato link ya no puede usarse" @@ -457,19 +457,19 @@ msgstr "error fatal invocando el programa php" msgid "cannot find file" msgstr "no puedo encontrar el archivo" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "formato de datos desconocido" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "sin datos" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "Enlace directo para descarga" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, perl-format msgid "parse fail at line %d: %s" msgstr "error de análisis en la línea %d: %s" @@ -630,13 +630,13 @@ msgid "failed to write %s: %s" msgstr "no puedo escribir en %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, 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:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" diff --git a/po/fr.po b/po/fr.po index df80c435d..86cbfbd35 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-08-28 21:05+0200\n" "Last-Translator: Cyril Brulebois \n" "Language-Team: French \n" @@ -17,58 +17,58 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Vous devez d'abord vous identifier." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" +"Échec de l'identification, vous devriez peut-être autoriser les cookies." + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "Discussion" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" -"Échec de l'identification, vous devriez peut-être autoriser les cookies." - #: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" @@ -232,7 +232,7 @@ msgstr "RPC::XML::Client introuvable, pas de réponse au ping" msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "%s est verrouillé par %s et ne peut être édité" @@ -248,17 +248,17 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -463,19 +463,19 @@ msgstr "Échec du lancement de php" msgid "cannot find file" msgstr "Fichier introuvable" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "Format de données inconnu" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "Données vides" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "Téléchargement direct des données" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, perl-format msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" @@ -635,13 +635,13 @@ msgid "failed to write %s: %s" msgstr "Échec de l'écriture de %s : %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" diff --git a/po/gu.po b/po/gu.po index 9f2f9ccf0..652eb002b 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -15,58 +15,58 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 #, fuzzy msgid "Preferences" msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "ચર્ચા" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" @@ -228,7 +228,7 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" @@ -242,17 +242,17 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -458,19 +458,19 @@ msgstr "php ચલાવવામાં નિષ્ફળ" msgid "cannot find file" msgstr "ફાઇલ મળી શકી નહી" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "અજાણ્યો માહિતી પ્રકાર" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "ખાલી માહિતી" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "સીધી માહિતી ડાઉનલોડ" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, perl-format msgid "parse fail at line %d: %s" msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s" @@ -626,13 +626,13 @@ msgid "failed to write %s: %s" msgstr "%s લખવામાં નિષ્ફળ: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 174298509..4f96a1d28 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-01-05 02:24-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,57 +16,57 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:168 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "" -#: ../IkiWiki/CGI.pm:229 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:230 +#: ../IkiWiki/CGI.pm:233 msgid "Preferences" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:287 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:343 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:434 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "" -#: ../IkiWiki/CGI.pm:480 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/CGI.pm:498 ../IkiWiki/CGI.pm:517 ../IkiWiki/CGI.pm:527 -#: ../IkiWiki/CGI.pm:561 ../IkiWiki/CGI.pm:609 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/CGI.pm:703 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:723 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" @@ -225,7 +225,7 @@ msgstr "" msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "" diff --git a/po/pl.po b/po/pl.po index c71396833..b4741a630 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -16,60 +16,60 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Proszę najpierw zalogować się." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" +"Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są " +"ciasteczka (ang. cookies)" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 #, fuzzy msgid "Preferences" msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "dyskusja" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" -"Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są " -"ciasteczka (ang. cookies)" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, fuzzy, perl-format msgid "missing %s parameter" @@ -237,7 +237,7 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "" @@ -256,17 +256,17 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -479,19 +479,19 @@ msgstr "awaria w trakcie uruchamiania php" msgid "cannot find file" msgstr "nie można znaleźć pliku" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "nieznany format danych" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "brak danych" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "Bezpośrednie pobieranie danych" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "awaria w trakcie przetwarzania linii %d: %s" @@ -655,13 +655,13 @@ msgid "failed to write %s: %s" msgstr "awaria w trakcie zapisu %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" diff --git a/po/sv.po b/po/sv.po index c0ceb4cf3..5f8724160 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -15,58 +15,58 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Du måste logga in först." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 #, fuzzy msgid "Preferences" msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "diskussion" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, fuzzy, perl-format msgid "missing %s parameter" @@ -232,7 +232,7 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "%s är låst av %s och kan inte redigeras" @@ -249,17 +249,17 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -471,19 +471,19 @@ msgstr "linkmap misslyckades att köra dot" msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "misslyckades med att skriva %s: %s" @@ -646,13 +646,13 @@ msgid "failed to write %s: %s" msgstr "misslyckades med att skriva %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" diff --git a/po/vi.po b/po/vi.po index f32cce3cf..dfda4206e 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: 2007-12-18 16:38-0500\n" +"POT-Creation-Date: 2008-01-07 16:30-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,58 +16,58 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6fc1\n" -#: ../IkiWiki/CGI.pm:171 +#: ../IkiWiki/CGI.pm:173 msgid "You need to log in first." msgstr "Trước tiên bạn cần phải đăng nhập." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:203 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + +#: ../IkiWiki/CGI.pm:232 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:233 #, fuzzy msgid "Preferences" msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:235 +#: ../IkiWiki/CGI.pm:234 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:293 +#: ../IkiWiki/CGI.pm:290 msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:350 +#: ../IkiWiki/CGI.pm:346 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/CGI.pm:437 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "thảo luận" -#: ../IkiWiki/CGI.pm:487 +#: ../IkiWiki/CGI.pm:483 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/CGI.pm:505 ../IkiWiki/CGI.pm:524 ../IkiWiki/CGI.pm:534 -#: ../IkiWiki/CGI.pm:568 ../IkiWiki/CGI.pm:616 +#: ../IkiWiki/CGI.pm:501 ../IkiWiki/CGI.pm:520 ../IkiWiki/CGI.pm:530 +#: ../IkiWiki/CGI.pm:564 ../IkiWiki/CGI.pm:612 #, perl-format msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/CGI.pm:710 +#: ../IkiWiki/CGI.pm:706 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:730 -msgid "login failed, perhaps you need to turn on cookies?" -msgstr "" - #: ../IkiWiki/Plugin/aggregate.pm:71 #, fuzzy, perl-format msgid "missing %s parameter" @@ -235,7 +235,7 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "failed to run dot" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/lockedit.pm:25 +#: ../IkiWiki/Plugin/lockedit.pm:29 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "%s bị %s khoá nên không thể sửa được" @@ -250,17 +250,17 @@ msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » ( msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:114 +#: ../IkiWiki/Plugin/meta.pm:116 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:126 +#: ../IkiWiki/Plugin/meta.pm:129 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:143 +#: ../IkiWiki/Plugin/meta.pm:146 msgid "link is no longer supported" msgstr "" @@ -472,19 +472,19 @@ msgstr "linkmap không chạy dot được" msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:63 +#: ../IkiWiki/Plugin/table.pm:64 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:71 +#: ../IkiWiki/Plugin/table.pm:72 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:91 +#: ../IkiWiki/Plugin/table.pm:92 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:125 +#: ../IkiWiki/Plugin/table.pm:126 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "lỗi ghi %s: %s" @@ -644,13 +644,13 @@ msgid "failed to write %s: %s" msgstr "lỗi ghi %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:109 +#: ../IkiWiki/Wrapper.pm:115 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:129 +#: ../IkiWiki/Wrapper.pm:135 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra"