From 85eb1abc6198f16f6f887e811186ea4a7c095e1d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 04:45:54 -0500 Subject: typo --- po/bg.po | 168 ++++++++++++++++++++++++++++----------------------------- po/cs.po | 162 +++++++++++++++++++++++++++---------------------------- po/da.po | 160 ++++++++++++++++++++++++++---------------------------- po/es.po | 162 ++++++++++++++++++++++++++----------------------------- po/fr.po | 163 ++++++++++++++++++++++++++----------------------------- po/gu.po | 156 ++++++++++++++++++++++++++--------------------------- po/ikiwiki.pot | 125 +++++++++++++++++------------------------- po/pl.po | 165 +++++++++++++++++++++++++++----------------------------- po/sv.po | 165 +++++++++++++++++++++++++++----------------------------- po/vi.po | 159 ++++++++++++++++++++++++++---------------------------- 10 files changed, 745 insertions(+), 840 deletions(-) (limited to 'po') diff --git a/po/bg.po b/po/bg.po index 50c2afc46..32132475e 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -16,120 +16,120 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Първо трябва да влезете." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 #, fuzzy msgid "Preferences" msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "дискусия" -#: ../IkiWiki/CGI.pm:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "нов източник" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "съобщения" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "е обработен нормално от %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -227,11 +227,11 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -253,17 +253,17 @@ msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" @@ -388,15 +388,15 @@ msgstr "" msgid "%A night" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "" @@ -516,7 +516,7 @@ msgstr "" msgid "code includes disallowed latex commands" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" @@ -525,75 +525,51 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "функцията „getctime” не е реализирана" -#: ../IkiWiki/Rcs/monotone.pm:459 -#, fuzzy -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява " -"като „svn post-commit hook”. Няма да бъдат разпратени известявания" - -#: ../IkiWiki/Rcs/monotone.pm:462 -#, fuzzy -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява " -"като „svn post-commit hook”. Няма да бъдат разпратени известявания" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява " -"като „svn post-commit hook”. Няма да бъдат разпратени известявания" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -621,15 +597,6 @@ msgstr "осъвременяване на уики..." msgid "done" msgstr "готово" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -645,19 +612,19 @@ msgstr "не е указан файл на обвивката" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:64 +#: ../IkiWiki/Wrapper.pm:48 #, perl-format msgid "failed to write %s: %s" msgstr "грешка при запис на файла „%s”: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -666,17 +633,17 @@ msgstr "успешно генериране на %s" msgid "usage: ikiwiki [options] source dest" msgstr "формат: ikiwiki [опции] източник местоназначение" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Грешка" @@ -684,11 +651,38 @@ msgstr "Грешка" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" +#, fuzzy +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "Променливата от обкръжението „REV” не е указана. Програмата не се " +#~ "изпълнява като „svn post-commit hook”. Няма да бъдат разпратени " +#~ "известявания" + +#, fuzzy +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "Променливата от обкръжението „REV” не е указана. Програмата не се " +#~ "изпълнява като „svn post-commit hook”. Няма да бъдат разпратени " +#~ "известявания" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "Променливата от обкръжението „REV” не е указана. Програмата не се " +#~ "изпълнява като „svn post-commit hook”. Няма да бъдат разпратени " +#~ "известявания" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" + #, fuzzy #~ msgid "%s not found" #~ msgstr "шаблонът „%s” не е намерен" diff --git a/po/cs.po b/po/cs.po index 17e27c704..84ece7103 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -15,118 +15,118 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Nejprve se musíte přihlásit." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 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:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "Přihlášení" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 msgid "Preferences" msgstr "Předvolby" -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "Správce" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, perl-format msgid "missing %s parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "nový zdroj" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "příspěvky" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "zpracováno ok %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji zdroj %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít zdroj na %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 msgid "feed not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "zdroj shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -220,11 +220,11 @@ msgstr "Přidat nový příspěvek nazvaný:" msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -243,16 +243,16 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "zdroj nebyl nalezen" @@ -377,15 +377,15 @@ msgstr "%A pozdě večer" msgid "%A night" msgstr "%A v noci" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "%A během odpoledního čaje" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "o půlnoci" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "%A o poledni" @@ -497,7 +497,7 @@ msgstr "chybí hodnoty" msgid "code includes disallowed latex commands" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 #, fuzzy msgid "failed to generate image from code" msgstr "nelze změnit velikost: %s" @@ -506,72 +506,51 @@ msgstr "nelze změnit velikost: %s" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "getctime není implementováno" -#: ../IkiWiki/Rcs/monotone.pm:459 -#, fuzzy -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat oznámení" - -#: ../IkiWiki/Rcs/monotone.pm:462 -#, fuzzy -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat oznámení" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat oznámení" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "zpracovávám %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -599,15 +578,6 @@ msgstr "obnovuji wiki..." msgid "done" msgstr "hotovo" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "aktualizace %s (%s) uživatelem %s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -623,19 +593,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:64 +#: ../IkiWiki/Wrapper.pm:48 #, perl-format msgid "failed to write %s: %s" msgstr "nelze zapsat %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -644,15 +614,15 @@ msgstr "%s byl úspěšně vytvořen" msgid "usage: ikiwiki [options] source dest" msgstr "použití: ikiwiki [volby] zdroj cíl" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Chyba" @@ -660,11 +630,35 @@ msgstr "Chyba" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" +#, fuzzy +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat " +#~ "oznámení" + +#, fuzzy +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat " +#~ "oznámení" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV není nastavena, není spuštěna ze svn post-commit, nemohu zaslat " +#~ "oznámení" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "aktualizace %s (%s) uživatelem %s" + #~ msgid "%s not found" #~ msgstr "%s nenalezen" diff --git a/po/da.po b/po/da.po index 256ae21df..8157b963d 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-10-16 23:07+0100\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: Danish \n" @@ -18,118 +18,118 @@ msgstr "" "X-Poedit-Country: DENMARK\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Du skal først logge på." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Pålogning fejlede, måske skal du tillade infokager (cookies)?" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "Pålogning" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 msgid "Preferences" msgstr "Indstillinger" -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "Admin" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Indstillinger gemt" -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, perl-format msgid "missing %s parameter" msgstr "mangler parametren %s" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "ny fødning" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "indlæg" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "korrekt dannet ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -223,11 +223,11 @@ msgstr "Tilføj nyt indlæg med følgende titel:" msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -247,16 +247,16 @@ msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "fødning ikke fundet" @@ -381,15 +381,15 @@ msgstr "sent %A aften" msgid "%A night" msgstr "%A nat" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "ved tetid %A" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "ved midnat" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "midt på dagen %A" @@ -500,7 +500,7 @@ msgstr "manglende tex-kode" msgid "code includes disallowed latex commands" msgstr "kode indeholder ikke-tilladte latec-kommandoer" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" @@ -508,72 +508,51 @@ msgstr "billedopbygning fra kode mislykkedes" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "getctime ikke implementeret" -#: ../IkiWiki/Rcs/monotone.pm:459 -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV ikke angivet, afvikles ikke fra mtn post-commit hook, kan ikke sende " -"orienteringer" - -#: ../IkiWiki/Rcs/monotone.pm:462 -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"REV er ikke en gyldig revisionsidentifikation, kan ikke sende orienteringer" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV ikke angivet, afvikles ikke fra svn post-commit hook, kan ikke sende " -"orienteringer" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan ikke danne %s" @@ -601,15 +580,6 @@ msgstr "genopfrisker wiki..." msgid "done" msgstr "færdig" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "opdatering på %s på %s af %s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -625,19 +595,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:64 +#: ../IkiWiki/Wrapper.pm:48 #, perl-format msgid "failed to write %s: %s" msgstr "skrivning ad %s mislykkedes: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -646,15 +616,15 @@ msgstr "Korrekt bygget %s" msgid "usage: ikiwiki [options] source dest" msgstr "brug: ikiwiki [valg] kilde mål" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Fejl" @@ -662,7 +632,29 @@ msgstr "Fejl" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s forudberegningssløkke fundet på %s ved dybde %i" + +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV ikke angivet, afvikles ikke fra mtn post-commit hook, kan ikke sende " +#~ "orienteringer" + +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "REV er ikke en gyldig revisionsidentifikation, kan ikke sende " +#~ "orienteringer" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV ikke angivet, afvikles ikke fra svn post-commit hook, kan ikke sende " +#~ "orienteringer" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "opdatering på %s på %s af %s" diff --git a/po/es.po b/po/es.po index effca6032..f93a518a5 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-12-20 11:25+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: Spanish \n" @@ -15,119 +15,119 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Antes es necesario identificarse." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 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:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "Identificación" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 msgid "Preferences" msgstr "Preferencias" -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "Administración" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, perl-format msgid "missing %s parameter" msgstr "falta el parámetro %s" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "nueva entrada" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "entradas" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "proceso completado con éxito a %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -221,11 +221,11 @@ msgstr "Añadir una entrada nueva titulada:" msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -245,15 +245,15 @@ msgstr "" "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar " "el programa /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" @@ -377,15 +377,15 @@ msgstr "a última hora de la tarde del $A" msgid "%A night" msgstr "la noche del %A" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "el %A a la hora del té" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "a medianoche" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "el %A a media tarde" @@ -496,7 +496,7 @@ msgstr "falta el código tex" msgid "code includes disallowed latex commands" msgstr "el código incluye órdenes latex anuladas" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" @@ -504,75 +504,53 @@ msgstr "no he podido crear la imagen desde el código" msgid "(not toggleable in preview mode)" msgstr "(no se puede cambiar en el modo de previsualización)" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "la funcionalidad getctime no está incluida" -#: ../IkiWiki/Rcs/monotone.pm:459 -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"La variable de entorno REV no está definida, por lo que no puede funcionar " -"svn post-commit desde monotone; no puedo enviar ninguna notificación" - -#: ../IkiWiki/Rcs/monotone.pm:462 -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"REV no es un identificador de revisión válido, por lo que no puedo enviar " -"ninguna notificación" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"La variable de entorno REV no está definida, por lo que no puede funcionar " -"svn post-commit; no puedo enviar ninguna notificación" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "convirtiendo %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikwiki: no puedo convertir la página %s" @@ -600,15 +578,6 @@ msgstr "actualizando el wiki.." msgid "done" msgstr "completado" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "actualizado el wiki %s y la página %s por el usuario %s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -625,19 +594,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:64 +#: ../IkiWiki/Wrapper.pm:48 #, 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:115 +#: ../IkiWiki/Wrapper.pm:99 #, 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:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -646,17 +615,17 @@ msgstr "creado con éxito el programa envoltorio %s" msgid "usage: ikiwiki [options] source dest" msgstr "uso: ikiwiki [opciones] origen destino" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Error" @@ -664,13 +633,36 @@ msgstr "Error" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado un bucle de preprocesado %s en la página %s en la vuelta " "número %i" +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "La variable de entorno REV no está definida, por lo que no puede " +#~ "funcionar svn post-commit desde monotone; no puedo enviar ninguna " +#~ "notificación" + +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "REV no es un identificador de revisión válido, por lo que no puedo enviar " +#~ "ninguna notificación" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "La variable de entorno REV no está definida, por lo que no puede " +#~ "funcionar svn post-commit; no puedo enviar ninguna notificación" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "actualizado el wiki %s y la página %s por el usuario %s" + #~ msgid "link is no longer supported" #~ msgstr "el metadato link ya no puede usarse" diff --git a/po/fr.po b/po/fr.po index aed567f39..b6769a969 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: 2008-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-08-28 21:05+0200\n" "Last-Translator: Cyril Brulebois \n" "Language-Team: French \n" @@ -17,119 +17,119 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Vous devez d'abord vous identifier." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 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:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, perl-format msgid "missing %s parameter" msgstr "Paramètre %s manquant" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "Nouveau flux" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "Articles" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "A été correctement traité à %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -225,11 +225,11 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle (« template ») %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -249,16 +249,16 @@ msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "Flux introuvable " @@ -383,15 +383,15 @@ msgstr "tard %A soir" msgid "%A night" msgstr "%A, durant la nuit" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "%A, à l'heure du thé" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "à minuit" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "%A, à midi" @@ -502,7 +502,7 @@ msgstr "Il manque le code TeX" msgid "code includes disallowed latex commands" msgstr "Le code comporte des commandes LaTeX non permises" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" @@ -510,74 +510,51 @@ msgstr "Échec de la création de l'image à partir du code" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "getctime n'est pas implémenté" -#: ../IkiWiki/Rcs/monotone.pm:459 -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV n'est pas défini; impossible de lancer le post-commit de mtn etd'envoyer " -"les notifications" - -#: ../IkiWiki/Rcs/monotone.pm:462 -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"REV n'est pas un identifiant de révision valable, impossible d'envoyer les " -"notifications" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV n'est pas défini, pas de lancement depuis le système de rapport par mail " -"après un commit sur le SVN (« hook post-commit »), impossible d'envoyer des " -"notifications" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "Parcours de %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "Affichage de %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "Affichage de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "Affichage de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "Affichage de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "Suppression de %s, qui n'est plus affiché par %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki : impossible d'afficher %s" @@ -605,15 +582,6 @@ msgstr "Rafraîchissement du wiki..." msgid "done" msgstr "Terminé" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "Wiki %s, les pages %s ont été mises à jour par %s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -630,19 +598,19 @@ msgstr "Le nom de fichier de l'enrobage 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:64 +#: ../IkiWiki/Wrapper.pm:48 #, 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:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -651,17 +619,17 @@ msgstr "%s a été créé avec succès" msgid "usage: ikiwiki [options] source dest" msgstr "Syntaxe : ikiwiki [options] source destination" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Erreur" @@ -669,12 +637,35 @@ msgstr "Erreur" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" "%s une boucle a été détectée dans le prétraitement de %s, à la profondeur %i" +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV n'est pas défini; impossible de lancer le post-commit de mtn " +#~ "etd'envoyer les notifications" + +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "REV n'est pas un identifiant de révision valable, impossible d'envoyer " +#~ "les notifications" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV n'est pas défini, pas de lancement depuis le système de rapport par " +#~ "mail après un commit sur le SVN (« hook post-commit »), impossible " +#~ "d'envoyer des notifications" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "Wiki %s, les pages %s ont été mises à jour par %s" + #~ msgid "%s not found" #~ msgstr "%s introuvable " diff --git a/po/gu.po b/po/gu.po index 53775705d..b50fd4813 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -15,119 +15,119 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 msgid "login failed, perhaps you need to turn on cookies?" msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 #, fuzzy msgid "Preferences" msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "ચર્ચા" -#: ../IkiWiki/CGI.pm:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, perl-format msgid "missing %s parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "નવું ફીડ" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "પોસ્ટ" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "આના પર બરાબર છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -221,11 +221,11 @@ msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેર msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -243,16 +243,16 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" @@ -378,15 +378,15 @@ msgstr "મોડા %A સાંજે" msgid "%A night" msgstr "%A રાત્રે" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "ચા ના સમયે %A પર" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "મધ્યરાત્રે" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "બપોરે %A પર" @@ -498,7 +498,7 @@ msgstr "ખોવાયેલ કિંમતો" msgid "code includes disallowed latex commands" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -507,69 +507,51 @@ msgstr "માપ બદલવામાં નિષ્ફળ: %s" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "getctime અમલમાં મૂકાયેલ નથી" -#: ../IkiWiki/Rcs/monotone.pm:459 -#, fuzzy -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી" - -#: ../IkiWiki/Rcs/monotone.pm:462 -#, fuzzy -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -597,15 +579,6 @@ msgstr "વીકીને તાજી કરે છે.." msgid "done" msgstr "સંપૂર્ણ" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "%s નો સુધારો %s નાં %s વડે" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -621,19 +594,19 @@ msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ ન #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:64 +#: ../IkiWiki/Wrapper.pm:48 #, perl-format msgid "failed to write %s: %s" msgstr "%s લખવામાં નિષ્ફળ: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -642,15 +615,15 @@ msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" msgid "usage: ikiwiki [options] source dest" msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "ક્ષતિ" @@ -658,11 +631,32 @@ msgstr "ક્ષતિ" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" +#, fuzzy +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી" + +#, fuzzy +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "%s નો સુધારો %s નાં %s વડે" + #~ msgid "%s not found" #~ msgstr "ટેમ્પલેટ %s મળ્યું નહી" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 2c08c5aaf..d8d00812b 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-10 14:54-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,118 +16,118 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "" -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 msgid "Preferences" msgstr "" -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" msgstr "" -#: ../IkiWiki/CGI.pm:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "" @@ -218,11 +218,11 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -372,15 +372,15 @@ msgstr "" msgid "%A night" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "" @@ -499,67 +499,51 @@ msgstr "" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Rcs/monotone.pm:459 -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" - -#: ../IkiWiki/Rcs/monotone.pm:462 -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" @@ -587,15 +571,6 @@ msgstr "" msgid "done" msgstr "" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -611,19 +586,19 @@ msgstr "" #. translators: The first parameter is a filename, and the second is #. translators: a (probably not translated) error message. -#: ../IkiWiki/Wrapper.pm:64 +#: ../IkiWiki/Wrapper.pm:48 #, perl-format msgid "failed to write %s: %s" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "" @@ -632,15 +607,15 @@ msgstr "" msgid "usage: ikiwiki [options] source dest" msgstr "" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "" @@ -648,7 +623,7 @@ msgstr "" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:732 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/pl.po b/po/pl.po index a6b08a607..c3b9b0c1d 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -16,122 +16,122 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Proszę najpierw zalogować się." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 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:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 #, fuzzy msgid "Preferences" msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "nowy kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "wpisy" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "kanał RSS przetworzony w dniu %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -229,11 +229,11 @@ msgstr "Tytuł nowego wpisu" msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -256,17 +256,17 @@ msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" @@ -392,15 +392,15 @@ msgstr "późnym wieczorem w %A" msgid "%A night" msgstr "nocą w %A" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "w porze śniadaniowej w %A" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "o północy" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "w południe w %A" @@ -521,7 +521,7 @@ msgstr "brakujące wartości" msgid "code includes disallowed latex commands" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -530,75 +530,51 @@ msgstr "awaria w trakcie zmiany rozmiaru: %s" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "niedostępna funkcja getctime" -#: ../IkiWiki/Rcs/monotone.pm:459 -#, fuzzy -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-" -"commit z powodu nieustawionego parametru REV" - -#: ../IkiWiki/Rcs/monotone.pm:462 -#, fuzzy -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-" -"commit z powodu nieustawionego parametru REV" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-" -"commit z powodu nieustawionego parametru REV" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "renderowanie %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -626,15 +602,6 @@ msgstr "odświeżanie wiki..." msgid "done" msgstr "gotowe" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -650,19 +617,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:64 +#: ../IkiWiki/Wrapper.pm:48 #, 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:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -671,17 +638,17 @@ msgstr "pomyślnie utworzono %s" msgid "usage: ikiwiki [options] source dest" msgstr "użycie: ikiwiki [parametry] źródło cel" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Błąd" @@ -689,11 +656,35 @@ msgstr "Błąd" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" +#, fuzzy +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-" +#~ "commit z powodu nieustawionego parametru REV" + +#, fuzzy +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-" +#~ "commit z powodu nieustawionego parametru REV" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "Brak możliwości wysłania powiadomień od Subversion przez \"haczyk\" post-" +#~ "commit z powodu nieustawionego parametru REV" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" + #, fuzzy #~ msgid "%s not found" #~ msgstr "nie znaleziono %s" diff --git a/po/sv.po b/po/sv.po index 5874415ac..3aa8b312b 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -15,120 +15,120 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Du måste logga in först." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 #, fuzzy msgid "Preferences" msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "ny kanal" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "inlägg" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "behandlad ok på %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -224,11 +224,11 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -249,17 +249,17 @@ msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" @@ -384,15 +384,15 @@ msgstr "" msgid "%A night" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "" @@ -512,7 +512,7 @@ msgstr "" msgid "code includes disallowed latex commands" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" @@ -521,75 +521,51 @@ msgstr "misslyckades med att skriva %s: %s" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "getctime inte implementerad" -#: ../IkiWiki/Rcs/monotone.pm:459 -#, fuzzy -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka " -"notifieringar" - -#: ../IkiWiki/Rcs/monotone.pm:462 -#, fuzzy -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka " -"notifieringar" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka " -"notifieringar" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "ritar upp %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -617,15 +593,6 @@ msgstr "uppdaterar wiki.." msgid "done" msgstr "klar" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "uppdatering av %s, %s av %s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -641,19 +608,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:64 +#: ../IkiWiki/Wrapper.pm:48 #, 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:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -662,15 +629,15 @@ msgstr "generering av %s lyckades" msgid "usage: ikiwiki [options] source dest" msgstr "användning: ikiwiki [flaggor] källa mål" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Fel" @@ -678,11 +645,35 @@ msgstr "Fel" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" +#, fuzzy +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka " +#~ "notifieringar" + +#, fuzzy +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka " +#~ "notifieringar" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka " +#~ "notifieringar" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "uppdatering av %s, %s av %s" + #, fuzzy #~ msgid "%s not found" #~ msgstr "mallen %s hittades inte" diff --git a/po/vi.po b/po/vi.po index 39095259c..248275b08 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-01-09 02:42-0500\n" +"POT-Creation-Date: 2008-01-29 04:45-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,120 +16,120 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6fc1\n" -#: ../IkiWiki/CGI.pm:172 +#: ../IkiWiki/CGI.pm:125 msgid "You need to log in first." msgstr "Trước tiên bạn cần phải đăng nhập." -#: ../IkiWiki/CGI.pm:202 +#: ../IkiWiki/CGI.pm:155 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:184 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:185 #, fuzzy msgid "Preferences" msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:233 +#: ../IkiWiki/CGI.pm:186 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:289 +#: ../IkiWiki/CGI.pm:235 msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:345 +#: ../IkiWiki/CGI.pm:291 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/CGI.pm:436 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:239 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 +#: ../IkiWiki/Plugin/inline.pm:241 ../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:482 +#: ../IkiWiki/CGI.pm:429 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/CGI.pm:500 ../IkiWiki/CGI.pm:519 ../IkiWiki/CGI.pm:529 -#: ../IkiWiki/CGI.pm:563 ../IkiWiki/CGI.pm:611 +#: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 #, perl-format msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/CGI.pm:705 +#: ../IkiWiki/CGI.pm:646 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/Plugin/aggregate.pm:71 +#: ../IkiWiki/Plugin/aggregate.pm:82 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/aggregate.pm:99 +#: ../IkiWiki/Plugin/aggregate.pm:110 msgid "new feed" msgstr "nguồn tin mới" -#: ../IkiWiki/Plugin/aggregate.pm:113 +#: ../IkiWiki/Plugin/aggregate.pm:124 msgid "posts" msgstr "bài" -#: ../IkiWiki/Plugin/aggregate.pm:115 +#: ../IkiWiki/Plugin/aggregate.pm:126 msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:236 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:243 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:269 #, perl-format msgid "processed ok at %s" msgstr "đã xử lý được ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:274 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:279 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:294 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:305 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:311 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:317 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:386 +#: ../IkiWiki/Plugin/aggregate.pm:391 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -227,11 +227,11 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:247 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki/Plugin/inline.pm:461 +#: ../IkiWiki/Plugin/inline.pm:463 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -250,17 +250,17 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:132 +#: ../IkiWiki/Plugin/meta.pm:124 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:156 +#: ../IkiWiki/Plugin/meta.pm:148 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:169 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" @@ -385,15 +385,15 @@ msgstr "" msgid "%A night" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:74 +#: ../IkiWiki/Plugin/prettydate.pm:78 msgid "at teatime on %A" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:78 +#: ../IkiWiki/Plugin/prettydate.pm:82 msgid "at midnight" msgstr "" -#: ../IkiWiki/Plugin/prettydate.pm:81 +#: ../IkiWiki/Plugin/prettydate.pm:85 msgid "at noon on %A" msgstr "" @@ -513,7 +513,7 @@ msgstr "" msgid "code includes disallowed latex commands" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:97 +#: ../IkiWiki/Plugin/teximg.pm:96 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" @@ -522,72 +522,51 @@ msgstr "lỗi ghi %s: %s" msgid "(not toggleable in preview mode)" msgstr "" -#: ../IkiWiki/Rcs/Stub.pm:68 +#: ../IkiWiki/Rcs/Stub.pm:62 msgid "getctime not implemented" msgstr "chưa thực hiện getctime" -#: ../IkiWiki/Rcs/monotone.pm:459 -#, fuzzy -msgid "" -"REV is not set, not running from mtn post-commit hook, cannot send " -"notifications" -msgstr "" -"Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" - -#: ../IkiWiki/Rcs/monotone.pm:462 -#, fuzzy -msgid "REV is not a valid revision identifier, cannot send notifications" -msgstr "" -"Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" - -#: ../IkiWiki/Rcs/svn.pm:221 -msgid "" -"REV is not set, not running from svn post-commit hook, cannot send " -"notifications" -msgstr "" -"Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" - -#: ../IkiWiki/Render.pm:275 ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:338 +#: ../IkiWiki/Render.pm:339 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:371 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:377 #, perl-format msgid "rendering %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Render.pm:388 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:443 +#: ../IkiWiki/Render.pm:444 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:455 +#: ../IkiWiki/Render.pm:456 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:481 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: không thể vẽ %s" @@ -615,15 +594,6 @@ msgstr "đang làm tươi wiki.." msgid "done" msgstr "xong" -#. translators: The three variables are the name of the wiki, -#. translators: A list of one or more pages that were changed, -#. translators: And the name of the user making the change. -#. translators: This is used as the subject of a commit email. -#: ../IkiWiki/UserInfo.pm:145 -#, perl-format -msgid "update of %s's %s by %s" -msgstr "cập nhật %2$s của %1$s bởi %3$s" - #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -639,19 +609,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:64 +#: ../IkiWiki/Wrapper.pm:48 #, perl-format msgid "failed to write %s: %s" msgstr "lỗi ghi %s: %s" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:115 +#: ../IkiWiki/Wrapper.pm:99 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:135 +#: ../IkiWiki/Wrapper.pm:119 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -660,15 +630,15 @@ msgstr "%s đã được tạo ra" msgid "usage: ikiwiki [options] source dest" msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" -#: ../ikiwiki.in:83 +#: ../ikiwiki.in:81 msgid "usage: --set var=value" msgstr "" -#: ../IkiWiki.pm:129 +#: ../IkiWiki.pm:127 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:198 ../IkiWiki.pm:199 +#: ../IkiWiki.pm:196 ../IkiWiki.pm:197 msgid "Error" msgstr "Lỗi" @@ -676,11 +646,32 @@ msgstr "Lỗi" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:722 +#: ../IkiWiki.pm:767 #, perl-format msgid "%s 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" +#, fuzzy +#~ msgid "" +#~ "REV is not set, not running from mtn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" + +#, fuzzy +#~ msgid "REV is not a valid revision identifier, cannot send notifications" +#~ msgstr "" +#~ "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" + +#~ msgid "" +#~ "REV is not set, not running from svn post-commit hook, cannot send " +#~ "notifications" +#~ msgstr "" +#~ "Chưa đặt REV, không chạy từ móc sau gài vào nên không thể gửi thông báo" + +#~ msgid "update of %s's %s by %s" +#~ msgstr "cập nhật %2$s của %1$s bởi %3$s" + #, fuzzy #~ msgid "%s not found" #~ msgstr "không tìm thấy mẫu %s" -- cgit v1.2.3 From cabd5140c4d6255afdcb527e7f6d7e7815e4aa43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 15:22:23 -0500 Subject: add code to delete old change pages --- IkiWiki/Plugin/recentchanges.pm | 16 +++++++++++++--- po/ikiwiki.pot | 28 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 17 deletions(-) (limited to 'po') diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 2525785e7..8f707afc4 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -41,7 +41,7 @@ sub store ($$) { #{{{ # Optimisation to avoid re-writing pages. Assumes commits never # change (or that any changes are not important). - return if exists $pagesources{$page} && ! $config{rebuild}; + return $page if exists $pagesources{$page} && ! $config{rebuild}; # Limit pages to first 10, and add links to the changed pages. my $is_excess = exists $change->{pages}[10]; @@ -97,18 +97,28 @@ sub store ($$) { #{{{ my $file=$page."._change"; writefile($file, $config{srcdir}, $template->output); utime $change->{when}, $change->{when}, "$config{srcdir}/$file"; + + return $page; } #}}} sub updatechanges ($$) { #{{{ my $pagespec=shift; my $subdir=shift; my @changes=@{shift()}; + + my %seen; + # add new changes foreach my $change (@changes) { - store($change, $subdir); + $seen{store($change, $subdir)}=1; } - # TODO: delete old + # delete old and excess changes + foreach my $page (keys %pagesources) { + if ($page=~/^\Q$subdir\E\/change_/ && ! $seen{$page}) { + unlink($config{srcdir}.'/'.$pagesources{$page}); + } + } } #}}} 1 diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d8d00812b..98882d535 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-29 04:45-0500\n" +"POT-Creation-Date: 2008-01-29 15:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,8 +47,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:100 +#: ../IkiWiki/Render.pm:180 msgid "discussion" msgstr "" @@ -218,7 +218,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:104 msgid "Discussion" msgstr "" @@ -503,47 +503,47 @@ msgstr "" msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:280 ../IkiWiki/Render.pm:301 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:350 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:394 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:415 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:436 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:475 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" @@ -623,7 +623,7 @@ msgstr "" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:773 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" -- cgit v1.2.3 From 8b31c53366bbee51b36501443eafd0f712ee6a4c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 15:51:32 -0500 Subject: added configuration for recentchanges I kept it to a simple global configuration, rather than using the preprocessor directive for recentchanges, because that had chicken and egg problems and seemed overcomplicated. This should work reasonably well, though it would be good to add some more metadata so that more customised recentchanges pages can be made. --- IkiWiki/Plugin/recentchanges.pm | 54 +++++++++++++++++------------------------ IkiWiki/Render.pm | 4 +-- doc/cgi.mdwn | 6 +++-- doc/ikiwiki.setup | 3 +++ doc/plugins/recentchanges.mdwn | 8 ++---- doc/recentchanges.mdwn | 1 - doc/usage.mdwn | 6 ++--- docwiki.setup | 8 ++---- po/ikiwiki.pot | 2 +- t/pagespec_match.t | 3 --- 10 files changed, 38 insertions(+), 57 deletions(-) (limited to 'po') diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 8f707afc4..f5982604b 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -6,25 +6,30 @@ use strict; use IkiWiki 2.00; sub import { #{{{ - hook(type => "refresh", id => "recentchanges", - call => \&refresh); - hook(type => "preprocess", id => "recentchanges", - call => \&preprocess); - hook(type => "htmlize", id => "_change", - call => \&htmlize); + hook(type => "checkconfig", id => "recentchanges", call => \&checkconfig); + hook(type => "refresh", id => "recentchanges", call => \&refresh); + hook(type => "htmlize", id => "_change", call => \&htmlize); } #}}} -sub refresh ($) { #{{{ - my @changes=IkiWiki::rcs_recentchanges(100); - updatechanges("*", "recentchanges", \@changes); +sub checkconfig () { #{{{ + $config{recentchangespage}='recentchanges' unless defined $config{recentchangespage}; + $config{recentchangesnum}=100 unless defined $config{recentchangesnum}; } #}}} -sub preprocess (@) { #{{{ - my %params=@_; - - # TODO +sub refresh ($) { #{{{ + my %seen; - return ""; + # add new changes + foreach my $change (IkiWiki::rcs_recentchanges($config{recentchangesnum})) { + $seen{store($change, $config{recentchangespage})}=1; + } + + # delete old and excess changes + foreach my $page (keys %pagesources) { + if ($page=~/^\Q$config{recentchangespage}\E\/change_/ && ! $seen{$page}) { + unlink($config{srcdir}.'/'.$pagesources{$page}); + } + } } #}}} # Pages with extension _change have plain html markup, pass through. @@ -33,11 +38,10 @@ sub htmlize (@) { #{{{ return $params{content}; } #}}} -sub store ($$) { #{{{ +sub store ($$$) { #{{{ my $change=shift; - my $subdir=shift; - - my $page="$subdir/change_".IkiWiki::titlepage($change->{rev}); + + my $page="$config{recentchangespage}/change_".IkiWiki::titlepage($change->{rev}); # Optimisation to avoid re-writing pages. Assumes commits never # change (or that any changes are not important). @@ -102,23 +106,9 @@ sub store ($$) { #{{{ } #}}} sub updatechanges ($$) { #{{{ - my $pagespec=shift; my $subdir=shift; my @changes=@{shift()}; - my %seen; - - # add new changes - foreach my $change (@changes) { - $seen{store($change, $subdir)}=1; - } - - # delete old and excess changes - foreach my $page (keys %pagesources) { - if ($page=~/^\Q$subdir\E\/change_/ && ! $seen{$page}) { - unlink($config{srcdir}.'/'.$pagesources{$page}); - } - } } #}}} 1 diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index b5b461499..ed359bdd7 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -85,8 +85,8 @@ sub genpage ($$) { #{{{ $actions++; } - if ($config{rcs}) { - $template->param(recentchangesurl => urlto("recentchanges", $page)); + if ($config{rcs} && exists $config{recentchangespage}) { + $template->param(recentchangesurl => urlto($config{recentchangespage}, $page)); $actions++; } diff --git a/doc/cgi.mdwn b/doc/cgi.mdwn index 22d8c4332..1448fa4d5 100644 --- a/doc/cgi.mdwn +++ b/doc/cgi.mdwn @@ -1,3 +1,5 @@ -While ikiwiki is primarily a wiki compiler, which generates static html pages, it does use CGI for two important wiki features, online page editing and the [[RecentChanges]] display. +While ikiwiki is primarily a wiki compiler, which generates static html +pages, it does use CGI for online page editing. -To enable CGI, you need to create and install an ikiwiki.cgi wrapper. [[Setup]] explains how to do this. \ No newline at end of file +To enable CGI, you need to create and install an ikiwiki.cgi wrapper. +[[Setup]] explains how to do this. diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup index af27f1d7e..9bf542981 100644 --- a/doc/ikiwiki.setup +++ b/doc/ikiwiki.setup @@ -115,6 +115,9 @@ use IkiWiki::Setup::Standard { #account_creation_password => "example", # Uncomment to force ikiwiki to run with a particular umask. #umask => 022, + # Default settings for the recentchanges page. + #recentchangespage => "recentchanges", + #recentchangesnum => 100, # To add plugins, list them here. #add_plugins => [qw{goodstuff search wikitext camelcase diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index 69073adf0..8647985c9 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -5,12 +5,8 @@ generates a page describing each recent change made to the wiki. These pages can be joined together with [[inline]] to generate the [[RecentChanges]] page. -Typically only the RecentChanges page will use the plugin, but you can -use it elsewhere too if you like. It's used like this: +Typically only the RecentChanges page will use the pages generated by this +plugin, but you can use it elsewhere too if you like. It's used like this: - \[[recentchanges pages="*" num=100 template=change]] \[[inline pages="internal(recentchanges/change_*)" template=recentchanges show=0]] - -The pages describing recent changes will be created as [[subpages|subpage]] -of the page where the `recentchanges` directive is placed. diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index d702b0f34..2dd218520 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -1,5 +1,4 @@ Recent changes to this wiki: -[[recentchanges pages="*" num=100 template=change]] [[inline pages="internal(recentchanges/change_*) and !*/Discussion" template=recentchanges show=0]] diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 354e266f1..f34d5bad6 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -33,8 +33,7 @@ These options control the mode that ikiwiki operates in. * --cgi Enable [[CGI]] mode. In cgi mode ikiwiki runs as a cgi script, and - supports editing pages, signing in, registration, and displaying - [[RecentChanges]]. + supports editing pages, signing in, and registration. To use ikiwiki as a [[CGI]] program you need to use --wrapper or --setup to generate a wrapper. The wrapper will generally need to run suid 6755 to @@ -141,8 +140,7 @@ configuration options of their own. whatever the revision control system you select uses. In [[CGI]] mode, with a revision control system enabled, pages edited via - the web will be committed. Also, the [[RecentChanges]] link will be placed - on pages. + the web will be committed. No revision control is enabled by default. diff --git a/docwiki.setup b/docwiki.setup index 5793d87bf..e8f680a20 100644 --- a/docwiki.setup +++ b/docwiki.setup @@ -15,10 +15,6 @@ use IkiWiki::Setup::Standard { syslog => 0, userdir => "users", usedirs => 0, - rcs => 'git', - rss => 1, - cgiurl => "http://ikiwiki.info/ikiwiki.cgi", - url => "http://ikiwiki.info", - add_plugins => [qw{goodstuff version haiku polygen fortune - recentchanges }], + add_plugins => [qw{goodstuff version haiku polygen fortune}], + disable_plugins => [qw{recentchanges}], } diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 98882d535..4e43f5da9 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-29 15:21-0500\n" +"POT-Creation-Date: 2008-01-29 15:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/t/pagespec_match.t b/t/pagespec_match.t index 3a641c6a8..cb98ab149 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -67,9 +67,6 @@ ok(! pagespec_match("foo", "creation_day(3)"), "other day"); ok(! pagespec_match("foo", "no_such_function(foo)"), "foo"); -ok(pagespec_match("foo", "foo and user(bar)", user => "bar"), "user"); -ok(! pagespec_match("foo", "foo and user(bar)", user => "baz"), "user fail"); - my $ret=pagespec_match("foo", "(invalid"); ok(! $ret, "syntax error"); ok($ret eq "syntax error", "error message"); -- cgit v1.2.3 From 64a8c828b8cfa342118dd6e28b9dff43d83c6311 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 17:16:51 -0500 Subject: * meta: Add pagespec functions to match against title, author, authorurl, license, and copyright. This can be used to create custom RecentChanges. * meta: To support the pagespec functions, metadata about pages has to be retained as pagestate. * Fix encoding bug when pagestate values contained spaces. --- IkiWiki.pm | 2 +- IkiWiki/Plugin/meta.pm | 122 +++++++++++++++++++++++++++-------------- IkiWiki/Render.pm | 1 + debian/changelog | 5 ++ doc/ikiwiki/pagespec.mdwn | 7 ++- doc/plugins/recentchanges.mdwn | 14 +++++ doc/plugins/write.mdwn | 18 +++--- docwiki.setup | 4 +- po/ikiwiki.pot | 32 +++++------ templates/change.tmpl | 2 +- 10 files changed, 136 insertions(+), 71 deletions(-) (limited to 'po') diff --git a/IkiWiki.pm b/IkiWiki.pm index db2605672..016c664b5 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -973,7 +973,7 @@ sub saveindex () { #{{{ if (exists $pagestate{$page}) { foreach my $id (@hookids) { foreach my $key (keys %{$pagestate{$page}{$id}}) { - $line.=' '.$id.'_'.encode_entities($key)."=".encode_entities($pagestate{$page}{$id}{$key}); + $line.=' '.$id.'_'.encode_entities($key)."=".encode_entities($pagestate{$page}{$id}{$key}, " \t\n"); } } } diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index d2c6e7f8b..849a13e37 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -6,13 +6,7 @@ use warnings; use strict; use IkiWiki 2.00; -my %meta; -my %title; -my %permalink; -my %author; -my %authorurl; -my %license; -my %copyright; +my %metaheaders; sub import { #{{{ hook(type => "needsbuild", id => "meta", call => \&needsbuild); @@ -71,16 +65,16 @@ sub preprocess (@) { #{{{ # Metadata collection that needs to happen during the scan pass. if ($key eq 'title') { - $title{$page}=HTML::Entities::encode_numeric($value); + $pagestate{$page}{meta}{title}=HTML::Entities::encode_numeric($value); } elsif ($key eq 'license') { - push @{$meta{$page}}, ''; - $license{$page}=$value; + push @{$metaheaders{$page}}, ''; + $pagestate{$page}{meta}{license}=$value; return ""; } elsif ($key eq 'copyright') { - push @{$meta{$page}}, ''; - $copyright{$page}=$value; + push @{$metaheaders{$page}}, ''; + $pagestate{$page}{meta}{copyright}=$value; return ""; } elsif ($key eq 'link' && ! %params) { @@ -89,11 +83,11 @@ sub preprocess (@) { #{{{ return ""; } elsif ($key eq 'author') { - $author{$page}=$value; + $pagestate{$page}{meta}{author}=$value; # fallthorough } elsif ($key eq 'authorurl') { - $authorurl{$page}=$value; + $pagestate{$page}{meta}{authorurl}=$value; # fallthrough } @@ -111,8 +105,8 @@ sub preprocess (@) { #{{{ } } elsif ($key eq 'permalink') { - $permalink{$page}=$value; - push @{$meta{$page}}, scrub(''); + $pagestate{$page}{meta}{permalink}=$value; + push @{$metaheaders{$page}}, scrub(''); } elsif ($key eq 'stylesheet') { my $rel=exists $params{rel} ? $params{rel} : "alternate stylesheet"; @@ -123,17 +117,17 @@ sub preprocess (@) { #{{{ if (! length $stylesheet) { return "[[meta ".gettext("stylesheet not found")."]]"; } - push @{$meta{$page}}, '"; } elsif ($key eq 'openid') { if (exists $params{server}) { - push @{$meta{$page}}, ''; } - push @{$meta{$page}}, ''; } elsif ($key eq 'redir') { @@ -172,11 +166,11 @@ sub preprocess (@) { #{{{ if (! $safe) { $redir=scrub($redir); } - push @{$meta{$page}}, $redir; + push @{$metaheaders{$page}}, $redir; } elsif ($key eq 'link') { if (%params) { - push @{$meta{$page}}, scrub("'); } @@ -197,32 +191,80 @@ sub pagetemplate (@) { #{{{ my $destpage=$params{destpage}; my $template=$params{template}; - if (exists $meta{$page} && $template->query(name => "meta")) { + if (exists $metaheaders{$page} && $template->query(name => "meta")) { # avoid duplicate meta lines my %seen; - $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$meta{$page}})); + $template->param(meta => join("\n", grep { (! $seen{$_}) && ($seen{$_}=1) } @{$metaheaders{$page}})); } - if (exists $title{$page} && $template->query(name => "title")) { - $template->param(title => $title{$page}); + if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) { + $template->param(title => $pagestate{$page}{meta}{title}); $template->param(title_overridden => 1); } - $template->param(permalink => $permalink{$page}) - if exists $permalink{$page} && $template->query(name => "permalink"); - $template->param(author => $author{$page}) - if exists $author{$page} && $template->query(name => "author"); - $template->param(authorurl => $authorurl{$page}) - if exists $authorurl{$page} && $template->query(name => "authorurl"); - if (exists $license{$page} && $template->query(name => "license") && - ($page eq $destpage || ! exists $license{$destpage} || - $license{$page} ne $license{$destpage})) { - $template->param(license => htmlize($page, $destpage, $license{$page})); + foreach my $field (qw{author authorurl permalink}) { + $template->param($field => $pagestate{$page}{meta}{$field}) + if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field); } - if (exists $copyright{$page} && $template->query(name => "copyright") && - ($page eq $destpage || ! exists $copyright{$destpage} || - $copyright{$page} ne $copyright{$destpage})) { - $template->param(copyright => htmlize($page, $destpage, $copyright{$page})); + + foreach my $field (qw{license copyright}) { + if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field) && + ($page eq $destpage || ! exists $pagestate{$destpage}{meta}{$field} || + $pagestate{$page}{meta}{$field} ne $pagestate{$destpage}{meta}{$field})) { + $template->param($field => htmlize($page, $destpage, $pagestate{$page}{meta}{$field})); + } } } # }}} +sub match { #{{{ + my $field=shift; + my $page=shift; + + # turn glob into a safe regexp + my $re=quotemeta(shift); + $re=~s/\\\*/.*/g; + $re=~s/\\\?/./g; + + my $val; + if (exists $pagestate{$page}{meta}{$field}) { + $val=$pagestate{$page}{meta}{$field}; + } + elsif ($field eq 'title') { + $val=pagetitle($page); + } + + if (defined $val) { + if ($val=~/^$re$/i) { + return IkiWiki::SuccessReason->new("$re matches $field of $page"); + } + else { + return IkiWiki::FailReason->new("$re does not match $field of $page"); + } + } + else { + return IkiWiki::FailReason->new("$page does not have a $field"); + } +} #}}} + +package IkiWiki::PageSpec; + +sub match_title ($$;@) { #{{{ + IkiWiki::Plugin::meta::match("title", @_); +} #}}} + +sub match_author ($$;@) { #{{{ + IkiWiki::Plugin::meta::match("author", @_); +} #}}} + +sub match_authorurl ($$;@) { #{{{ + IkiWiki::Plugin::meta::match("authorurl", @_); +} #}}} + +sub match_license ($$;@) { #{{{ + IkiWiki::Plugin::meta::match("license", @_); +} #}}} + +sub match_copyright ($$;@) { #{{{ + IkiWiki::Plugin::meta::match("copyright", @_); +} #}}} + 1 diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 4495b9cfd..76e8ef1f4 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -377,6 +377,7 @@ sub refresh () { #{{{ $pagemtime{$page}=$mtime; if (isinternal($page)) { push @internal, $file; + scan($file); } else { push @needsbuild, $file; diff --git a/debian/changelog b/debian/changelog index c608531e1..77202ed1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,11 @@ ikiwiki (2.21) UNRELEASED; urgency=low the svnrepo and notify settings, though both will be ignored if left in setup files. Also gone with it is the "user()" pagespec. * Add refresh hook. + * meta: Add pagespec functions to match against title, author, authorurl, + license, and copyright. This can be used to create custom RecentChanges. + * meta: To support the pagespec functions, metadata about pages has to be + retained as pagestate. + * Fix encoding bug when pagestate values contained spaces. -- Joey Hess Fri, 11 Jan 2008 15:09:37 -0500 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index e1a476202..3cd6bb9f4 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -33,10 +33,13 @@ functions: was created * "`created_before(page)`" - match only pages created before the given page was created -* "`glob(foo)`" - match pages that match the given glob `foo`. Just writing +* "`glob(someglob)`" - match pages that match the given glob. Just writing the glob by itself is actually a shorthand for this function. -* "`internal(foo)`" - like `glob()`, but matches even internal-use +* "`internal(glob)`" - like `glob()`, but matches even internal-use pages that globs do not usually match. +* "`title(glob)`", "`author(glob)`", "`authorurl(glob)`", + "`license(glob)`", "`copyright(glob)`" - match pages that have the given + metadata, matching the specified glob. For example, to match all pages in a blog that link to the page about music and were written in 2005: diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index 8647985c9..b48dcbacf 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -10,3 +10,17 @@ plugin, but you can use it elsewhere too if you like. It's used like this: \[[inline pages="internal(recentchanges/change_*)" template=recentchanges show=0]] + +Here's an example of how to show only changes to "bugs/*". +This matches against the title of the change, which includes a list of +modified pages. + + \[[inline pages="internal(recentchanges/change_*) and title(*bugs/*)" + template=recentchanges show=0]] + +Here's an example of how to show only changes that Joey didn't make. +(Joey commits sometimes as user `joey`, and sometimes via openid.) + + \[[inline pages="internal(recentchanges/change_*) and + !author(joey) and !author(http://joey.kitenet.net*)" + template=recentchanges show=0]] diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 79da6a612..9c3a36b8f 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -533,18 +533,16 @@ rendered to. ## Internal use pages -Sometimes it's useful to put pages in the wiki without having them be -rendered to individual html files. Such internal use pages are collected -together to form the RecentChanges page, for example. +Sometimes it's useful to put pages in the wiki without the overhead of +having them be rendered to individual html files. Such internal use pages +are collected together to form the RecentChanges page, for example. To make an internal use page, register a filename extension that starts -with "_". Internal use pages cannot be edited with the web interface, are -not scanned for wikilinks (though wikilinks and preprocessor directives can -appear on them, this is rarely a good idea and should be done with caution), -and are not matched by regular PageSpecs glob patterns, but instead only by a -special `internal()` [[ikiwiki/PageSpec]]. - -Ikiwiki is optimised to handle lots of internal use pages, very quickly. +with "_". Internal use pages cannot be edited with the web interface, +generally shouldn't contain wikilinks or preprocessor directives (use +either on them with extreme caution), and are not matched by regular +PageSpecs glob patterns, but instead only by a special `internal()` +[[ikiwiki/PageSpec]]. ## RCS plugins diff --git a/docwiki.setup b/docwiki.setup index e8f680a20..ab9696b81 100644 --- a/docwiki.setup +++ b/docwiki.setup @@ -15,6 +15,8 @@ use IkiWiki::Setup::Standard { syslog => 0, userdir => "users", usedirs => 0, + rcs => "git", + rss => 1, + url => "http://ikiwiki.info/", add_plugins => [qw{goodstuff version haiku polygen fortune}], - disable_plugins => [qw{recentchanges}], } diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4e43f5da9..027e10e8a 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-29 15:46-0500\n" +"POT-Creation-Date: 2008-01-29 17:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,8 +47,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:100 -#: ../IkiWiki/Render.pm:180 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:101 +#: ../IkiWiki/Render.pm:181 msgid "discussion" msgstr "" @@ -218,7 +218,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:104 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:105 msgid "Discussion" msgstr "" @@ -240,15 +240,15 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:118 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:142 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:155 msgid "redir cycle is not allowed" msgstr "" @@ -503,47 +503,47 @@ msgstr "" msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Render.pm:280 ../IkiWiki/Render.pm:301 +#: ../IkiWiki/Render.pm:281 ../IkiWiki/Render.pm:302 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:350 +#: ../IkiWiki/Render.pm:351 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:391 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:394 +#: ../IkiWiki/Render.pm:396 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:415 +#: ../IkiWiki/Render.pm:417 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:436 +#: ../IkiWiki/Render.pm:438 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:475 +#: ../IkiWiki/Render.pm:477 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:487 +#: ../IkiWiki/Render.pm:489 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:513 +#: ../IkiWiki/Render.pm:515 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" diff --git a/templates/change.tmpl b/templates/change.tmpl index 570d47559..f9941ae70 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -2,7 +2,7 @@ [[meta authorurl=""""""]] -[[meta title="""update of 's """]] +[[meta title="""update of 's """]]

Changed pages: -- cgit v1.2.3 From 3803266b8fd129b71390c11a212cf52c83c3506a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 17:50:11 -0500 Subject: merged the recentchanges branch misc fixes --- IkiWiki/Plugin/aggregate.pm | 2 +- debian/NEWS | 7 +++++++ debian/changelog | 2 +- debian/postinst | 2 +- po/ikiwiki.pot | 44 ++++++++++++++++++++++---------------------- t/pagespec_match.t | 2 +- 6 files changed, 33 insertions(+), 26 deletions(-) (limited to 'po') diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index c3cbbae05..2a4d10411 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -66,7 +66,7 @@ sub needsbuild (@) { #{{{ loadstate(); # if not already loaded foreach my $feed (values %feeds) { - if (exists $pagesources{$page} && + if (exists $pagesources{$feed->{sourcepage}} && grep { $_ eq $pagesources{$feed->{sourcepage}} } @$needsbuild) { # Mark all feeds originating on this page as removable; # preprocess will unmark those that still exist. diff --git a/debian/NEWS b/debian/NEWS index 43c8b3ca2..c3ed55c03 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -5,6 +5,10 @@ ikiwiki (2.30) unstable; urgency=low now a static page, not a CGI. Users can subscribe to its rss/atom feeds. Custom RecentChanges pages can be easily set up that display only changes to a subset of pages, or only changes by a subset of users. + + All wikis need to be rebuilt on upgrade to this version. If you listed your + wiki in /etc/ikiwiki/wikilist this will be done automatically when the + Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild. With this excellent new RecentChanges support, the mail notification system is showing its age (and known to be variously buggy and underimplemented for @@ -12,6 +16,9 @@ ikiwiki (2.30) unstable; urgency=low from this version. If you were subscribed to commit mails, you should be able to accomplish the same thing by subscribing to a RecentChanges feed. + The "svnrepo" and "notify" fields in setup files are no longer used, and + silently ignored. You may want to remove them from your setup file. + -- Joey Hess Tue, 29 Jan 2008 17:18:31 -0500 ikiwiki (2.20) unstable; urgency=low diff --git a/debian/changelog b/debian/changelog index 77202ed1f..ec8f7f1b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.21) UNRELEASED; urgency=low +ikiwiki (2.30) UNRELEASED; urgency=low [ Joey Hess ] * Old versions of git-init don't support --git-dir or GIT_DIR with diff --git a/debian/postinst b/debian/postinst index 018e04f78..26c44a88b 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=2.1 +firstcompat=2.30 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 027e10e8a..cb25d0475 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-29 17:15-0500\n" +"POT-Creation-Date: 2008-01-29 17:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,67 +67,67 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:83 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:111 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:125 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:127 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:237 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:244 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:280 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:295 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:306 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:312 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:318 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:392 #, perl-format msgid "creating new page %s" msgstr "" @@ -146,20 +146,20 @@ msgstr "" msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 msgid "failed to process" msgstr "" @@ -240,15 +240,15 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:118 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:142 +#: ../IkiWiki/Plugin/meta.pm:143 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:155 +#: ../IkiWiki/Plugin/meta.pm:156 msgid "redir cycle is not allowed" msgstr "" diff --git a/t/pagespec_match.t b/t/pagespec_match.t index cb98ab149..038472967 100755 --- a/t/pagespec_match.t +++ b/t/pagespec_match.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 54; +use Test::More tests => 52; BEGIN { use_ok("IkiWiki"); } -- cgit v1.2.3 From b3290c64ca10be1b29bc99c39ce144e326e8be47 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Jan 2008 18:48:01 -0500 Subject: announce no more mail notifications on this wiki --- doc/news/no_more_email_notifications.mdwn | 14 ++++++++++++++ po/ikiwiki.pot | 16 ++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 doc/news/no_more_email_notifications.mdwn (limited to 'po') diff --git a/doc/news/no_more_email_notifications.mdwn b/doc/news/no_more_email_notifications.mdwn new file mode 100644 index 000000000..685a0d340 --- /dev/null +++ b/doc/news/no_more_email_notifications.mdwn @@ -0,0 +1,14 @@ +ikiwiki.info has upgraded to the not yet released ikiwiki 2.30. This +version of ikiwiki drops support for subscribing to commit mail +notifications for pages. The idea is that you can subscribe to the new +[[RecentChanges]] feed instead. (Or create your own custom feed of only the +changes you're interested in, and subscribe to that.) + +So if you were subscribed to mail notifications on here, you'll need to +change how you keep track of changes. Please let me know if there are any +missing features in the [[RecentChanges]] feeds. + +Statically building the RecentChanges also has performance implications, +I'll keep an eye on [[server_speed]].. + +--[[Joey]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index cb25d0475..49c5c7b0c 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-29 17:42-0500\n" +"POT-Creation-Date: 2008-01-29 18:30-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -513,37 +513,37 @@ msgstr "" msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:391 +#: ../IkiWiki/Render.pm:392 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:396 +#: ../IkiWiki/Render.pm:397 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:417 +#: ../IkiWiki/Render.pm:418 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:438 +#: ../IkiWiki/Render.pm:439 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:477 +#: ../IkiWiki/Render.pm:478 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:489 +#: ../IkiWiki/Render.pm:490 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:515 +#: ../IkiWiki/Render.pm:516 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" -- cgit v1.2.3 From ac58aa804efba42c81a6489210af217a2f437f18 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 3 Feb 2008 15:02:34 -0500 Subject: update po files --- po/bg.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/cs.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/da.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/es.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/fr.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/gu.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/ikiwiki.pot | 69 ++++++++++++++++++++++++++--------------------- po/pl.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/sv.po | 84 ++++++++++++++++++++++++++++++++-------------------------- po/vi.po | 84 ++++++++++++++++++++++++++++++++-------------------------- 10 files changed, 462 insertions(+), 363 deletions(-) (limited to 'po') diff --git a/po/bg.po b/po/bg.po index 32132475e..75dfb7823 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -48,8 +48,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "дискусия" @@ -59,77 +59,77 @@ msgid "creating %s" msgstr "създаване на %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "нов източник" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "съобщения" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "е обработен нормално от %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -148,22 +148,22 @@ msgstr "Няма „счупени” връзки!" msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "грешка при обработване на шаблона" @@ -227,7 +227,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Дискусия" @@ -253,17 +253,17 @@ msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" @@ -400,6 +400,16 @@ msgstr "" msgid "at noon on %A" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "липсващ параметър „id” на шаблона" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -529,47 +539,47 @@ msgstr "" msgid "getctime not implemented" msgstr "функцията „getctime” не е реализирана" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -651,7 +661,7 @@ msgstr "Грешка" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" diff --git a/po/cs.po b/po/cs.po index 84ece7103..d93a3edba 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -46,8 +46,8 @@ msgstr "%s není editovatelná stránka" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "diskuse" @@ -57,76 +57,76 @@ msgid "creating %s" msgstr "vytvářím %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, perl-format msgid "missing %s parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "nový zdroj" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "příspěvky" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "zpracováno ok %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji zdroj %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít zdroj na %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "zdroj shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -145,22 +145,22 @@ msgstr "Žádné porušené odkazy!" msgid "%s parameter is required" msgstr "parametr %s je vyžadován" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "šablona %s nebyla nalezena" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "jméno souboru s obalem nebylo zadáno" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "nepodařilo se zpracovat:" @@ -220,7 +220,7 @@ msgstr "Přidat nový příspěvek nazvaný:" msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Diskuse" @@ -243,16 +243,16 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "zdroj nebyl nalezen" @@ -389,6 +389,16 @@ msgstr "o půlnoci" msgid "at noon on %A" msgstr "%A o poledni" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "chybí hodnoty" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -510,47 +520,47 @@ msgstr "" msgid "getctime not implemented" msgstr "getctime není implementováno" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "zpracovávám %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -630,7 +640,7 @@ msgstr "Chyba" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" diff --git a/po/da.po b/po/da.po index 8157b963d..33a754022 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-10-16 23:07+0100\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: Danish \n" @@ -49,8 +49,8 @@ msgstr "%s er ikke en redigérbar side" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "diskussion" @@ -60,76 +60,76 @@ msgid "creating %s" msgstr "opretter %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, perl-format msgid "missing %s parameter" msgstr "mangler parametren %s" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "ny fødning" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "indlæg" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "korrekt dannet ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -148,22 +148,22 @@ msgstr "Ingen henvisninger der ikker fungerer!" msgid "%s parameter is required" msgstr "parametren %s er krævet" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "wrapper-navn ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "dannelsen mislykkedes:" @@ -223,7 +223,7 @@ msgstr "Tilføj nyt indlæg med følgende titel:" msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Diskussion" @@ -247,16 +247,16 @@ msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "fødning ikke fundet" @@ -393,6 +393,16 @@ msgstr "ved midnat" msgid "at noon on %A" msgstr "midt på dagen %A" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "manglende værdier" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -512,47 +522,47 @@ msgstr "" msgid "getctime not implemented" msgstr "getctime ikke implementeret" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan ikke danne %s" @@ -632,7 +642,7 @@ msgstr "Fejl" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s forudberegningssløkke fundet på %s ved dybde %i" diff --git a/po/es.po b/po/es.po index f93a518a5..15e5acaca 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-12-20 11:25+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: Spanish \n" @@ -47,8 +47,8 @@ msgstr "la página %s no es modificable" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "comentarios" @@ -58,76 +58,76 @@ msgid "creating %s" msgstr "creando página %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, perl-format msgid "missing %s parameter" msgstr "falta el parámetro %s" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "nueva entrada" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "entradas" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "proceso completado con éxito a %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -146,20 +146,20 @@ msgstr "¡ No hay enlaces rotos !" msgid "%s parameter is required" msgstr "el parámetro %s es obligatorio" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 msgid "template not specified" msgstr "falta indicar la plantilla (template)" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 msgid "failed to process" msgstr "fallo en el proceso" @@ -221,7 +221,7 @@ msgstr "Añadir una entrada nueva titulada:" msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Comentarios" @@ -245,15 +245,15 @@ msgstr "" "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar " "el programa /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" @@ -389,6 +389,16 @@ msgstr "a medianoche" msgid "at noon on %A" msgstr "el %A a media tarde" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "faltan valores" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -508,49 +518,49 @@ msgstr "(no se puede cambiar en el modo de previsualización)" msgid "getctime not implemented" msgstr "la funcionalidad getctime no está incluida" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "convirtiendo %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikwiki: no puedo convertir la página %s" @@ -633,7 +643,7 @@ msgstr "Error" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/fr.po b/po/fr.po index b6769a969..477b45d2b 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: 2008-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-08-28 21:05+0200\n" "Last-Translator: Cyril Brulebois \n" "Language-Team: French \n" @@ -49,8 +49,8 @@ msgstr "%s n'est pas une page éditable" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "Discussion" @@ -60,76 +60,76 @@ msgid "creating %s" msgstr "Création de %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, perl-format msgid "missing %s parameter" msgstr "Paramètre %s manquant" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "Nouveau flux" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "Articles" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "A été correctement traité à %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -148,22 +148,22 @@ msgstr "Il n'y a pas de lien cassé !" msgid "%s parameter is required" msgstr "le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "Modèle (« template ») %s introuvable " -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "Le nom de fichier de l'enrobage n'a pas été indiqué" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "Échec du traitement :" @@ -225,7 +225,7 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle (« template ») %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Discussion" @@ -249,16 +249,16 @@ msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "Flux introuvable " @@ -395,6 +395,16 @@ msgstr "à minuit" msgid "at noon on %A" msgstr "%A, à midi" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "Il manque des valeurs" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -514,47 +524,47 @@ msgstr "" msgid "getctime not implemented" msgstr "getctime n'est pas implémenté" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "Parcours de %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "Affichage de %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "Affichage de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "Affichage de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "Affichage de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "Suppression de %s, qui n'est plus affiché par %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki : impossible d'afficher %s" @@ -637,7 +647,7 @@ msgstr "Erreur" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/gu.po b/po/gu.po index b50fd4813..0efa3c038 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -47,8 +47,8 @@ msgstr "%s એ સુધારી શકાય તેવું પાનું #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "ચર્ચા" @@ -58,76 +58,76 @@ msgid "creating %s" msgstr "%s બનાવે છે" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, perl-format msgid "missing %s parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "નવું ફીડ" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "પોસ્ટ" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "આના પર બરાબર છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -146,22 +146,22 @@ msgstr "અહીં કોઇ તૂટેલ કડી નથી!" msgid "%s parameter is required" msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" @@ -221,7 +221,7 @@ msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેર msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "ચર્ચા" @@ -243,16 +243,16 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" @@ -390,6 +390,16 @@ msgstr "મધ્યરાત્રે" msgid "at noon on %A" msgstr "બપોરે %A પર" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "ખોવાયેલ કિંમતો" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -511,47 +521,47 @@ msgstr "" msgid "getctime not implemented" msgstr "getctime અમલમાં મૂકાયેલ નથી" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -631,7 +641,7 @@ msgstr "ક્ષતિ" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 49c5c7b0c..69e231ada 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-29 18:30-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,8 +47,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:101 -#: ../IkiWiki/Render.pm:181 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "" @@ -58,76 +58,76 @@ msgid "creating %s" msgstr "" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:83 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:111 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:125 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:127 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:237 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:244 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:270 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:275 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:280 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:295 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:306 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:312 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:318 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:392 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "" @@ -218,7 +218,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:105 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "" @@ -384,6 +384,15 @@ msgstr "" msgid "at noon on %A" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +msgid "missing page" +msgstr "" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -503,47 +512,47 @@ msgstr "" msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Render.pm:281 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:351 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:392 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:397 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:418 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:439 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:478 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:490 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:516 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" @@ -623,7 +632,7 @@ msgstr "" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:773 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" diff --git a/po/pl.po b/po/pl.po index c3b9b0c1d..934881b89 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -50,8 +50,8 @@ msgstr "Strona %s nie może być edytowana" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "dyskusja" @@ -61,77 +61,77 @@ msgid "creating %s" msgstr "tworzenie %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "nowy kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "wpisy" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "kanał RSS przetworzony w dniu %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -150,22 +150,22 @@ msgstr "Wszystkie odnośniki są aktualne!" msgid "%s parameter is required" msgstr "Parametry \"test\" i \"then\" są wymagane" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "awaria w trakcie przetwarzania:" @@ -229,7 +229,7 @@ msgstr "Tytuł nowego wpisu" msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Dyskusja" @@ -256,17 +256,17 @@ msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" @@ -404,6 +404,16 @@ msgstr "o północy" msgid "at noon on %A" msgstr "w południe w %A" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "brakujące wartości" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -534,47 +544,47 @@ msgstr "" msgid "getctime not implemented" msgstr "niedostępna funkcja getctime" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "renderowanie %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -656,7 +666,7 @@ msgstr "Błąd" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" diff --git a/po/sv.po b/po/sv.po index 3aa8b312b..7990184dd 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -47,8 +47,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "diskussion" @@ -58,77 +58,77 @@ msgid "creating %s" msgstr "skapar %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "ny kanal" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "inlägg" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "behandlad ok på %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -147,22 +147,22 @@ msgstr "Det finns inga trasiga länkar!" msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "misslyckades med att behandla mall:" @@ -224,7 +224,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Diskussion" @@ -249,17 +249,17 @@ msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" @@ -396,6 +396,16 @@ msgstr "" msgid "at noon on %A" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "mall saknar id-parameter" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -525,47 +535,47 @@ msgstr "" msgid "getctime not implemented" msgstr "getctime inte implementerad" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "ritar upp %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -645,7 +655,7 @@ msgstr "Fel" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" diff --git a/po/vi.po b/po/vi.po index 248275b08..51e85bd41 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-01-29 04:45-0500\n" +"POT-Creation-Date: 2008-02-03 14:52-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -48,8 +48,8 @@ msgstr "" #: ../IkiWiki/CGI.pm:382 ../IkiWiki/Plugin/brokenlinks.pm:24 #: ../IkiWiki/Plugin/inline.pm:241 ../IkiWiki/Plugin/opendiscussion.pm:17 -#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 -#: ../IkiWiki/Render.pm:178 +#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95 +#: ../IkiWiki/Render.pm:175 msgid "discussion" msgstr "thảo luận" @@ -59,77 +59,77 @@ msgid "creating %s" msgstr "đang tạo %s" #: ../IkiWiki/CGI.pm:447 ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:476 -#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:558 +#: ../IkiWiki/CGI.pm:510 ../IkiWiki/CGI.pm:554 #, perl-format msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/CGI.pm:646 +#: ../IkiWiki/CGI.pm:643 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/Plugin/aggregate.pm:82 +#: ../IkiWiki/Plugin/aggregate.pm:72 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/aggregate.pm:110 +#: ../IkiWiki/Plugin/aggregate.pm:100 msgid "new feed" msgstr "nguồn tin mới" -#: ../IkiWiki/Plugin/aggregate.pm:124 +#: ../IkiWiki/Plugin/aggregate.pm:114 msgid "posts" msgstr "bài" -#: ../IkiWiki/Plugin/aggregate.pm:126 +#: ../IkiWiki/Plugin/aggregate.pm:116 msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:243 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "đã xử lý được ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:279 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:294 +#: ../IkiWiki/Plugin/aggregate.pm:290 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:311 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:317 +#: ../IkiWiki/Plugin/aggregate.pm:313 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:391 +#: ../IkiWiki/Plugin/aggregate.pm:387 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -148,22 +148,22 @@ msgstr "Không có liên kết bị ngắt nào." msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:40 +#: ../IkiWiki/Plugin/edittemplate.pm:41 #, fuzzy msgid "template not specified" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/edittemplate.pm:43 +#: ../IkiWiki/Plugin/edittemplate.pm:44 #, fuzzy msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:48 +#: ../IkiWiki/Plugin/edittemplate.pm:49 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:110 +#: ../IkiWiki/Plugin/edittemplate.pm:111 #, fuzzy msgid "failed to process" msgstr "mẫu không xử lý được:" @@ -227,7 +227,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:249 ../IkiWiki/Render.pm:99 msgid "Discussion" msgstr "Thảo luận" @@ -250,17 +250,17 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:124 +#: ../IkiWiki/Plugin/meta.pm:119 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:148 +#: ../IkiWiki/Plugin/meta.pm:143 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:156 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" @@ -397,6 +397,16 @@ msgstr "" msgid "at noon on %A" msgstr "" +#: ../IkiWiki/Plugin/recentchanges.pm:74 +#, fuzzy +msgid "missing page" +msgstr "mẫu thiếu tham số id" + +#: ../IkiWiki/Plugin/recentchanges.pm:76 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + #: ../IkiWiki/Plugin/search.pm:34 #, perl-format msgid "Must specify %s when using the search plugin" @@ -526,47 +536,47 @@ msgstr "" msgid "getctime not implemented" msgstr "chưa thực hiện getctime" -#: ../IkiWiki/Render.pm:276 ../IkiWiki/Render.pm:297 +#: ../IkiWiki/Render.pm:273 ../IkiWiki/Render.pm:294 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:339 +#: ../IkiWiki/Render.pm:343 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:384 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:377 +#: ../IkiWiki/Render.pm:389 #, perl-format msgid "rendering %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Render.pm:389 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "rendering %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:406 +#: ../IkiWiki/Render.pm:431 #, perl-format msgid "rendering %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:444 +#: ../IkiWiki/Render.pm:470 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:456 +#: ../IkiWiki/Render.pm:482 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:482 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: không thể vẽ %s" @@ -646,7 +656,7 @@ msgstr "Lỗi" #. translators: preprocessor directive name, #. translators: the second a page name, the #. translators: third a number. -#: ../IkiWiki.pm:767 +#: ../IkiWiki.pm:750 #, perl-format msgid "%s 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" -- cgit v1.2.3 From 9d54cc4659248f9820f47a021b694405d75404a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 3 Feb 2008 16:48:26 -0500 Subject: implement aggregate_locking design Now aggregation will not lock the wiki. Any changes made during aggregaton are merged in with the changed state accumulated while aggregating. A separate lock file prevents multiple concurrent aggregators. Garbage collection of orphaned guids is much improved. loadstate() is only called once per process, so tricky support for reloading wiki state is not needed. (Tested fairly thuroughly.) --- IkiWiki/Plugin/aggregate.pm | 181 +++++++++++++++++++++++++++------------- debian/changelog | 7 +- doc/todo/aggregate_locking.mdwn | 6 +- po/ikiwiki.pot | 30 +++---- 4 files changed, 146 insertions(+), 78 deletions(-) (limited to 'po') diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index cfc4ec955..ba40ee6bc 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -33,33 +33,62 @@ sub getopt () { #{{{ sub checkconfig () { #{{{ if ($config{aggregate} && ! ($config{post_commit} && IkiWiki::commit_hook_enabled())) { - if (! IkiWiki::lockwiki(0)) { - debug("wiki is locked by another process, not aggregating"); - exit 1; - } - + # See if any feeds need aggregation. loadstate(); - IkiWiki::loadindex(); - aggregate(); - expire(); - savestate(); - clearstate(); + my @feeds=needsaggregate(); + return unless @feeds; + if (! lockaggregate()) { + debug("an aggregation process is already running"); + return; + } + # force a later rebuild of source pages + $IkiWiki::forcerebuild{$_->{sourcepage}}=1 + foreach @feeds; + + # Fork a child process to handle the aggregation. + # The parent process will then handle building the + # result. This avoids messy code to clear state + # accumulated while aggregating. + defined(my $pid = fork) or error("Can't fork: $!"); + if (! $pid) { + IkiWiki::loadindex(); + + # Aggregation happens without the main wiki lock + # being held. This allows editing pages etc while + # aggregation is running. + aggregate(@feeds); + + IkiWiki::lockwiki; + # Merge changes, since aggregation state may have + # changed on disk while the aggregation was happening. + mergestate(); + expire(); + savestate(); + IkiWiki::unlockwiki; + exit 0; + } + waitpid($pid,0); + if ($?) { + error "aggregation failed with code $?"; + } - IkiWiki::unlockwiki(); + clearstate(); + unlockaggregate(); } } #}}} sub needsbuild (@) { #{{{ my $needsbuild=shift; - loadstate(); # if not already loaded + loadstate(); foreach my $feed (values %feeds) { if (exists $pagesources{$feed->{sourcepage}} && grep { $_ eq $pagesources{$feed->{sourcepage}} } @$needsbuild) { - # Mark all feeds originating on this page as removable; - # preprocess will unmark those that still exist. - remove_feeds($feed->{sourcepage}); + # Mark all feeds originating on this page as + # not yet seen; preprocess will unmark those that + # still exist. + markunseen($feed->{sourcepage}); } } } # }}} @@ -92,8 +121,7 @@ sub preprocess (@) { #{{{ $feed->{updateinterval}=defined $params{updateinterval} ? $params{updateinterval} * 60 : 15 * 60; $feed->{expireage}=defined $params{expireage} ? $params{expireage} : 0; $feed->{expirecount}=defined $params{expirecount} ? $params{expirecount} : 0; - delete $feed->{remove}; - delete $feed->{expired}; + delete $feed->{unseen}; $feed->{lastupdate}=0 unless defined $feed->{lastupdate}; $feed->{numposts}=0 unless defined $feed->{numposts}; $feed->{newposts}=0 unless defined $feed->{newposts}; @@ -123,16 +151,27 @@ sub delete (@) { #{{{ # Remove feed data for removed pages. foreach my $file (@files) { my $page=pagename($file); - remove_feeds($page); + markunseen($page); + } +} #}}} + +sub markunseen ($) { #{{{ + my $page=shift; + + foreach my $id (keys %feeds) { + if ($feeds{$id}->{sourcepage} eq $page) { + $feeds{$id}->{unseen}=1; + } } } #}}} my $state_loaded=0; + sub loadstate () { #{{{ return if $state_loaded; $state_loaded=1; if (-e "$config{wikistatedir}/aggregate") { - open(IN, "<", "$config{wikistatedir}/aggregate") || + open(IN, "$config{wikistatedir}/aggregate") || die "$config{wikistatedir}/aggregate: $!"; while () { $_=IkiWiki::possibly_foolish_untaint($_); @@ -166,32 +205,13 @@ sub loadstate () { #{{{ sub savestate () { #{{{ return unless $state_loaded; + garbage_collect(); eval q{use HTML::Entities}; error($@) if $@; my $newfile="$config{wikistatedir}/aggregate.new"; my $cleanup = sub { unlink($newfile) }; - open (OUT, ">", $newfile) || error("open $newfile: $!", $cleanup); + open (OUT, ">$newfile") || error("open $newfile: $!", $cleanup); foreach my $data (values %feeds, values %guids) { - if ($data->{remove}) { - if ($data->{name}) { - foreach my $guid (values %guids) { - if ($guid->{feed} eq $data->{name}) { - $guid->{remove}=1; - } - } - } - else { - unlink pagefile($data->{page}) - if exists $data->{page}; - } - next; - } - elsif ($data->{expired} && exists $data->{page}) { - unlink pagefile($data->{page}); - delete $data->{page}; - delete $data->{md5}; - } - my @line; foreach my $field (keys %$data) { if ($field eq "name" || $field eq "feed" || @@ -212,6 +232,63 @@ sub savestate () { #{{{ error("rename $newfile: $!", $cleanup); } #}}} +sub garbage_collect () { #{{{ + foreach my $name (keys %feeds) { + # remove any feeds that were not seen while building the pages + # that used to contain them + if ($feeds{$name}->{unseen}) { + delete $feeds{$name}; + } + } + + foreach my $guid (values %guids) { + # any guid whose feed is gone should be removed + if (! exists $feeds{$guid->{feed}}) { + unlink pagefile($guid->{page}) + if exists $guid->{page}; + delete $guids{$guid->{guid}}; + } + # handle expired guids + elsif ($guid->{expired} && exists $guid->{page}) { + unlink pagefile($guid->{page}); + delete $guid->{page}; + delete $guid->{md5}; + } + } +} #}}} + +sub mergestate () { #{{{ + # Load the current state in from disk, and merge into it + # values from the state in memory that might have changed + # during aggregation. + my %myfeeds=%feeds; + my %myguids=%guids; + clearstate(); + loadstate(); + + # All that can change in feed state during aggregation is a few + # fields. + foreach my $name (keys %myfeeds) { + if (exists $feeds{$name}) { + foreach my $field (qw{message lastupdate numposts + newposts error}) { + $feeds{$name}->{$field}=$myfeeds{$name}->{$field}; + } + } + } + + # New guids can be created during aggregation. + # It's also possible that guids were removed from the on-disk state + # while the aggregation was in process. That would only happen if + # their feed was also removed, so any removed guids added back here + # will be garbage collected later. + foreach my $guid (keys %myguids) { + if (! exists $guids{$guid}) { + $guids{$guid}=$myguids{$guid}; + } + } +} #}}} + sub clearstate () { #{{{ %feeds=(); %guids=(); @@ -249,7 +326,12 @@ sub expire () { #{{{ } } #}}} -sub aggregate () { #{{{ +sub needsaggregate () { #{{{ + return values %feeds if $config{rebuild}; + return grep { time - $_->{lastupdate} >= $_->{updateinterval} } values %feeds; +} #}}} + +sub aggregate (@) { #{{{ eval q{use XML::Feed}; error($@) if $@; eval q{use URI::Fetch}; @@ -257,15 +339,12 @@ sub aggregate () { #{{{ eval q{use HTML::Entities}; error($@) if $@; - foreach my $feed (values %feeds) { - next unless $config{rebuild} || - time - $feed->{lastupdate} >= $feed->{updateinterval}; + foreach my $feed (@_) { $feed->{lastupdate}=time; $feed->{newposts}=0; $feed->{message}=sprintf(gettext("processed ok at %s"), displaytime($feed->{lastupdate})); $feed->{error}=0; - $IkiWiki::forcerebuild{$feed->{sourcepage}}=1; debug(sprintf(gettext("checking feed %s ..."), $feed->{name})); @@ -473,18 +552,6 @@ sub htmlabs ($$) { #{{{ return $ret; } #}}} -sub remove_feeds () { #{{{ - my $page=shift; - - my %removed; - foreach my $id (keys %feeds) { - if ($feeds{$id}->{sourcepage} eq $page) { - $feeds{$id}->{remove}=1; - $removed{$id}=1; - } - } -} #}}} - sub pagefile ($) { #{{{ my $page=shift; diff --git a/debian/changelog b/debian/changelog index 99ee5cdc2..1266666e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,19 +6,22 @@ ikiwiki (2.31) UNRELEASED; urgency=low that contributes to a page's content and using the youngest of them all, as well as special cases for things like the version plugin, and it's just too complex to do. + * aggregate: Forking a child broke the one state that mattered: Forcing + the aggregating page to be rebuilt. Fix this. * cgi hooks are now run before ikiwiki state is loaded. * This allows locking the wiki before loading state, which avoids some tricky locking code when saving a web edit. * poll: This plugin turns out to have edited pages w/o doing any locking. Oops. Convert it from a cgi to a sessioncgi hook, which will work much better. - * aggregate: Revert use of forking to not save state, that was not the right - approach. * recentchanges: Improve handling of links on the very static changes pages by thunking to the CGI, which can redirect to the page, or allow it to be created if it doesn't exist. * recentchanges: Exipre all *._change pages, even if the directory they're in has changed. + * aggregate: Lots of changes; aggregation can now run without locking the + wiki, and there is a separate aggregatelock to prevent multiple concurrent + aggregation runs. -- Joey Hess Sat, 02 Feb 2008 23:36:31 -0500 diff --git a/doc/todo/aggregate_locking.mdwn b/doc/todo/aggregate_locking.mdwn index 91df662a7..b6c82e923 100644 --- a/doc/todo/aggregate_locking.mdwn +++ b/doc/todo/aggregate_locking.mdwn @@ -46,16 +46,12 @@ would be loaded, and there would be no reason to worry about aggregating. Or aggregation could be kept in checkconfig, like so: -* lock wiki * load aggregation state -* unlock wiki * get list of feeds needing aggregation * exit if none * attempt to take aggregation lock, exit if another aggregation is happening * fork a child process to do the aggregation - * lock wiki * load wiki state (needed for aggregation to run) - * unlock wiki * aggregate * lock wiki * reload aggregation state @@ -64,3 +60,5 @@ Or aggregation could be kept in checkconfig, like so: * drop aggregation lock * force rebuild of sourcepages of feeds that were aggregated * exit checkconfig and continue with usual refresh process + +[[done]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 69e231ada..62810a687 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-02-03 14:52-0500\n" +"POT-Creation-Date: 2008-02-03 16:05-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,67 +67,67 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:72 +#: ../IkiWiki/Plugin/aggregate.pm:100 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:100 +#: ../IkiWiki/Plugin/aggregate.pm:127 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:114 +#: ../IkiWiki/Plugin/aggregate.pm:141 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:116 +#: ../IkiWiki/Plugin/aggregate.pm:143 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:232 +#: ../IkiWiki/Plugin/aggregate.pm:307 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:239 +#: ../IkiWiki/Plugin/aggregate.pm:314 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:265 +#: ../IkiWiki/Plugin/aggregate.pm:343 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:270 +#: ../IkiWiki/Plugin/aggregate.pm:347 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:275 +#: ../IkiWiki/Plugin/aggregate.pm:352 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:290 +#: ../IkiWiki/Plugin/aggregate.pm:367 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:301 +#: ../IkiWiki/Plugin/aggregate.pm:378 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:307 +#: ../IkiWiki/Plugin/aggregate.pm:384 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:313 +#: ../IkiWiki/Plugin/aggregate.pm:390 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:387 +#: ../IkiWiki/Plugin/aggregate.pm:464 #, perl-format msgid "creating new page %s" msgstr "" -- cgit v1.2.3