From f5322fa912250cb2859bb63aeae419a405f74544 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 1 Aug 2009 12:31:53 +0100 Subject: Mark todo/source_link as done --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 565f19c7c..90ec2ddac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low * Add further build machinery to generate translated underlays from the po file, for use by wikis whose primary language is not English. * Add Danish basewiki translation by Jonas Smedegaard. + * Add getsource plugin (Will, smcv) -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- cgit v1.2.3 From c0c1e05daba09ce9c73c6c2f1ceca02b488613ba Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 Aug 2009 12:32:39 -0400 Subject: finish merging getsource --- debian/copyright | 2 +- doc/plugins/getsource.mdwn | 4 ++-- doc/todo/source_link.mdwn | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 762f9f445..b06d27f19 100644 --- a/debian/copyright +++ b/debian/copyright @@ -136,7 +136,7 @@ Files: 404.pm Copyright: © 2009 Simon McVittie License: GPL-2+ -Files: wmd.pm +Files: wmd.pm, getsource.pm Copyright: © 2009 William Uther License: GPL-2+ diff --git a/doc/plugins/getsource.mdwn b/doc/plugins/getsource.mdwn index 4fbf4be98..20040ccee 100644 --- a/doc/plugins/getsource.mdwn +++ b/doc/plugins/getsource.mdwn @@ -1,7 +1,7 @@ [[!template id=plugin name=getsource author="[[Will_Uther|Will]]"]] -This plugin adds a `getsource` action to the IkiWiki CGI, and a "Source" link -that uses it to display pages' source. +This plugin adds a "Source" link to the top of each page that uses +the CGI to display the page's source. Configuration for this plugin in the setup file: diff --git a/doc/todo/source_link.mdwn b/doc/todo/source_link.mdwn index 0c639a314..dfc2766cc 100644 --- a/doc/todo/source_link.mdwn +++ b/doc/todo/source_link.mdwn @@ -13,6 +13,7 @@ All of this code is licensed under the GPLv2+. -- [[Will]] [[!template id=gitbranch branch=smcv/ready/getsource author="[[Will]]/[[smcv]]"]] +[[done]] >> I've applied the patch below in a git branch, fixed my earlier criticism, >> and also fixed a couple of other issues I noticed: -- cgit v1.2.3 From 8364adcfb75bbf755844c0fd17dc9e393737a960 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 11 Aug 2009 15:19:19 -0400 Subject: releasing version 3.15 --- debian/changelog | 4 +- po/bg.po | 189 +++++++++++++++++++++++++++++++------------------------ po/cs.po | 189 +++++++++++++++++++++++++++++++------------------------ po/da.po | 117 ++++++++++++++++++++-------------- po/de.po | 117 ++++++++++++++++++++-------------- po/es.po | 114 +++++++++++++++++++-------------- po/fr.po | 114 +++++++++++++++++++-------------- po/gu.po | 189 +++++++++++++++++++++++++++++++------------------------ po/ikiwiki.pot | 165 ++++++++++++++++++++++++++---------------------- po/pl.po | 189 +++++++++++++++++++++++++++++++------------------------ po/sv.po | 189 +++++++++++++++++++++++++++++++------------------------ po/vi.po | 189 +++++++++++++++++++++++++++++++------------------------ 12 files changed, 1003 insertions(+), 762 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e370a33ef..d02ce888e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.15) UNRELEASED; urgency=low +ikiwiki (3.15) unstable; urgency=low * Add new hooks: canremove, canrename, rename. (intrigeri) * rename: Refactor subpage rename handling code into rename hook. (intrigeri) @@ -18,7 +18,7 @@ ikiwiki (3.15) UNRELEASED; urgency=low pages to inline, in a specific order, without using a PageSpec. (smcv) * Add getsource plugin (Will, smcv) - -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 + -- Joey Hess Tue, 11 Aug 2009 14:59:31 -0400 ikiwiki (3.14159) unstable; urgency=low diff --git a/po/bg.po b/po/bg.po index 9c03e3b87..8ffbf26a4 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -22,7 +22,7 @@ msgstr "Първо трябва да влезете." #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -147,8 +147,9 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " -msgstr "" +#, fuzzy +msgid "Failed to create S3 bucket: " +msgstr "Грешка при изпращане на поща" #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy @@ -188,10 +189,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Дискусия" @@ -335,6 +336,26 @@ msgstr "" msgid "fortune failed" msgstr "грешшка в приставката „fortune”" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#, fuzzy +msgid "missing page" +msgstr "липсващ параметър „id” на шаблона" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "грешка при четене на „%s”: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -360,16 +381,6 @@ msgstr "При използване на приеставката „search” msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy -msgid "missing page" -msgstr "липсващ параметър „id” на шаблона" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -394,28 +405,28 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" @@ -436,25 +447,30 @@ msgstr "шаблонът „%s” не е намерен" msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -520,7 +536,8 @@ msgid "Get an OpenID" msgstr "Получаване на OpenID номер" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +#, fuzzy +msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -578,103 +595,106 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "дискусия" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 -#, perl-format -msgid "rendering %s" -msgstr "обновяване на страницата „%s”" +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#, fuzzy, perl-format +msgid "building %s" +msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "крешка при компилиране на файла %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "грешка при запис на файла „%s”: %s" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "гласуване" @@ -1023,56 +1043,56 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:436 -#, perl-format -msgid "rendering %s, which links to %s" +#: ../IkiWiki/Render.pm:442 +#, fuzzy, perl-format +msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:457 -#, perl-format -msgid "rendering %s, which depends on %s" +#: ../IkiWiki/Render.pm:463 +#, fuzzy, perl-format +msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:496 -#, perl-format -msgid "rendering %s, to update its backlinks" +#: ../IkiWiki/Render.pm:502 +#, fuzzy, perl-format +msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:508 -#, perl-format -msgid "removing %s, no longer rendered by %s" +#: ../IkiWiki/Render.pm:514 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:532 -#, perl-format -msgid "ikiwiki: cannot render %s" +#: ../IkiWiki/Render.pm:538 +#, fuzzy, perl-format +msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" #. translators: The first parameter is a filename, and the second @@ -1191,13 +1211,16 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "rendering %s" +#~ msgstr "обновяване на страницата „%s”" + #, fuzzy #~ msgid "Must specify %s when using the google search plugin" #~ msgstr "" diff --git a/po/cs.po b/po/cs.po index b629e20a9..e377b0cf2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -21,7 +21,7 @@ msgstr "Nejprve se musíte přihlásit." #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -144,8 +144,9 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " -msgstr "" +#, fuzzy +msgid "Failed to create S3 bucket: " +msgstr "Nepodařilo se odeslat email." #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy @@ -185,10 +186,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Diskuse" @@ -332,6 +333,26 @@ msgstr "" msgid "fortune failed" msgstr "fortune selhal" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#, fuzzy +msgid "missing page" +msgstr "chybí hodnoty" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "nemohu číst %s: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "%s není editovatelná stránka" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -357,16 +378,6 @@ msgstr "Při používání vyhledávacího modulu musíte zadat %s" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy -msgid "missing page" -msgstr "chybí hodnoty" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" @@ -390,28 +401,28 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen není nainstalován" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "nelze změnit velikost: %s" @@ -430,25 +441,30 @@ msgstr "zdroj nebyl nalezen" msgid "missing pages parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -510,7 +526,8 @@ msgid "Get an OpenID" msgstr "Získat OpenID" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +#, fuzzy +msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -568,103 +585,106 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "diskuse" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 -#, perl-format -msgid "rendering %s" -msgstr "zpracovávám %s" +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#, fuzzy, perl-format +msgid "building %s" +msgstr "upravuji %s" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "nelze zkompilovat %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "nelze zapsat %s: %s" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "nelze číst %s: %s" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "hlasovat" @@ -1009,56 +1029,56 @@ msgstr "" msgid "bad file name %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:436 -#, perl-format -msgid "rendering %s, which links to %s" +#: ../IkiWiki/Render.pm:442 +#, fuzzy, perl-format +msgid "building %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:457 -#, perl-format -msgid "rendering %s, which depends on %s" +#: ../IkiWiki/Render.pm:463 +#, fuzzy, perl-format +msgid "building %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:496 -#, perl-format -msgid "rendering %s, to update its backlinks" +#: ../IkiWiki/Render.pm:502 +#, fuzzy, perl-format +msgid "building %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:508 -#, perl-format -msgid "removing %s, no longer rendered by %s" +#: ../IkiWiki/Render.pm:514 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:532 -#, perl-format -msgid "ikiwiki: cannot render %s" +#: ../IkiWiki/Render.pm:538 +#, fuzzy, perl-format +msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze zpracovat %s" #. translators: The first parameter is a filename, and the second @@ -1175,13 +1195,16 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "rendering %s" +#~ msgstr "zpracovávám %s" + #, fuzzy #~ msgid "Must specify %s when using the google search plugin" #~ msgstr "Při používání vyhledávacího modulu musíte zadat %s" diff --git a/po/da.po b/po/da.po index b0f5d7a5f..9ced576d8 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-23 01:01+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -150,15 +150,18 @@ msgid "Must specify %s" msgstr "Skal angive %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket inside S3: " +#, fuzzy +msgid "Failed to create S3 bucket: " msgstr "Oprettelse af bundt i S3 mislykkedes: " #: ../IkiWiki/Plugin/amazon_s3.pm:221 -msgid "Failed to save file into S3: " +#, fuzzy +msgid "Failed to save file to S3: " msgstr "Arkivering af fil i S3 mislykkedes: " #: ../IkiWiki/Plugin/amazon_s3.pm:243 -msgid "Failed to delete file inside S3: " +#, fuzzy +msgid "Failed to delete file from S3: " msgstr "Sletning af fil fra S3 mislykkedes: " #: ../IkiWiki/Plugin/attachment.pm:49 @@ -191,10 +194,10 @@ msgstr "" "a>: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Diskussion" @@ -335,6 +338,25 @@ msgstr "skal angive format og tekst" msgid "fortune failed" msgstr "spådom (fortune) fejlede" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "manglende side" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "Siden %s eksisterer ikke." + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "kan ikke få sider til at passe sammen: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "%s er ikke en redigérbar side" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -360,15 +382,6 @@ msgstr "Skal angive %s når udvidelsen %s bruges" msgid "Failed to parse url, cannot determine domain name" msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" -#: ../IkiWiki/Plugin/goto.pm:55 -msgid "missing page" -msgstr "manglende side" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "Siden %s eksisterer ikke." - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" @@ -394,27 +407,27 @@ msgstr "" "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel " "gennemkørsel" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "læsning af %s mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -431,25 +444,30 @@ msgstr "sideredigering er ikke tilladt" msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -599,7 +617,7 @@ msgstr "diskussion" msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415 +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 #, perl-format msgid "building %s" msgstr "danner %s" @@ -629,45 +647,50 @@ msgstr "" msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:833 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "kopiering af POT-filen til %s mislykkedes" + +#: ../IkiWiki/Plugin/po.pm:848 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:854 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:875 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:903 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041 -#: ../IkiWiki/Plugin/po.pm:1081 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1039 +#: ../IkiWiki/Plugin/po.pm:1054 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1044 +#: ../IkiWiki/Plugin/po.pm:1059 #, perl-format msgid "failed to read %s" msgstr "læsning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1093 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -1011,7 +1034,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1020,47 +1043,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:436 +#: ../IkiWiki/Render.pm:442 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:457 +#: ../IkiWiki/Render.pm:463 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:496 +#: ../IkiWiki/Render.pm:502 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:508 +#: ../IkiWiki/Render.pm:514 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:532 +#: ../IkiWiki/Render.pm:538 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" diff --git a/po/de.po b/po/de.po index b5c7c9ec2..83a70bd9c 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-23 01:01+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -147,15 +147,18 @@ msgid "Must specify %s" msgstr "%s muss angegeben werden" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket inside S3: " +#, fuzzy +msgid "Failed to create S3 bucket: " msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: " #: ../IkiWiki/Plugin/amazon_s3.pm:221 -msgid "Failed to save file into S3: " +#, fuzzy +msgid "Failed to save file to S3: " msgstr "Konnte die Datei nicht in S3 speichern: " #: ../IkiWiki/Plugin/amazon_s3.pm:243 -msgid "Failed to delete file inside S3: " +#, fuzzy +msgid "Failed to delete file from S3: " msgstr "Konnte die Datei nicht in S3 löschen: " #: ../IkiWiki/Plugin/attachment.pm:49 @@ -188,10 +191,10 @@ msgstr "" "als Spam ein: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Diskussion" @@ -333,6 +336,25 @@ msgstr "Format und Text müssen spezifiziert werden" msgid "fortune failed" msgstr "fortune fehlgeschlagen" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "fehlende Seite" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "Die Seite %s existiert nicht." + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "Kann die Seiten nicht zuordnen: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "Seite %s kann nicht bearbeitet werden" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -358,15 +380,6 @@ msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" msgid "Failed to parse url, cannot determine domain name" msgstr "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" -#: ../IkiWiki/Plugin/goto.pm:55 -msgid "missing page" -msgstr "fehlende Seite" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "Die Seite %s existiert nicht." - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" @@ -392,27 +405,27 @@ msgstr "" "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass " "through" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." @@ -431,25 +444,30 @@ msgstr "bearbeiten der Seiten nicht erlaubt" msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -602,7 +620,7 @@ msgstr "Diskussion" msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415 +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 #, perl-format msgid "building %s" msgstr "erzeuge %s" @@ -632,45 +650,50 @@ msgstr "" msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:833 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" + +#: ../IkiWiki/Plugin/po.pm:848 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:854 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:875 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:903 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041 -#: ../IkiWiki/Plugin/po.pm:1081 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1039 +#: ../IkiWiki/Plugin/po.pm:1054 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1044 +#: ../IkiWiki/Plugin/po.pm:1059 #, perl-format msgid "failed to read %s" msgstr "lesen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1093 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -1020,7 +1043,7 @@ msgstr "" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1029,47 +1052,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:436 +#: ../IkiWiki/Render.pm:442 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:457 +#: ../IkiWiki/Render.pm:463 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:496 +#: ../IkiWiki/Render.pm:502 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:508 +#: ../IkiWiki/Render.pm:514 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:532 +#: ../IkiWiki/Render.pm:538 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" diff --git a/po/es.po b/po/es.po index 9f7f2829b..65ad72140 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-23 01:01+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -153,17 +153,17 @@ msgstr "Debe especificar %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 #, fuzzy -msgid "Failed to create bucket inside S3: " +msgid "Failed to create S3 bucket: " msgstr "Creación de directorio en S3 fallida: " #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy -msgid "Failed to save file into S3: " +msgid "Failed to save file to S3: " msgstr "No puedo guardar el archivo en S3: " #: ../IkiWiki/Plugin/amazon_s3.pm:243 #, fuzzy -msgid "Failed to delete file inside S3: " +msgid "Failed to delete file from S3: " msgstr "No puedo borrar archivo en S3: " #: ../IkiWiki/Plugin/attachment.pm:49 @@ -196,10 +196,10 @@ msgstr "" "dice que el texto puede ser spam." #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Comentarios" @@ -340,6 +340,25 @@ msgstr "se deben especificar tanto el formato como el texto" msgid "fortune failed" msgstr "el programa fortune ha fallado" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "página no encontrada" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "No existe la página %s." + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "no encuentro páginas coincidentes: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "la página %s no es modificable" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -366,15 +385,6 @@ msgid "Failed to parse url, cannot determine domain name" msgstr "" "Error en el análisis del URL, no puedo determinar el nombre del dominio" -#: ../IkiWiki/Plugin/goto.pm:55 -msgid "missing page" -msgstr "página no encontrada" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "No existe la página %s." - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " @@ -400,27 +410,27 @@ msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" @@ -439,27 +449,32 @@ msgstr "no está permitida la modificación de páginas" msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -610,7 +625,7 @@ msgstr "Comentarios" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415 +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" @@ -636,46 +651,51 @@ msgstr "" msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:833 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "ha fallado la compilación del programa %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:875 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041 -#: ../IkiWiki/Plugin/po.pm:1081 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1039 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1044 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/po.pm:1093 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1024,7 +1044,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1033,49 +1053,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:436 +#: ../IkiWiki/Render.pm:442 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:457 +#: ../IkiWiki/Render.pm:463 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:496 +#: ../IkiWiki/Render.pm:502 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:508 +#: ../IkiWiki/Render.pm:514 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:532 +#: ../IkiWiki/Render.pm:538 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" diff --git a/po/fr.po b/po/fr.po index fe78d0a72..a27420254 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-23 01:01+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2009-06-29 16:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -149,17 +149,17 @@ msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 #, fuzzy -msgid "Failed to create bucket inside S3: " +msgid "Failed to create S3 bucket: " msgstr "Impossible de créer un compartiment S3 :" #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy -msgid "Failed to save file into S3: " +msgid "Failed to save file to S3: " msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" #: ../IkiWiki/Plugin/amazon_s3.pm:243 #, fuzzy -msgid "Failed to delete file inside S3: " +msgid "Failed to delete file from S3: " msgstr "Échec lors de la suppression du fichier sur S3 :" #: ../IkiWiki/Plugin/attachment.pm:49 @@ -192,10 +192,10 @@ msgstr "" "blogspam.net/\">blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 #: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Discussion" @@ -336,6 +336,25 @@ msgstr "le format et le texte doivent être indiqués" msgid "fortune failed" msgstr "Échec du lancement de « fortune »" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "Page manquante" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "La page %s n'existe pas." + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "Impossible de trouver les pages %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "%s n'est pas une page éditable" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -361,15 +380,6 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »." msgid "Failed to parse url, cannot determine domain name" msgstr "Impossible d'analyser l'url, pas de nom de domaine" -#: ../IkiWiki/Plugin/goto.pm:55 -msgid "missing page" -msgstr "Page manquante" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "La page %s n'existe pas." - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" @@ -395,27 +405,27 @@ msgstr "" "Avertissement : le module perl « highlight » n'est pas disponible. " "Continuation malgré tout." -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" @@ -434,25 +444,30 @@ msgstr "Modification de page interdite" msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -601,7 +616,7 @@ msgstr "Discussion" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:415 +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 #, fuzzy, perl-format msgid "building %s" msgstr "va envoyer un ping à %s" @@ -627,46 +642,51 @@ msgstr "" msgid "POT file (%s) does not exist" msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:833 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "Échec de la compilation de %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:875 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1027 ../IkiWiki/Plugin/po.pm:1041 -#: ../IkiWiki/Plugin/po.pm:1081 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/po.pm:1039 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/po.pm:1044 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/po.pm:1093 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1015,7 +1035,7 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1024,47 +1044,47 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:436 +#: ../IkiWiki/Render.pm:442 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:457 +#: ../IkiWiki/Render.pm:463 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:496 +#: ../IkiWiki/Render.pm:502 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:508 +#: ../IkiWiki/Render.pm:514 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:532 +#: ../IkiWiki/Render.pm:538 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" diff --git a/po/gu.po b/po/gu.po index 5bc897a90..ce76f8612 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -21,7 +21,7 @@ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશ #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -145,8 +145,9 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " -msgstr "" +#, fuzzy +msgid "Failed to create S3 bucket: " +msgstr "મેઇલ મોકલવામાં નિષ્ફળ" #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy @@ -186,10 +187,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "ચર્ચા" @@ -333,6 +334,26 @@ msgstr "" msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#, fuzzy +msgid "missing page" +msgstr "ખોવાયેલ કિંમતો" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "વાંચી શકાતી નથી %s: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -358,16 +379,6 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy -msgid "missing page" -msgstr "ખોવાયેલ કિંમતો" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" @@ -391,28 +402,28 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -431,25 +442,30 @@ msgstr "ફીડ મળ્યું નહી" msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -510,7 +526,8 @@ msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +#, fuzzy +msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -568,103 +585,106 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "ચર્ચા" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 -#, perl-format -msgid "rendering %s" -msgstr "રેન્ડર કરે છે %s" +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#, fuzzy, perl-format +msgid "building %s" +msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "મત" @@ -1009,56 +1029,56 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:436 -#, perl-format -msgid "rendering %s, which links to %s" +#: ../IkiWiki/Render.pm:442 +#, fuzzy, perl-format +msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:457 -#, perl-format -msgid "rendering %s, which depends on %s" +#: ../IkiWiki/Render.pm:463 +#, fuzzy, perl-format +msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:496 -#, perl-format -msgid "rendering %s, to update its backlinks" +#: ../IkiWiki/Render.pm:502 +#, fuzzy, perl-format +msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:508 -#, perl-format -msgid "removing %s, no longer rendered by %s" +#: ../IkiWiki/Render.pm:514 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:532 -#, perl-format -msgid "ikiwiki: cannot render %s" +#: ../IkiWiki/Render.pm:538 +#, fuzzy, perl-format +msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" #. translators: The first parameter is a filename, and the second @@ -1175,13 +1195,16 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "rendering %s" +#~ msgstr "રેન્ડર કરે છે %s" + #, fuzzy #~ msgid "Must specify %s when using the google search plugin" #~ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 3451329cc..8ba10ecbb 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -22,7 +22,7 @@ msgstr "" #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -145,7 +145,7 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " +msgid "Failed to create S3 bucket: " msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:221 @@ -184,10 +184,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "" @@ -328,6 +328,24 @@ msgstr "" msgid "fortune failed" msgstr "" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +msgid "not a page" +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -353,15 +371,6 @@ msgstr "" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -msgid "missing page" -msgstr "" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "" @@ -385,27 +394,27 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, perl-format msgid "failed to determine size of image %s" msgstr "" @@ -422,25 +431,30 @@ msgstr "" msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -499,7 +513,7 @@ msgid "Get an OpenID" msgstr "" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +msgid "All pages have other pages linking to them." msgstr "" #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -556,102 +570,105 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 #, perl-format -msgid "rendering %s" +msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:848 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, perl-format msgid "failed to read %s" msgstr "" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "" @@ -987,56 +1004,56 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:436 +#: ../IkiWiki/Render.pm:442 #, perl-format -msgid "rendering %s, which links to %s" +msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:457 +#: ../IkiWiki/Render.pm:463 #, perl-format -msgid "rendering %s, which depends on %s" +msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:496 +#: ../IkiWiki/Render.pm:502 #, perl-format -msgid "rendering %s, to update its backlinks" +msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:508 +#: ../IkiWiki/Render.pm:514 #, perl-format -msgid "removing %s, no longer rendered by %s" +msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:532 +#: ../IkiWiki/Render.pm:538 #, perl-format -msgid "ikiwiki: cannot render %s" +msgid "ikiwiki: cannot build %s" msgstr "" #. translators: The first parameter is a filename, and the second @@ -1153,7 +1170,7 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 diff --git a/po/pl.po b/po/pl.po index afbcbe39e..3e8d08523 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -22,7 +22,7 @@ msgstr "Proszę najpierw zalogować się." #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -149,8 +149,9 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " -msgstr "" +#, fuzzy +msgid "Failed to create S3 bucket: " +msgstr "Awaria w trakcie wysyłania wiadomości" #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy @@ -190,10 +191,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Dyskusja" @@ -337,6 +338,26 @@ msgstr "" msgid "fortune failed" msgstr "awaria fortunki" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#, fuzzy +msgid "missing page" +msgstr "brakujące wartości" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "awaria w trakcie odczytu %s: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, fuzzy, perl-format +msgid "%s is an attachment, not a page." +msgstr "Strona %s nie może być edytowana" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -362,16 +383,6 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy -msgid "missing page" -msgstr "brakujące wartości" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -396,28 +407,28 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -438,25 +449,30 @@ msgstr "nieznaleziony kanał RSS" msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -523,7 +539,8 @@ msgid "Get an OpenID" msgstr "Pobierz OpenID" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +#, fuzzy +msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -581,103 +598,106 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "dyskusja" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 -#, perl-format -msgid "rendering %s" -msgstr "renderowanie %s" +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#, fuzzy, perl-format +msgid "building %s" +msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "awaria w trakcie kompilowania %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "awaria w trakcie odczytu %s: %s" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "głosuj" @@ -1031,56 +1051,56 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:436 -#, perl-format -msgid "rendering %s, which links to %s" +#: ../IkiWiki/Render.pm:442 +#, fuzzy, perl-format +msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:457 -#, perl-format -msgid "rendering %s, which depends on %s" +#: ../IkiWiki/Render.pm:463 +#, fuzzy, perl-format +msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:496 -#, perl-format -msgid "rendering %s, to update its backlinks" +#: ../IkiWiki/Render.pm:502 +#, fuzzy, perl-format +msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:508 -#, perl-format -msgid "removing %s, no longer rendered by %s" +#: ../IkiWiki/Render.pm:514 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:532 -#, perl-format -msgid "ikiwiki: cannot render %s" +#: ../IkiWiki/Render.pm:538 +#, fuzzy, perl-format +msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" #. translators: The first parameter is a filename, and the second @@ -1199,13 +1219,16 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "rendering %s" +#~ msgstr "renderowanie %s" + #, fuzzy #~ msgid "Must specify %s when using the google search plugin" #~ msgstr "Wtyczka do wyszukiwarka wymaga podania %s" diff --git a/po/sv.po b/po/sv.po index 70d9ca68c..ff8d3aa0d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -21,7 +21,7 @@ msgstr "Du måste logga in först." #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -146,8 +146,9 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " -msgstr "" +#, fuzzy +msgid "Failed to create S3 bucket: " +msgstr "Misslyckades med att skicka e-post" #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy @@ -187,10 +188,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Diskussion" @@ -334,6 +335,26 @@ msgstr "" msgid "fortune failed" msgstr "fortune misslyckades" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#, fuzzy +msgid "missing page" +msgstr "mall saknar id-parameter" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "kan inte läsa %s: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -359,16 +380,6 @@ msgstr "Måste ange %s när sökinsticket används" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy -msgid "missing page" -msgstr "mall saknar id-parameter" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -393,28 +404,28 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" @@ -433,25 +444,30 @@ msgstr "mallen %s hittades inte" msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -516,7 +532,8 @@ msgid "Get an OpenID" msgstr "Skaffa ett OpenID" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +#, fuzzy +msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -574,103 +591,106 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "diskussion" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 -#, perl-format -msgid "rendering %s" -msgstr "ritar upp %s" +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#, fuzzy, perl-format +msgid "building %s" +msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "misslyckades med att kompilera %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "misslyckades med att skriva %s: %s" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "röst" @@ -1018,56 +1038,56 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:436 -#, perl-format -msgid "rendering %s, which links to %s" +#: ../IkiWiki/Render.pm:442 +#, fuzzy, perl-format +msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:457 -#, perl-format -msgid "rendering %s, which depends on %s" +#: ../IkiWiki/Render.pm:463 +#, fuzzy, perl-format +msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:496 -#, perl-format -msgid "rendering %s, to update its backlinks" +#: ../IkiWiki/Render.pm:502 +#, fuzzy, perl-format +msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:508 -#, perl-format -msgid "removing %s, no longer rendered by %s" +#: ../IkiWiki/Render.pm:514 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:532 -#, perl-format -msgid "ikiwiki: cannot render %s" +#: ../IkiWiki/Render.pm:538 +#, fuzzy, perl-format +msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" #. translators: The first parameter is a filename, and the second @@ -1184,13 +1204,16 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "rendering %s" +#~ msgstr "ritar upp %s" + #, fuzzy #~ msgid "Must specify %s when using the google search plugin" #~ msgstr "Måste ange %s när sökinsticket används" diff --git a/po/vi.po b/po/vi.po index 75fceb445..7cf911b16 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-20 06:45+0200\n" +"POT-Creation-Date: 2009-08-11 15:00-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -22,7 +22,7 @@ msgstr "Trước tiên bạn cần phải đăng nhập." #: ../IkiWiki/CGI.pm:146 msgid "" -"probable misconfiguration: sslcookie is set, but you are attepting to login " +"probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" @@ -147,8 +147,9 @@ msgid "Must specify %s" msgstr "" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -msgid "Failed to create bucket in S3: " -msgstr "" +#, fuzzy +msgid "Failed to create S3 bucket: " +msgstr "Lỗi gửi thư" #: ../IkiWiki/Plugin/amazon_s3.pm:221 #, fuzzy @@ -188,10 +189,10 @@ msgid "" msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:283 ../IkiWiki/Plugin/po.pm:286 -#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 +#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 msgid "Discussion" msgstr "Thảo luận" @@ -335,6 +336,26 @@ msgstr "" msgid "fortune failed" msgstr "fortune bị lỗi" +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#, fuzzy +msgid "missing page" +msgstr "mẫu thiếu tham số id" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +#, fuzzy +msgid "not a page" +msgstr "không thể đọc %s: %s" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "" + #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format @@ -360,16 +381,6 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy -msgid "missing page" -msgstr "mẫu thiếu tham số id" - -#: ../IkiWiki/Plugin/goto.pm:57 -#, perl-format -msgid "The page %s does not exist." -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -394,28 +405,28 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" -#: ../IkiWiki/Plugin/img.pm:62 +#: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/img.pm:69 +#: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:80 ../IkiWiki/Plugin/img.pm:84 -#: ../IkiWiki/Plugin/img.pm:101 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:90 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:118 +#: ../IkiWiki/Plugin/img.pm:119 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" @@ -436,25 +447,30 @@ msgstr "không tìm thấy mẫu %s" msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:196 +#: ../IkiWiki/Plugin/inline.pm:192 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:214 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:207 +#: ../IkiWiki/Plugin/inline.pm:225 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:310 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:330 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:596 +#: ../IkiWiki/Plugin/inline.pm:615 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" @@ -517,7 +533,8 @@ msgid "Get an OpenID" msgstr "Lấy OpenID" #: ../IkiWiki/Plugin/orphans.pm:52 -msgid "All pages are linked to by other pages." +#, fuzzy +msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." #: ../IkiWiki/Plugin/pagetemplate.pm:30 @@ -575,103 +592,106 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" -#: ../IkiWiki/Plugin/po.pm:130 -msgid "" -"At least one slave language must be defined in po_slave_languages when using " -"the po plugin" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:131 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:143 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:148 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:276 +#: ../IkiWiki/Plugin/po.pm:282 msgid "discussion" msgstr "thảo luận" -#: ../IkiWiki/Plugin/po.pm:373 +#: ../IkiWiki/Plugin/po.pm:379 #, perl-format -msgid "re-rendering all pages to fix meta titles" +msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:377 ../IkiWiki/Render.pm:415 -#, perl-format -msgid "rendering %s" -msgstr "đang vẽ %s" +#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#, fuzzy, perl-format +msgid "building %s" +msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:410 +#: ../IkiWiki/Plugin/po.pm:420 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:444 msgid "" -"Can not remove a translation. Removing the master page, though, removes its " -"translations as well." +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:454 +#: ../IkiWiki/Plugin/po.pm:464 msgid "" -"Can not rename a translation. Renaming the master page, though, renames its " -"translations as well." +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:816 +#: ../IkiWiki/Plugin/po.pm:825 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:824 +#: ../IkiWiki/Plugin/po.pm:839 +#, fuzzy, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "lỗi biên dịch %s" + +#: ../IkiWiki/Plugin/po.pm:848 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:830 +#: ../IkiWiki/Plugin/po.pm:854 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:866 +#: ../IkiWiki/Plugin/po.pm:890 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:879 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:979 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1018 ../IkiWiki/Plugin/po.pm:1032 -#: ../IkiWiki/Plugin/po.pm:1072 +#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 +#: ../IkiWiki/Plugin/po.pm:1096 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1030 +#: ../IkiWiki/Plugin/po.pm:1054 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1059 #, fuzzy, perl-format msgid "failed to read %s" msgstr "lỗi ghi %s: %s" +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" msgstr "bỏ phiếu" @@ -1019,56 +1039,56 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:254 +#: ../IkiWiki/Render.pm:260 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:290 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:370 +#: ../IkiWiki/Render.pm:376 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:416 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:436 -#, perl-format -msgid "rendering %s, which links to %s" +#: ../IkiWiki/Render.pm:442 +#, fuzzy, perl-format +msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:457 -#, perl-format -msgid "rendering %s, which depends on %s" +#: ../IkiWiki/Render.pm:463 +#, fuzzy, perl-format +msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:496 -#, perl-format -msgid "rendering %s, to update its backlinks" +#: ../IkiWiki/Render.pm:502 +#, fuzzy, perl-format +msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:508 -#, perl-format -msgid "removing %s, no longer rendered by %s" +#: ../IkiWiki/Render.pm:514 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:532 -#, perl-format -msgid "ikiwiki: cannot render %s" +#: ../IkiWiki/Render.pm:538 +#, fuzzy, perl-format +msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" #. translators: The first parameter is a filename, and the second @@ -1185,13 +1205,16 @@ msgid "What revision control system to use?" msgstr "" #: ../auto.setup:20 -msgid "What wiki user (or openid) will be admin?" +msgid "Which user (wiki account or openid) will be admin?" msgstr "" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "rendering %s" +#~ msgstr "đang vẽ %s" + #, fuzzy #~ msgid "Must specify %s when using the google search plugin" #~ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" -- cgit v1.2.3 From fc5c5df60ec6d30c1a284f4194f5ea8e2f5fa2c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 11 Aug 2009 16:24:28 -0400 Subject: releasing version 3.141592 --- debian/changelog | 2 +- doc/news/version_3.15.mdwn | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 doc/news/version_3.15.mdwn (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d02ce888e..2cbf1403e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.15) unstable; urgency=low +ikiwiki (3.141592) unstable; urgency=low * Add new hooks: canremove, canrename, rename. (intrigeri) * rename: Refactor subpage rename handling code into rename hook. (intrigeri) diff --git a/doc/news/version_3.15.mdwn b/doc/news/version_3.15.mdwn deleted file mode 100644 index 30a66ea23..000000000 --- a/doc/news/version_3.15.mdwn +++ /dev/null @@ -1,19 +0,0 @@ -ikiwiki 3.15 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Add new hooks: canremove, canrename, rename. (intrigeri) - * rename: Refactor subpage rename handling code into rename hook. (intrigeri) - * po: New plugin, suporting translation of wiki pages using po files. - (intrigeri) - * Add build machinery to build po files to translate the underlay wikis, - * Add further build machinery to generate translated underlays from - the po file, for use by wikis whose primary language is not English. - * Add Danish basewiki translation by Jonas Smedegaard. - * img: Fix adding of dependency from page to the image. - * pagestats: add `among` parameter, which only counts links from specified - pages (smcv) - * pagestats: when making a tag cloud, don't emit links where the tag is - unused (smcv) - * map: Avoid emitting an unclosed ul element if the map is empty. (harishcm) - * inline: Add pagenames parameter that can be used to list a set of - pages to inline, in a specific order, without using a PageSpec. (smcv) - * Add getsource plugin (Will, smcv)"""]] \ No newline at end of file -- cgit v1.2.3 From b4d7dfcbe1e7ea62f1c25e0534feee58720397ac Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Aug 2009 12:26:07 -0400 Subject: po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205 --- IkiWiki/Plugin/po.pm | 7 ++++++- debian/changelog | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index e9dc9dd8c..52677076e 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -10,7 +10,12 @@ use warnings; use strict; use IkiWiki 3.00; use Encode; -use Locale::Po4a::Common qw(nowrapi18n !/.*/); +eval q{use Locale::Po4a::Common qw(nowrapi18n !/.*/)}; +if ($@) { + print STDERR gettext("warning: Old po4a detected! Recommend upgrade to 0.35.")."\n"; + eval q{use Locale::Po4a::Common qw(!/.*/)}; + die $@ if $@; +} use Locale::Po4a::Chooser; use Locale::Po4a::Po; use File::Basename; diff --git a/debian/changelog b/debian/changelog index 2cbf1403e..95e3905a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.141593) UNRELEASED; urgency=low + + * po: Detect if nowrapi18n can't be passed to po4a, and warn about + the old version, but continue. Closes: #541205 + + -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 + ikiwiki (3.141592) unstable; urgency=low * Add new hooks: canremove, canrename, rename. (intrigeri) -- cgit v1.2.3 From 04014e47755312bb500b28fc10153dd38eeb7131 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Aug 2009 12:33:02 -0400 Subject: inline: Avoid use of my $_ as it fails with older perls. Closes: #541215 --- IkiWiki/Plugin/inline.pm | 6 ++---- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index e7d6f250e..04ad6ed23 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -186,7 +186,6 @@ sub preprocess_inline (@) { my @list; if (exists $params{pagenames}) { - foreach my $p (qw(sort pages)) { if (exists $params{$p}) { error sprintf(gettext("the %s and %s parameters cannot be used together"), @@ -194,9 +193,8 @@ sub preprocess_inline (@) { } } - @list = split ' ', $params{pagenames}; - my $_; - @list = map { bestlink($params{page}, $_) } @list; + @list = map { bestlink($params{page}, $_) } + split ' ', $params{pagenames}; $params{pages} = join(" or ", @list); } diff --git a/debian/changelog b/debian/changelog index 95e3905a3..ed7854e8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205 + * inline: Avoid use of my $_ as it fails with older perls. + Closes: #541215 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From 6f4e9f38b866559af9e644a95093b3ed08019c8c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Aug 2009 16:15:59 -0400 Subject: version po4a build-dep to 0.34 0.35 is much better, but 0.34 is the minimum version that will work --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index db86aa909..96ba221ff 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, - libhtml-parser-perl, liburi-perl, perlmagick, po4a + libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34) Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.1 -- cgit v1.2.3 From 830c9e59b2c4d5c90e4316d8e81558e1aeb132f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2009 21:41:33 -0400 Subject: Add discussionpage configuration setting By adding this setting, we get both more configurability, and a minor optimisation too, since gettext does not need to be called continually to get the Discussion value. --- IkiWiki.pm | 7 +++++++ IkiWiki/Plugin/brokenlinks.pm | 3 +-- IkiWiki/Plugin/editpage.pm | 5 +++-- IkiWiki/Plugin/inline.pm | 9 +++------ IkiWiki/Plugin/opendiscussion.pm | 3 +-- IkiWiki/Plugin/orphans.pm | 3 +-- IkiWiki/Render.pm | 9 ++++----- debian/changelog | 2 ++ 8 files changed, 22 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index a11b330f2..b47da966e 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -220,6 +220,13 @@ sub getsetup () { safe => 1, rebuild => 1, }, + discussionpage => { + type => "string", + default => gettext("Discussion"), + description => "name of Discussion pages", + safe => 1, + rebuild => 1, + }, sslcookie => { type => "boolean", default => 0, diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm index f8d44892b..5ad4c917c 100644 --- a/IkiWiki/Plugin/brokenlinks.pm +++ b/IkiWiki/Plugin/brokenlinks.pm @@ -28,14 +28,13 @@ sub preprocess (@) { add_depends($params{page}, $params{pages}); my %broken; - my $discussion=gettext("Discussion"); foreach my $page (pagespec_match_list([keys %links], $params{pages}, location => $params{page})) { my %seen; foreach my $link (@{$links{$page}}) { next if $seen{$link}; $seen{$link}=1; - next if $link =~ /.*\/\Q$discussion\E/i && $config{discussion}; + next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion}; my $bestlink=bestlink($page, $link); next if length $bestlink; push @{$broken{$link}}, $page; diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index 467cd9ed5..fca970c60 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -229,8 +229,9 @@ sub cgi_editpage ($$) { my $dir=$from."/"; $dir=~s![^/]+/+$!!; - if ((defined $form->field('subpage') && length $form->field('subpage')) || - $page eq lc(gettext('Discussion'))) { + if ((defined $form->field('subpage') && + length $form->field('subpage')) || + $page eq lc($config{discussionpage})) { $best_loc="$from/$page"; } else { diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 2fbb45e02..704fa711d 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -348,9 +348,6 @@ sub preprocess_inline (@) { } my $template=HTML::Template->new(@params) unless $raw; - my $discussionlink=lc(gettext("Discussion")) - if $config{discussion}; - foreach my $page (@list) { my $file = $pagesources{$page}; my $type = pagetype($file); @@ -374,14 +371,14 @@ sub preprocess_inline (@) { my $file = $pagesources{$page}; my $type = pagetype($file); if ($config{discussion}) { - if ($page !~ /.*\/\Q$discussionlink\E$/ && + if ($page !~ /.*\/\Q$config{discussionpage}\E$/ && (length $config{cgiurl} || - exists $links{$page."/".$discussionlink})) { + exists $links{$page."/".$config{discussionpage}})) { $template->param(have_actions => 1); $template->param(discussionlink => htmllink($page, $params{destpage}, - gettext("Discussion"), + $config{discussionpage}, noimageinline => 1, forcesubpage => 1)); } diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 60b193eca..1bec4b013 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -23,8 +23,7 @@ sub canedit ($$) { my $cgi=shift; my $session=shift; - my $discussion=lc(gettext("Discussion")); - return "" if $page=~/(\/|^)\Q$discussion\E$/; + return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/; return undef; } diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 7c938ef74..02f5d2524 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -34,7 +34,6 @@ sub preprocess (@) { } my @orphans; - my $discussion=lc(gettext("Discussion")); foreach my $page (pagespec_match_list( [ grep { ! $linkedto{$_} && $_ ne 'index' } keys %pagesources ], @@ -43,7 +42,7 @@ sub preprocess (@) { # indirectly linked to a page via that page's backlinks. next if grep { length $_ && - ($_ !~ /\/\Q$discussion\E$/i || ! $config{discussion}) && + ($_ !~ /\/\Q$config{discussionpage}\E$/i || ! $config{discussion}) && bestlink($page, $_) !~ /^(\Q$page\E|)$/ } @{$links{$page}}; push @orphans, $page; diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index fc8f287ce..d5e81f1b9 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -83,11 +83,10 @@ sub genpage ($$) { $actions++; } if ($config{discussion}) { - my $discussionlink=lc(gettext("Discussion")); - if ($page !~ /.*\/\Q$discussionlink\E$/ && + if ($page !~ /.*\/\Q$config{discussionpage}\E$/ && (length $config{cgiurl} || - exists $links{$page."/".$discussionlink})) { - $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1)); + exists $links{$page."/".$config{discussionpage}})) { + $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1)); $actions++; } } @@ -153,7 +152,7 @@ sub scan ($) { if ($config{discussion}) { # Discussion links are a special case since they're # not in the text of the page, but on its template. - $links{$page}=[ $page."/".lc(gettext("Discussion")) ]; + $links{$page}=[ $page."/".lc($config{discussionpage}) ]; } else { $links{$page}=[]; diff --git a/debian/changelog b/debian/changelog index ed7854e8a..5e5149927 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low the old version, but continue. Closes: #541205 * inline: Avoid use of my $_ as it fails with older perls. Closes: #541215 + * Add discussionpage configuration setting. + * Small optimisations. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From 82bb3af579db809b884c7be5f49012469902bf52 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Aug 2009 01:11:53 -0400 Subject: optimise brokenlinks by gathering the data when calculating backlinks During backlink calulation, all links are examined and broken links can be detected for free, so store a list of broken links and have brokenlinks use it. Exposing the %brokenlinks structure is a bit ugly, but the speedup seems worth it: Around 1 second for wikis the size of the doc wiki that use brokenlinks. --- IkiWiki/Plugin/brokenlinks.pm | 30 +++++++++++++----------------- IkiWiki/Render.pm | 23 ++++++++++++++--------- debian/changelog | 3 ++- 3 files changed, 29 insertions(+), 27 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/brokenlinks.pm b/IkiWiki/Plugin/brokenlinks.pm index 5ad4c917c..eb698b0be 100644 --- a/IkiWiki/Plugin/brokenlinks.pm +++ b/IkiWiki/Plugin/brokenlinks.pm @@ -27,31 +27,27 @@ sub preprocess (@) { # register a dependency. add_depends($params{page}, $params{pages}); - my %broken; - foreach my $page (pagespec_match_list([keys %links], - $params{pages}, location => $params{page})) { - my %seen; - foreach my $link (@{$links{$page}}) { - next if $seen{$link}; - $seen{$link}=1; - next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion}; - my $bestlink=bestlink($page, $link); - next if length $bestlink; - push @{$broken{$link}}, $page; + my @broken; + foreach my $link (keys %IkiWiki::brokenlinks) { + next if $link =~ /.*\/\Q$config{discussionpage}\E/i && $config{discussion}; + + my @pages; + foreach my $page (@{$IkiWiki::brokenlinks{$link}}) { + push @pages, $page + if pagespec_match($page, $params{pages}, location => $params{page}); } - } + next unless @pages; - my @broken; - foreach my $link (keys %broken) { - my $page=$broken{$link}->[0]; + my $page=$IkiWiki::brokenlinks{$link}->[0]; push @broken, sprintf(gettext("%s from %s"), htmllink($page, $params{destpage}, $link, noimageinline => 1), join(", ", map { htmllink($params{page}, $params{destpage}, $_, noimageinline => 1) - } @{$broken{$link}})); + } @pages) + ); } - return gettext("There are no broken links!") unless %broken; + return gettext("There are no broken links!") unless @broken; return "
    \n" .join("\n", map { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index d5e81f1b9..578142d2e 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -8,26 +8,31 @@ use IkiWiki; use Encode; my %backlinks; -my $backlinks_calculated=0; +our %brokenlinks; +my $links_calculated=0; -sub calculate_backlinks () { - return if $backlinks_calculated; - %backlinks=(); +sub calculate_links () { + return if $links_calculated; + %backlinks=%brokenlinks=(); foreach my $page (keys %links) { foreach my $link (@{$links{$page}}) { my $bestlink=bestlink($page, $link); - if (length $bestlink && $bestlink ne $page) { - $backlinks{$bestlink}{$page}=1; + if (length $bestlink) { + $backlinks{$bestlink}{$page}=1 + if $bestlink ne $page; + } + else { + push @{$brokenlinks{$link}}, $page; } } } - $backlinks_calculated=1; + $links_calculated=1; } sub backlink_pages ($) { my $page=shift; - calculate_backlinks(); + calculate_links(); return keys %{$backlinks{$page}}; } @@ -416,7 +421,7 @@ sub refresh () { debug(sprintf(gettext("scanning %s"), $file)); scan($file); } - calculate_backlinks(); + calculate_links(); foreach my $file (@needsbuild) { debug(sprintf(gettext("building %s"), $file)); render($file); diff --git a/debian/changelog b/debian/changelog index 5e5149927..147d279bb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * inline: Avoid use of my $_ as it fails with older perls. Closes: #541215 * Add discussionpage configuration setting. - * Small optimisations. + * Several optimisations, including speedups to orphans and brokenlinks + calculation. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From c258160725a79953f28f799b31959b73e4beac77 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 13:59:04 -0400 Subject: review of ready branch --- debian/changelog | 1 + doc/todo/should_optimise_pagespecs.mdwn | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 147d279bb..5bef06aec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Add discussionpage configuration setting. * Several optimisations, including speedups to orphans and brokenlinks calculation. + * meta, img: Fix bugs in dependency code. (smcv) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 3ccef62fe..1919e3584 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -105,4 +105,33 @@ I can think about reducung the size of my wiki source and making it available on >>>>> ikiwiki-transition, but that copy doesn't have to be optimal or support >>>>> future features like [[tracking_bugs_with_dependencies]]). --[[smcv]] +--- + +Some questions on your optimize-depends branch. --[[Joey]] + +In saveindex it still or'd together the depends list, but the `{depends}` +field seems only useful for backwards compatability (ie, ikiwiki-transition +uses it still), and otherwise just bloats the index. + +Is an array the right data structure? `add_depends` has to loop through the +array to avoid dups, it would be better if a hash were used there. Since +inline (and other plugins) explicitly add all linked pages, each as a +separate item, the list can get rather long, and that single add_depends +loop has suddenly become O(N^2) to the number of pages, which is something +to avoid.. + +Also, since a lot of places are calling add_depends in a loop, it probably +makes sense to just make it accept a list of dependencies to add. It'll be +marginally faster, probably, and should allow for better optimisation +when adding a lot of depends at once. + +In Render.pm, we now have a triply nested loop, which is a bit +scary for efficiency. It seems there should be a way to +rework this code so it can use the optimised `pagespec_match_list`, +and/or hoist some of the inner loop calculations (like the `pagename`) +out. + +Very good catch on img/meta using the wrong dependency; verified in the wild! +(I've cherry-picked those bug fixes.) + [[!tag wishlist patch patch/core]] -- cgit v1.2.3 From 04760df3813a1b44043176e95bcd3eae6ba0507c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 14:10:39 -0400 Subject: Allow building ikiwiki on systems w/o po4a -- building of the translated underlays will be skipped in this case. --- debian/changelog | 2 + doc/bugs/po_plugin_adds_new_dependency.mdwn | 3 + po/Makefile | 7 +- po/bg.po | 129 ++++++++++++++------------- po/cs.po | 129 ++++++++++++++------------- po/da.po | 129 ++++++++++++++------------- po/de.po | 129 ++++++++++++++------------- po/es.po | 131 ++++++++++++++-------------- po/fr.po | 129 ++++++++++++++------------- po/gu.po | 129 ++++++++++++++------------- po/ikiwiki.pot | 126 +++++++++++++------------- po/pl.po | 129 ++++++++++++++------------- po/sv.po | 129 ++++++++++++++------------- po/vi.po | 129 ++++++++++++++------------- 14 files changed, 712 insertions(+), 718 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5bef06aec..39ff60717 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Several optimisations, including speedups to orphans and brokenlinks calculation. * meta, img: Fix bugs in dependency code. (smcv) + * Allow building ikiwiki on systems w/o po4a -- + building of the translated underlays will be skipped in this case. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn index 3da326f48..3ddcc30f2 100644 --- a/doc/bugs/po_plugin_adds_new_dependency.mdwn +++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn @@ -1,5 +1,8 @@ Was it intended that the po plugin add a new dependency? +> Yes; see debian/control Build-Depends. However, I have made it disable +> building that is po4a is not available. [[done]] --[[Joey]] + PERL5LIB=.. ./po2wiki underlay.setup Failed to load plugin IkiWiki::Plugin::po: Can't locate Locale/Po4a/Common.pm in @INC (@INC contains: .. /Library/Perl/Updates/5.8.8 /System/Library/Perl/5.8.8/darwin-thread-multi-2level /System/Library/Perl/5.8.8 /Library/Perl/5.8.8/darwin-thread-multi-2level /Library/Perl/5.8.8 /Library/Perl /Network/Library/Perl/5.8.8/darwin-thread-multi-2level /Network/Library/Perl/5.8.8 /Network/Library/Perl /System/Library/Perl/Extras/5.8.8/darwin-thread-multi-2level /System/Library/Perl/Extras/5.8.8 /Library/Perl/5.8.6 /Library/Perl/5.8.1 /sw/lib/perl5/5.8.8/darwin-thread-multi-2level /sw/lib/perl5/5.8.8 /sw/lib/perl5/darwin-thread-multi-2level /sw/lib/perl5 /sw/lib/perl5/darwin /usr/local/lib/perl5/site_perl/5.8.8/darwin-thread-multi-2level /usr/local/lib/perl5/site_perl/5.8.8 /usr/local/lib/perl5/site_perl .) at ../IkiWiki/Plugin/po.pm line 13. BEGIN failed--compilation aborted at ../IkiWiki/Plugin/po.pm line 13. diff --git a/po/Makefile b/po/Makefile index d67c3a4ff..d094733b1 100644 --- a/po/Makefile +++ b/po/Makefile @@ -5,7 +5,10 @@ POTFILES=$(sort $(shell find ../IkiWiki -type f -name \*.pm)) \ POFILES=$(wildcard *.po) MOFILES=$(POFILES:.po=.mo) -all: ikiwiki.pot mo ../underlays/locale +# Translated underlays can only be generated if po4a is available. +TRANSLATED_UNDERLAYS=$(shell if perl -e 'use Locale::Po4a::Common' 2>/dev/null; then echo ../underlays/locale; fi) + +all: ikiwiki.pot mo $(TRANSLATED_UNDERLAYS) mo: $(MOFILES) @@ -83,7 +86,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp ../Makefile: ../Makefile.PL cd .. && ./Makefile.PL -../underlays/locale: po2wiki_stamp +$(TRANSLATED_UNDERLAYS): po2wiki_stamp po2wiki_stamp: po2wiki underlays_copy_stamp PERL5LIB=.. ./po2wiki underlay.setup touch $@ diff --git a/po/bg.po b/po/bg.po index 8ffbf26a4..d29f81723 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Грешка" @@ -188,20 +188,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Дискусия" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" @@ -296,14 +288,14 @@ msgstr "премахване на старата страница „%s”" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "промяна на %s" @@ -371,7 +363,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -447,30 +439,30 @@ msgstr "шаблонът „%s” не е намерен" msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -501,7 +493,7 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" @@ -535,7 +527,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Получаване на OpenID номер" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." @@ -595,103 +587,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "дискусия" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1043,54 +1035,54 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1169,31 +1161,35 @@ msgstr "обновяване на уики..." msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Дискусия" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1218,6 +1214,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "дискусия" + #~ msgid "rendering %s" #~ msgstr "обновяване на страницата „%s”" diff --git a/po/cs.po b/po/cs.po index e377b0cf2..657d2852c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -53,7 +53,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Chyba" @@ -185,20 +185,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskuse" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" @@ -293,14 +285,14 @@ msgstr "odstraňuji starou stránku %s" msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "upravuji %s" @@ -368,7 +360,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -441,30 +433,30 @@ msgstr "zdroj nebyl nalezen" msgid "missing pages parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -491,7 +483,7 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" @@ -525,7 +517,7 @@ msgstr "Přihlásit pomocí" msgid "Get an OpenID" msgstr "Získat OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." @@ -585,103 +577,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "diskuse" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "nelze zapsat %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1029,54 +1021,54 @@ msgstr "" msgid "bad file name %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -1155,29 +1147,33 @@ msgstr "znovu vytvářím wiki..." msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskuse" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "nemohu číst %s: %s" @@ -1202,6 +1198,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "diskuse" + #~ msgid "rendering %s" #~ msgstr "zpracovávám %s" diff --git a/po/da.po b/po/da.po index 9ced576d8..b4e06535b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Fejl" @@ -193,20 +193,12 @@ msgstr "" "Beklager, men det ligner spam til blogspam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s fra %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" @@ -301,14 +293,14 @@ msgstr "fjerner gammelt smugkig %s" msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -372,7 +364,7 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "sideredigering er ikke tilladt" msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -496,7 +488,7 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "henvisningsside ikke fundet" @@ -528,7 +520,7 @@ msgstr "Log på med" msgid "Get an OpenID" msgstr "Skaf en OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 msgid "All pages have other pages linking to them." msgstr "Alle sider har henvisninger fra andre sider." @@ -587,12 +579,16 @@ msgstr "ignorerer ping-direktiv for wiki %s (denne wiki er %s)" msgid "LWP not found, not pinging" msgstr "LWP ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -600,7 +596,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -608,25 +604,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "diskussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -634,7 +626,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -642,55 +634,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, perl-format msgid "failed to read %s" msgstr "læsning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -1034,7 +1026,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1043,47 +1035,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1162,30 +1154,34 @@ msgstr "genopbygger wiki..." msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1209,3 +1205,6 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" + +#~ msgid "discussion" +#~ msgstr "diskussion" diff --git a/po/de.po b/po/de.po index 83a70bd9c..51c1b0fca 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Fehler" @@ -190,20 +190,12 @@ msgstr "" "Entschuldigung, aber blogspam stuft das " "als Spam ein: " -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s von %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" @@ -299,14 +291,14 @@ msgstr "entferne alte Vorschau %s" msgid "%s is not an editable page" msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "bearbeite %s" @@ -370,7 +362,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "bearbeiten der Seiten nicht erlaubt" msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -497,7 +489,7 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" @@ -529,7 +521,7 @@ msgstr "Anmelden mit" msgid "Get an OpenID" msgstr "Eine OpenID anfordern" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." @@ -590,12 +582,16 @@ msgstr "Ignoriere die ping Anweisung für das Wiki %s (dieses Wiki ist %s)" msgid "LWP not found, not pinging" msgstr "LWP nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -603,7 +599,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -611,25 +607,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -637,7 +629,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -645,55 +637,55 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, perl-format msgid "failed to read %s" msgstr "lesen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -1043,7 +1035,7 @@ msgstr "" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1052,47 +1044,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1174,32 +1166,36 @@ msgstr "erzeuge Wiki neu.." msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1223,3 +1219,6 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" + +#~ msgid "discussion" +#~ msgstr "Diskussion" diff --git a/po/es.po b/po/es.po index 65ad72140..77f1cea6e 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Error" @@ -195,20 +195,12 @@ msgstr "" "Lo siento, pero el analizador blogspam " "dice que el texto puede ser spam." -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Comentarios" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s desde la página %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" @@ -303,14 +295,14 @@ msgstr "eliminando la antigua previsualización %s" msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "modificando página %s" @@ -374,7 +366,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -449,32 +441,32 @@ msgstr "no está permitida la modificación de páginas" msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -503,7 +495,7 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "falta la página a donde redirigir" @@ -535,7 +527,7 @@ msgstr "Identificarse mediante " msgid "Get an OpenID" msgstr "Consiga un identificador OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Todas las páginas están referenciadas entre sí." @@ -598,104 +590,103 @@ msgstr "Ignorando directiva 'ping' para el wiki %s (este wiki es %s)" msgid "LWP not found, not pinging" msgstr "No he encontrado el componente LWP, no envío señal alguna" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -#, fuzzy -msgid "discussion" -msgstr "Comentarios" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1044,7 +1035,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1053,49 +1044,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1176,33 +1167,37 @@ msgstr "reconstruyendo el wiki.." msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Comentarios" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1230,6 +1225,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#, fuzzy +#~ msgid "discussion" +#~ msgstr "Comentarios" + #~ msgid "rendering %s" #~ msgstr "convirtiendo %s" diff --git a/po/fr.po b/po/fr.po index a27420254..c151bcf68 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2009-06-29 16:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Erreur" @@ -191,20 +191,12 @@ msgstr "" "Désolé, mais ceci ressemble à un spam à destination de blogspam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Discussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "%s sur %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Aucun lien cassé !" @@ -299,14 +291,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s" msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "Édition de %s" @@ -370,7 +362,7 @@ msgstr "Vous ne pouvez modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "Modification de page interdite" msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -495,7 +487,7 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "Page de redirection introuvable" @@ -527,7 +519,7 @@ msgstr "S'identifier en tant que" msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -590,103 +582,103 @@ msgstr "Les instructions du wiki %s sont ignorées (ce wiki est %s)" msgid "LWP not found, not pinging" msgstr "LWP est introuvable. Pas de réponse au ping" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "Discussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "va envoyer un ping à %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1035,7 +1027,7 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1044,47 +1036,47 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1168,30 +1160,34 @@ msgstr "Reconstruction du wiki..." msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Discussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1217,6 +1213,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "discussion" +#~ msgstr "Discussion" + #~ msgid "rendering %s" #~ msgstr "Reconstruction de %s" diff --git a/po/gu.po b/po/gu.po index ce76f8612..d7e6eaa6a 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "ક્ષતિ" @@ -186,20 +186,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "ચર્ચા" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" @@ -294,14 +286,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s" msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" @@ -369,7 +361,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -442,30 +434,30 @@ msgstr "ફીડ મળ્યું નહી" msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -491,7 +483,7 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" @@ -525,7 +517,7 @@ msgstr "" msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." @@ -585,103 +577,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "ચર્ચા" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1029,54 +1021,54 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1155,29 +1147,33 @@ msgstr "વીકી ફરીથી બનાવે છે.." msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "ચર્ચા" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1202,6 +1198,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "ચર્ચા" + #~ msgid "rendering %s" #~ msgstr "રેન્ડર કરે છે %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 8ba10ecbb..a9c0fbb99 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "" @@ -183,20 +183,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "" @@ -291,14 +283,14 @@ msgstr "" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "" @@ -361,7 +353,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -431,30 +423,30 @@ msgstr "" msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -480,7 +472,7 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 msgid "redir page not found" msgstr "" @@ -512,7 +504,7 @@ msgstr "" msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 msgid "All pages have other pages linking to them." msgstr "" @@ -570,102 +562,102 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, perl-format msgid "failed to read %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1004,54 +996,54 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1130,29 +1122,33 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/pl.po b/po/pl.po index 3e8d08523..6ecda8d88 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Błąd" @@ -190,20 +190,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Dyskusja" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" @@ -298,14 +290,14 @@ msgstr "usuwanie starej strony %s" msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "edycja %s" @@ -373,7 +365,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -449,30 +441,30 @@ msgstr "nieznaleziony kanał RSS" msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -504,7 +496,7 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" @@ -538,7 +530,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Pobierz OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" @@ -598,103 +590,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "dyskusja" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1051,54 +1043,54 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1177,31 +1169,35 @@ msgstr "przebudowywanie wiki..." msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Dyskusja" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1226,6 +1222,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "dyskusja" + #~ msgid "rendering %s" #~ msgstr "renderowanie %s" diff --git a/po/sv.po b/po/sv.po index ff8d3aa0d..075de56d0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Fel" @@ -187,20 +187,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Diskussion" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" @@ -295,14 +287,14 @@ msgstr "tar bort gammal sida %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "redigerar %s" @@ -370,7 +362,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -444,30 +436,30 @@ msgstr "mallen %s hittades inte" msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -497,7 +489,7 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" @@ -531,7 +523,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Skaffa ett OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." @@ -591,103 +583,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "diskussion" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1038,54 +1030,54 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1164,29 +1156,33 @@ msgstr "bygger om wiki.." msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Diskussion" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Måste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1211,6 +1207,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "diskussion" + #~ msgid "rendering %s" #~ msgstr "ritar upp %s" diff --git a/po/vi.po b/po/vi.po index 7cf911b16..b500ed581 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-11 15:00-0400\n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 msgid "Error" msgstr "Lỗi" @@ -188,20 +188,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:376 ../IkiWiki/Plugin/inline.pm:384 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Plugin/po.pm:289 ../IkiWiki/Plugin/po.pm:292 -#: ../IkiWiki/Render.pm:86 ../IkiWiki/Render.pm:90 ../IkiWiki/Render.pm:156 -msgid "Discussion" -msgstr "Thảo luận" - -#: ../IkiWiki/Plugin/brokenlinks.pm:48 +#: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:55 +#: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." @@ -296,14 +288,14 @@ msgstr "đang gỡ bỏ trang cũ %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:291 +#: ../IkiWiki/Plugin/editpage.pm:292 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:309 ../IkiWiki/Plugin/editpage.pm:328 -#: ../IkiWiki/Plugin/editpage.pm:338 ../IkiWiki/Plugin/editpage.pm:382 -#: ../IkiWiki/Plugin/editpage.pm:421 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" msgstr "đang sửa %s" @@ -371,7 +363,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:124 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -447,30 +439,30 @@ msgstr "không tìm thấy mẫu %s" msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:192 +#: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:214 +#: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:225 +#: ../IkiWiki/Plugin/inline.pm:223 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:327 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:347 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:615 +#: ../IkiWiki/Plugin/inline.pm:612 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -498,7 +490,7 @@ msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » ( msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:197 +#: ../IkiWiki/Plugin/meta.pm:196 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" @@ -532,7 +524,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Lấy OpenID" -#: ../IkiWiki/Plugin/orphans.pm:52 +#: ../IkiWiki/Plugin/orphans.pm:45 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." @@ -592,103 +584,103 @@ msgstr "" msgid "LWP not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" -#: ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:136 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:143 +#: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:282 -msgid "discussion" -msgstr "thảo luận" - -#: ../IkiWiki/Plugin/po.pm:379 +#: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:420 +#: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:444 +#: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:464 +#: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:825 +#: ../IkiWiki/Plugin/po.pm:829 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:839 +#: ../IkiWiki/Plugin/po.pm:843 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:848 +#: ../IkiWiki/Plugin/po.pm:852 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:854 +#: ../IkiWiki/Plugin/po.pm:858 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:903 +#: ../IkiWiki/Plugin/po.pm:907 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1042 ../IkiWiki/Plugin/po.pm:1056 -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1054 +#: ../IkiWiki/Plugin/po.pm:1058 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1059 +#: ../IkiWiki/Plugin/po.pm:1063 #, fuzzy, perl-format msgid "failed to read %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1039,54 +1031,54 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:260 +#: ../IkiWiki/Render.pm:264 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:283 ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:290 +#: ../IkiWiki/Render.pm:294 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:376 +#: ../IkiWiki/Render.pm:380 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:416 +#: ../IkiWiki/Render.pm:421 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:442 +#: ../IkiWiki/Render.pm:447 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:463 +#: ../IkiWiki/Render.pm:468 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:502 +#: ../IkiWiki/Render.pm:507 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:519 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:538 +#: ../IkiWiki/Render.pm:543 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1165,29 +1157,33 @@ msgstr "đang xây dựng lại wiki.." msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:487 +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Thảo luận" + +#: ../IkiWiki.pm:494 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:533 +#: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:562 +#: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1236 +#: ../IkiWiki.pm:1243 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1776 +#: ../IkiWiki.pm:1783 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1908 +#: ../IkiWiki.pm:1915 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1212,6 +1208,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#~ msgid "discussion" +#~ msgstr "thảo luận" + #~ msgid "rendering %s" #~ msgstr "đang vẽ %s" -- cgit v1.2.3 From 54c2e05ccf8fad1e77d4ee717c48f3622f60b4e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 16:33:54 -0400 Subject: Add basic styling of po plugin's languages list. --- debian/changelog | 1 + doc/style.css | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 39ff60717..88fac32ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * meta, img: Fix bugs in dependency code. (smcv) * Allow building ikiwiki on systems w/o po4a -- building of the translated underlays will be skipped in this case. + * Add basic styling of po plugin's languages list. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/style.css b/doc/style.css index e6512aed8..4fa48b140 100644 --- a/doc/style.css +++ b/doc/style.css @@ -32,6 +32,15 @@ border-bottom: 0; } +#otherlanguages ul { + margin: 0; + padding: 6px; + list-style-type: none; +} +.pageheader #otherlanguages { + border-bottom: 1px solid #000; +} + div.inlinecontent { margin-top: .4em; } -- cgit v1.2.3 From 5d8bfe9f3704d4cc81ee3ac312a703bb48d6f976 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 13:49:56 -0400 Subject: changelog --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88fac32ee..4fcd13d5b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Allow building ikiwiki on systems w/o po4a -- building of the translated underlays will be skipped in this case. * Add basic styling of po plugin's languages list. + * inline: Display an error if feedpages is specified and fails to match + due to a problem such as created_before being told to check against + a page that does not exist. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From e03d5c6a7c3f64a591ff6d639c8e4b92c11e1cec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 14:32:10 -0400 Subject: Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective pages from the basewiki. --- debian/changelog | 2 ++ underlays/basewiki/ikiwiki/blog.mdwn | 8 -------- underlays/basewiki/ikiwiki/preprocessordirective.mdwn | 7 ------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 underlays/basewiki/ikiwiki/blog.mdwn delete mode 100644 underlays/basewiki/ikiwiki/preprocessordirective.mdwn (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4fcd13d5b..b07fe94a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * inline: Display an error if feedpages is specified and fails to match due to a problem such as created_before being told to check against a page that does not exist. + * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective + pages from the basewiki. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/underlays/basewiki/ikiwiki/blog.mdwn b/underlays/basewiki/ikiwiki/blog.mdwn deleted file mode 100644 index 0a5a5247d..000000000 --- a/underlays/basewiki/ikiwiki/blog.mdwn +++ /dev/null @@ -1,8 +0,0 @@ -[[!meta robots="noindex, follow"]] - -This page has been removed from ikiwiki's basewiki. For documentation about -creating a blog with ikiwiki, see the documentation of the -[[!iki ikiwiki/directive/inline desc=inline]] directive. - -Please update your links, as this redirection page will be removed in a -future ikiwiki release. diff --git a/underlays/basewiki/ikiwiki/preprocessordirective.mdwn b/underlays/basewiki/ikiwiki/preprocessordirective.mdwn deleted file mode 100644 index bd12895cc..000000000 --- a/underlays/basewiki/ikiwiki/preprocessordirective.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -[[!meta redir=ikiwiki/directive delay=10]] -[[!meta robots="noindex, follow"]] - -This page has moved to -[[ikiwiki/directive|ikiwiki/directive]]. Please -update your links, as this redirection page will be removed in a future -ikiwiki release. -- cgit v1.2.3 From 65bf1dab5f8ce4b1d1170113e5dbb1ff50c04502 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Aug 2009 12:26:51 -0400 Subject: Updated French program translation from Philippe Batailler. Closes: #542036 --- debian/changelog | 2 + po/fr.po | 115 +++++++++++++++++++++++++++---------------------------- 2 files changed, 58 insertions(+), 59 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b07fe94a9..ddf69f284 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low a page that does not exist. * Remove deprecated ikiwiki/blog and ikiwiki/preprocessordirective pages from the basewiki. + * Updated French program translation from Philippe Batailler. + Closes: #542036 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/po/fr.po b/po/fr.po index c151bcf68..08ca06d0b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-08-15 14:07-0400\n" -"PO-Revision-Date: 2009-06-29 16:42+0200\n" +"PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -148,17 +148,14 @@ msgid "Must specify %s" msgstr "Vous devez spécifier %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -#, fuzzy msgid "Failed to create S3 bucket: " msgstr "Impossible de créer un compartiment S3 :" #: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy msgid "Failed to save file to S3: " msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" #: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy msgid "Failed to delete file from S3: " msgstr "Échec lors de la suppression du fichier sur S3 :" @@ -187,9 +184,7 @@ msgstr "Génération de l'index automatique" msgid "" "Sorry, but that looks like spam to blogspam: " -msgstr "" -"Désolé, mais ceci ressemble à un spam à destination de blogspam: " +msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -338,14 +333,13 @@ msgid "The page %s does not exist." msgstr "La page %s n'existe pas." #: ../IkiWiki/Plugin/getsource.pm:73 -#, fuzzy msgid "not a page" -msgstr "Impossible de trouver les pages %s" +msgstr "Ce n'est pas une page." #: ../IkiWiki/Plugin/getsource.pm:75 -#, fuzzy, perl-format +#, perl-format msgid "%s is an attachment, not a page." -msgstr "%s n'est pas une page éditable" +msgstr "%s est une pièce jointe, pas une page." #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 @@ -356,7 +350,7 @@ msgstr "Vous n'êtes pas autorisé à modifier %s" #: ../IkiWiki/Plugin/git.pm:666 #, perl-format msgid "you cannot act on a file with mode %s" -msgstr "Vous ne pouvez modifier un fichier dont le mode est %s" +msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" #: ../IkiWiki/Plugin/git.pm:670 msgid "you are not allowed to change file modes" @@ -364,13 +358,13 @@ msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" #: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 -#, fuzzy, perl-format +#, perl-format msgid "Must specify %s when using the %s plugin" -msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « search »." +msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "Impossible d'analyser l'url, pas de nom de domaine" +msgstr "Impossible d'analyser l'URL, pas de nom de domaine" #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" @@ -404,7 +398,7 @@ msgstr "Image::Magick n'est pas installé" #: ../IkiWiki/Plugin/img.pm:72 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" -msgstr "" +msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" #: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 #: ../IkiWiki/Plugin/img.pm:104 @@ -439,7 +433,7 @@ msgstr "Paramètre « pages » manquant" #: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" -msgstr "" +msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." #: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" @@ -520,7 +514,6 @@ msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" #: ../IkiWiki/Plugin/orphans.pm:45 -#, fuzzy msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -538,9 +531,7 @@ msgstr "Erreur lors de la création du compte." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "" -"Pas d'adresse spécifiée. Impossible d'envoyer les instructions pour " -"réinitialiser le mot de passe." +msgstr "Aucune adresse indiquée. Impossible d'envoyer les instructions pour réinitialiser le mot de passe." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -566,7 +557,7 @@ msgstr "Ping reçu" #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "les paramètres 'from' et 'to' sont nécessaires" +msgstr "les paramètres « from » et « to » sont nécessaires." #: ../IkiWiki/Plugin/pinger.pm:58 #, perl-format @@ -585,102 +576,115 @@ msgstr "LWP est introuvable. Pas de réponse au ping" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" +"Note : ancienne version de po4a détectée. Il est recommandé d'installer la " +"version 0.35." #: ../IkiWiki/Plugin/po.pm:136 -#, fuzzy, perl-format +#, perl-format msgid "%s is not a valid language code" -msgstr "%s n'est pas un fichier" +msgstr "%s n'est pas un code de langue valable" #: ../IkiWiki/Plugin/po.pm:148 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" +"%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " +"défaut." #: ../IkiWiki/Plugin/po.pm:153 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" +"po_link_to=negotiated nécessite que usedirs soit activé, retour à " +"po_link_to=default." #: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" +"Reconstruction de toutes les pages pour corriger les titres (greffon " +"« meta »)." #: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 -#, fuzzy, perl-format +#, perl-format msgid "building %s" -msgstr "va envoyer un ping à %s" +msgstr "construction de %s" #: ../IkiWiki/Plugin/po.pm:424 msgid "updated PO files" -msgstr "" +msgstr "Fichiers PO mis à jour." #: ../IkiWiki/Plugin/po.pm:448 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" +"Impossible de supprimer cette traduction. Si la page maître est supprimée, " +"alors ses traductions seront supprimées." #: ../IkiWiki/Plugin/po.pm:468 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" +"Impossible de renommer cette traduction. Si la page maître est renommée, " +"alors ses traductions pourront être renommées." #: ../IkiWiki/Plugin/po.pm:829 -#, fuzzy, perl-format +#, perl-format msgid "POT file (%s) does not exist" -msgstr "La page %s n'existe pas." +msgstr "Le fichier POT %s n'existe pas." #: ../IkiWiki/Plugin/po.pm:843 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy underlay PO file to %s" -msgstr "Échec de la compilation de %s" +msgstr "Impossible de copier le fichier PO underlay dans %s" #: ../IkiWiki/Plugin/po.pm:852 -#, fuzzy, perl-format +#, perl-format msgid "failed to update %s" -msgstr "Échec de la compilation de %s" +msgstr "Impossible de mettre à jour %s" #: ../IkiWiki/Plugin/po.pm:858 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy the POT file to %s" -msgstr "Échec de la compilation de %s" +msgstr "Impossible de copier le fichier POT dans %s" #: ../IkiWiki/Plugin/po.pm:894 msgid "N/A" -msgstr "" +msgstr "N/A" #: ../IkiWiki/Plugin/po.pm:907 -#, fuzzy, perl-format +#, perl-format msgid "failed to translate %s" -msgstr "Échec du redimensionnement : %s" +msgstr "Impossible de traduire %s" #: ../IkiWiki/Plugin/po.pm:983 msgid "removed obsolete PO files" -msgstr "" +msgstr "Fichiers PO obsolètes supprimés." #: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 #: ../IkiWiki/Plugin/po.pm:1100 -#, fuzzy, perl-format +#, perl-format msgid "failed to write %s" -msgstr "Échec du redimensionnement : %s" +msgstr "Impossible de modifier %s" #: ../IkiWiki/Plugin/po.pm:1058 -#, fuzzy msgid "failed to translate" -msgstr "Échec du lancement de dot" +msgstr "Impossible de traduire" #: ../IkiWiki/Plugin/po.pm:1063 -#, fuzzy, perl-format +#, perl-format msgid "failed to read %s" -msgstr "Échec de la lecture de %s : %s" +msgstr "Impossible de lire %s" #: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +"Données gettext incorrectes, retour à la page précédente pour la poursuite " +"des modifications." #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -898,12 +902,10 @@ msgid "parse error" msgstr "Erreur d'analyse" #: ../IkiWiki/Plugin/sparkline.pm:78 -#, fuzzy msgid "invalid featurepoint diameter" msgstr "Diamètre du point incorrect" #: ../IkiWiki/Plugin/sparkline.pm:88 -#, fuzzy msgid "invalid featurepoint location" msgstr "Emplacement du point incorrect" @@ -912,7 +914,6 @@ msgid "missing values" msgstr "Il manque des valeurs" #: ../IkiWiki/Plugin/sparkline.pm:104 -#, fuzzy msgid "invalid height value" msgstr "Hauteur incorrecte" @@ -921,7 +922,6 @@ msgid "missing width parameter" msgstr "Le paramètre largeur manque" #: ../IkiWiki/Plugin/sparkline.pm:115 -#, fuzzy msgid "invalid width value" msgstr "Largeur incorrecte" @@ -1057,27 +1057,27 @@ msgid "scanning %s" msgstr "Examen de %s" #: ../IkiWiki/Render.pm:447 -#, fuzzy, perl-format +#, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" #: ../IkiWiki/Render.pm:468 -#, fuzzy, perl-format +#, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" #: ../IkiWiki/Render.pm:507 -#, fuzzy, perl-format +#, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" #: ../IkiWiki/Render.pm:519 -#, fuzzy, perl-format +#, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" #: ../IkiWiki/Render.pm:543 -#, fuzzy, perl-format +#, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1106,9 +1106,7 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "" -"** désactivation du greffon %s, car échec de l'installation, avec le message " -"suivant :" +msgstr "** Désactivation du greffon %s, l'installation a échoué avec le message suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1181,7 +1179,7 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s #: ../IkiWiki.pm:1243 #, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i" +msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" #: ../IkiWiki.pm:1783 msgid "yes" @@ -1205,7 +1203,6 @@ msgid "What revision control system to use?" msgstr "Système de contrôle de version utilisé :" #: ../auto.setup:20 -#, fuzzy msgid "Which user (wiki account or openid) will be admin?" msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" -- cgit v1.2.3 From 9b799ccc851afc70b5b068e088f095e14005bda8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Aug 2009 14:05:59 -0400 Subject: po: Fixed to run rcs_add ralative to srcdir. --- IkiWiki/Plugin/po.pm | 2 +- debian/changelog | 1 + doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index aa3d72b90..414906999 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -414,7 +414,7 @@ sub change (@) { } if (@pofiles) { refreshpofiles($masterfile, @pofiles); - map { IkiWiki::rcs_add($_) } @pofiles if $config{rcs}; + map { s/^\Q$config{srcdir}\E\/*//; IkiWiki::rcs_add($_) } @pofiles if $config{rcs}; $updated_po_files=1; } } diff --git a/debian/changelog b/debian/changelog index ddf69f284..4bb450a55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low pages from the basewiki. * Updated French program translation from Philippe Batailler. Closes: #542036 + * po: Fixed to run rcs_add ralative to srcdir. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn index f87457080..6fadff07e 100644 --- a/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn +++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn @@ -5,3 +5,10 @@ I have set absolute path for srcdir = '/path/to/repo/doc/'. The root of my git r I have no problem when I use an relative path like srcdir = '.'. I have an other issue with the po plugin when I set the srcdir to './doc/' (provided that my config file is in /path/to/repo). In this case the po plugin try to add 'doc/doc/index.fr.po' which does not exists (seems like the srcdir path is prepended twice). + +> You should never use a relative srcdir path with ikiwiki. +> +> I wonder what version of git you have there, since it works ok with the +> version I have here. But, the po plugin is definitly doing the wrong +> thing; it's telling git to add the po file with the full scrdir path +> rather than relative to its root. Fixed that. [[done]] --[[Joey]] -- cgit v1.2.3 From df9d39698f93d803acdf37d1c94f74f58719634e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 20 Aug 2009 12:29:19 -0400 Subject: Italian program translation from Luca Bruno. --- debian/changelog | 1 + po/it.po | 1176 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1177 insertions(+) create mode 100644 po/it.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4bb450a55..5b021ec24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Updated French program translation from Philippe Batailler. Closes: #542036 * po: Fixed to run rcs_add ralative to srcdir. + * Italian program translation from Luca Bruno. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/po/it.po b/po/it.po new file mode 100644 index 000000000..53fb3e3f4 --- /dev/null +++ b/po/it.po @@ -0,0 +1,1176 @@ +# Italian translation of ikiwiki. +# This file is distributed under the same license as the ikiwiki package. +# Luca Bruno , 2009. +msgid "" +msgstr "" +"Project-Id-Version: Ikiwiki\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"PO-Revision-Date: 2009-08-16 11:01+0100\n" +"Last-Translator: Luca Bruno \n" +"Language-Team: Italian TP \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../IkiWiki/CGI.pm:113 +msgid "You need to log in first." +msgstr "Occorre prima effettuare l'accesso." + +#: ../IkiWiki/CGI.pm:146 +msgid "probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https" +msgstr "possibile errore di configurazione: sslcookie è impostato, ma si sta tentando un accesso via http, non https" + +#: ../IkiWiki/CGI.pm:149 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" + +#: ../IkiWiki/CGI.pm:168 +#: ../IkiWiki/CGI.pm:299 +msgid "Your login session has expired." +msgstr "La sessione è scaduta." + +#: ../IkiWiki/CGI.pm:189 +msgid "Login" +msgstr "Entra" + +#: ../IkiWiki/CGI.pm:190 +msgid "Preferences" +msgstr "Preferenze" + +#: ../IkiWiki/CGI.pm:191 +msgid "Admin" +msgstr "Amministrazione" + +#: ../IkiWiki/CGI.pm:231 +msgid "Preferences saved." +msgstr "Preferenze salvate." + +#: ../IkiWiki/CGI.pm:262 +msgid "You are banned." +msgstr "Avete ricevuto un ban." + +#: ../IkiWiki/CGI.pm:390 +#: ../IkiWiki/CGI.pm:391 +#: ../IkiWiki.pm:1260 +msgid "Error" +msgstr "Errore" + +#: ../IkiWiki/Plugin/aggregate.pm:84 +msgid "Aggregation triggered via web." +msgstr "Aggregazione attivata dal web." + +#: ../IkiWiki/Plugin/aggregate.pm:93 +msgid "Nothing to do right now, all feeds are up-to-date!" +msgstr "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." + +#: ../IkiWiki/Plugin/aggregate.pm:220 +#, perl-format +msgid "missing %s parameter" +msgstr "parametro %s mancante" + +#: ../IkiWiki/Plugin/aggregate.pm:255 +msgid "new feed" +msgstr "nuovo notiziario" + +#: ../IkiWiki/Plugin/aggregate.pm:269 +msgid "posts" +msgstr "articoli" + +#: ../IkiWiki/Plugin/aggregate.pm:271 +msgid "new" +msgstr "nuovo" + +#: ../IkiWiki/Plugin/aggregate.pm:441 +#, perl-format +msgid "expiring %s (%s days old)" +msgstr "in scadenza %s (vecchio di %s giorni)" + +#: ../IkiWiki/Plugin/aggregate.pm:448 +#, perl-format +msgid "expiring %s" +msgstr "in scadenza %s" + +#: ../IkiWiki/Plugin/aggregate.pm:475 +#, perl-format +msgid "last checked %s" +msgstr "ultimo controllo %s" + +#: ../IkiWiki/Plugin/aggregate.pm:479 +#, perl-format +msgid "checking feed %s ..." +msgstr "controllo notiziario %s..." + +#: ../IkiWiki/Plugin/aggregate.pm:484 +#, perl-format +msgid "could not find feed at %s" +msgstr "impossibile trovare il notiziario %s" + +#: ../IkiWiki/Plugin/aggregate.pm:503 +msgid "feed not found" +msgstr "notiziario non trovato" + +#: ../IkiWiki/Plugin/aggregate.pm:514 +#, perl-format +msgid "(invalid UTF-8 stripped from feed)" +msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" + +#: ../IkiWiki/Plugin/aggregate.pm:522 +#, perl-format +msgid "(feed entities escaped)" +msgstr "(entità del notiziario espanse con escape)" + +#: ../IkiWiki/Plugin/aggregate.pm:530 +msgid "feed crashed XML::Feed!" +msgstr "il notiziario ha fatto andare in crash XML::Feed." + +#: ../IkiWiki/Plugin/aggregate.pm:616 +#, perl-format +msgid "creating new page %s" +msgstr "creazione nuova pagina %s" + +#: ../IkiWiki/Plugin/amazon_s3.pm:31 +msgid "deleting bucket.." +msgstr "eliminazione contenitore..." + +#: ../IkiWiki/Plugin/amazon_s3.pm:38 +#: ../ikiwiki.in:210 +msgid "done" +msgstr "fatto" + +#: ../IkiWiki/Plugin/amazon_s3.pm:97 +#, perl-format +msgid "Must specify %s" +msgstr "Occorre specificare %s" + +#: ../IkiWiki/Plugin/amazon_s3.pm:136 +msgid "Failed to create S3 bucket: " +msgstr "Impossibile creare il contenitore S3: " + +#: ../IkiWiki/Plugin/amazon_s3.pm:221 +msgid "Failed to save file to S3: " +msgstr "Impossibile salvare il file sul S3: " + +#: ../IkiWiki/Plugin/amazon_s3.pm:243 +msgid "Failed to delete file from S3: " +msgstr "Impossibile eliminare il file dal S3: " + +#: ../IkiWiki/Plugin/attachment.pm:49 +#, perl-format +msgid "there is already a page named %s" +msgstr "esiste già una pagina chiamata %s" + +#: ../IkiWiki/Plugin/attachment.pm:65 +msgid "prohibited by allowed_attachments" +msgstr "non permesso da allowed_attachments" + +#: ../IkiWiki/Plugin/attachment.pm:140 +msgid "bad attachment filename" +msgstr "nome file dell'allegato non valido" + +#: ../IkiWiki/Plugin/attachment.pm:182 +msgid "attachment upload" +msgstr "carica allegato" + +#: ../IkiWiki/Plugin/autoindex.pm:105 +msgid "automatic index generation" +msgstr "generazione automatica dell'indice" + +#: ../IkiWiki/Plugin/blogspam.pm:108 +msgid "Sorry, but that looks like spam to blogspam: " +msgstr "È stato riconosciuto come spam da blogspam: " + +#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#, perl-format +msgid "%s from %s" +msgstr "%s da %s" + +#: ../IkiWiki/Plugin/brokenlinks.pm:50 +msgid "There are no broken links!" +msgstr "Non ci sono collegamenti rotti." + +#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/format.pm:38 +#, perl-format +msgid "unsupported page format %s" +msgstr "formato pagina %s non supportato" + +#: ../IkiWiki/Plugin/comments.pm:129 +msgid "comment must have content" +msgstr "i commenti devono avere un contenuto" + +#: ../IkiWiki/Plugin/comments.pm:185 +msgid "Anonymous" +msgstr "Anonimo" + +#: ../IkiWiki/Plugin/comments.pm:340 +#: ../IkiWiki/Plugin/editpage.pm:97 +msgid "bad page name" +msgstr "nome pagina non valido" + +#: ../IkiWiki/Plugin/comments.pm:345 +#, perl-format +msgid "commenting on %s" +msgstr "commento su %s" + +#: ../IkiWiki/Plugin/comments.pm:363 +#, perl-format +msgid "page '%s' doesn't exist, so you can't comment" +msgstr "la pagina «%s» non esiste, impossibile commentarla" + +#: ../IkiWiki/Plugin/comments.pm:370 +#, perl-format +msgid "comments on page '%s' are closed" +msgstr "i commenti per la pagina «%s» sono chiusi" + +#: ../IkiWiki/Plugin/comments.pm:464 +msgid "comment stored for moderation" +msgstr "commento trattenuto per moderazione" + +#: ../IkiWiki/Plugin/comments.pm:466 +msgid "Your comment will be posted after moderator review" +msgstr "Il commento sarà pubblicato dopo la verifica del moderatore" + +#: ../IkiWiki/Plugin/comments.pm:479 +msgid "Added a comment" +msgstr "Aggiunto commento" + +#: ../IkiWiki/Plugin/comments.pm:483 +#, perl-format +msgid "Added a comment: %s" +msgstr "Aggiunto commento: %s" + +#: ../IkiWiki/Plugin/comments.pm:525 +#: ../IkiWiki/Plugin/websetup.pm:236 +msgid "you are not logged in as an admin" +msgstr "non siete autenticati come amministratore" + +#: ../IkiWiki/Plugin/comments.pm:576 +msgid "Comment moderation" +msgstr "Moderazione commenti" + +#: ../IkiWiki/Plugin/comments.pm:615 +msgid "comment moderation" +msgstr "moderazione commento" + +#: ../IkiWiki/Plugin/comments.pm:766 +msgid "Comments" +msgstr "Commenti" + +#: ../IkiWiki/Plugin/conditional.pm:27 +#: ../IkiWiki/Plugin/cutpaste.pm:30 +#: ../IkiWiki/Plugin/cutpaste.pm:45 +#: ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/testpagespec.pm:26 +#, perl-format +msgid "%s parameter is required" +msgstr "parametro %s necessario" + +#: ../IkiWiki/Plugin/cutpaste.pm:66 +msgid "no text was copied in this page" +msgstr "nessun testo è stato copiato in questa pagina" + +#: ../IkiWiki/Plugin/cutpaste.pm:69 +#, perl-format +msgid "no text was copied in this page with id %s" +msgstr "nessun testo è stato copiato in questa pagina con l'id %s" + +#: ../IkiWiki/Plugin/editpage.pm:40 +#, perl-format +msgid "removing old preview %s" +msgstr "rimozione vecchia anteprima %s" + +#: ../IkiWiki/Plugin/editpage.pm:113 +#, perl-format +msgid "%s is not an editable page" +msgstr "%s non è una pagina modificabile" + +#: ../IkiWiki/Plugin/editpage.pm:292 +#, perl-format +msgid "creating %s" +msgstr "creazione %s" + +#: ../IkiWiki/Plugin/editpage.pm:310 +#: ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 +#: ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 +#, perl-format +msgid "editing %s" +msgstr "modifica %s" + +#: ../IkiWiki/Plugin/edittemplate.pm:51 +msgid "template not specified" +msgstr "modello non specificato" + +#: ../IkiWiki/Plugin/edittemplate.pm:54 +msgid "match not specified" +msgstr "corrispondenza non specificata" + +#: ../IkiWiki/Plugin/edittemplate.pm:62 +#, perl-format +msgid "edittemplate %s registered for %s" +msgstr "edittemplate %s registrato per %s" + +#: ../IkiWiki/Plugin/edittemplate.pm:133 +msgid "failed to process" +msgstr "errore nell'elaborazione" + +#: ../IkiWiki/Plugin/format.pm:20 +msgid "must specify format and text" +msgstr "occorre specificare formato e testo" + +#: ../IkiWiki/Plugin/fortune.pm:27 +msgid "fortune failed" +msgstr "errore nel fortune" + +#: ../IkiWiki/Plugin/getsource.pm:62 +#: ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "pagina mancante" + +#: ../IkiWiki/Plugin/getsource.pm:64 +#: ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "La pagina %s non esiste." + +#: ../IkiWiki/Plugin/getsource.pm:73 +msgid "not a page" +msgstr "non è una pagina" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "%s è un allegato, non una pagina." + +#: ../IkiWiki/Plugin/git.pm:626 +#: ../IkiWiki/Plugin/git.pm:644 +#: ../IkiWiki/Receive.pm:129 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "non è permesso modificare %s" + +#: ../IkiWiki/Plugin/git.pm:666 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "non è permesso lavorare su un file in modalità %s" + +#: ../IkiWiki/Plugin/git.pm:670 +msgid "you are not allowed to change file modes" +msgstr "non è permesso cambiare la modalità del file" + +#: ../IkiWiki/Plugin/google.pm:27 +#: ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/search.pm:36 +#, perl-format +msgid "Must specify %s when using the %s plugin" +msgstr "Occorre specificare %s quando si usa il plugin %s" + +#: ../IkiWiki/Plugin/google.pm:31 +msgid "Failed to parse url, cannot determine domain name" +msgstr "Errore nell'interpretazione dell'URL, impossibile determinare il nome del dominio" + +#: ../IkiWiki/Plugin/graphviz.pm:67 +msgid "failed to run graphviz" +msgstr "errore nell'eseguire graphviz" + +#: ../IkiWiki/Plugin/graphviz.pm:94 +msgid "prog not a valid graphviz program" +msgstr "prog non è un programma graphviz valido" + +#: ../IkiWiki/Plugin/highlight.pm:47 +#, perl-format +msgid "tohighlight contains unknown file type '%s'" +msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" + +#: ../IkiWiki/Plugin/highlight.pm:58 +#, perl-format +msgid "Source code: %s" +msgstr "Sorgente: %s" + +#: ../IkiWiki/Plugin/highlight.pm:123 +msgid "warning: highlight perl module not available; falling back to pass through" +msgstr "attenzione: modulo perl highlight non trovato, verrà passato inalterato" + +#: ../IkiWiki/Plugin/img.pm:63 +msgid "Image::Magick is not installed" +msgstr "Image::Magick non è installato" + +#: ../IkiWiki/Plugin/img.pm:72 +#, perl-format +msgid "wrong size format \"%s\" (should be WxH)" +msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" + +#: ../IkiWiki/Plugin/img.pm:83 +#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:104 +#, perl-format +msgid "failed to read %s: %s" +msgstr "impossibile leggere %s: %s" + +#: ../IkiWiki/Plugin/img.pm:90 +#, perl-format +msgid "failed to resize: %s" +msgstr "impossibile ridimensionare: %s" + +#: ../IkiWiki/Plugin/img.pm:119 +#, perl-format +msgid "failed to determine size of image %s" +msgstr "impossibile determinare la dimensione dell'immagine %s" + +#: ../IkiWiki/Plugin/inline.pm:92 +msgid "Must specify url to wiki with --url when using --rss or --atom" +msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" + +#: ../IkiWiki/Plugin/inline.pm:138 +msgid "page editing not allowed" +msgstr "modifica della pagina non ammessa" + +#: ../IkiWiki/Plugin/inline.pm:155 +msgid "missing pages parameter" +msgstr "parametro pagine mancante" + +#: ../IkiWiki/Plugin/inline.pm:191 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "i parametri %s e %s non possono essere usati insieme" + +#: ../IkiWiki/Plugin/inline.pm:212 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" + +#: ../IkiWiki/Plugin/inline.pm:223 +#, perl-format +msgid "unknown sort type %s" +msgstr "ordinamento %s sconosciuto" + +#: ../IkiWiki/Plugin/inline.pm:327 +msgid "Add a new post titled:" +msgstr "Aggiungere un nuovo articolo dal titolo:" + +#: ../IkiWiki/Plugin/inline.pm:347 +#, perl-format +msgid "nonexistant template %s" +msgstr "modello %s non esistente" + +#: ../IkiWiki/Plugin/inline.pm:612 +msgid "RPC::XML::Client not found, not pinging" +msgstr "RPC::XML::Client non trovato, impossibile inviare ping" + +#: ../IkiWiki/Plugin/linkmap.pm:106 +msgid "failed to run dot" +msgstr "impossibile eseguire dot" + +#: ../IkiWiki/Plugin/lockedit.pm:47 +#, perl-format +msgid "%s is locked and cannot be edited" +msgstr "%s è bloccata e non può essere modificata" + +#: ../IkiWiki/Plugin/mdwn.pm:44 +msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" +msgstr "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" + +#: ../IkiWiki/Plugin/mdwn.pm:67 +#, perl-format +msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" +msgstr "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" + +#: ../IkiWiki/Plugin/meta.pm:158 +msgid "stylesheet not found" +msgstr "foglio di stile non trovato" + +#: ../IkiWiki/Plugin/meta.pm:196 +msgid "redir page not found" +msgstr "pagina di reindirizzamento non trovata" + +#: ../IkiWiki/Plugin/meta.pm:210 +msgid "redir cycle is not allowed" +msgstr "ciclo di reindirizzamento non ammesso" + +#: ../IkiWiki/Plugin/mirrorlist.pm:42 +msgid "Mirrors" +msgstr "Mirror" + +#: ../IkiWiki/Plugin/mirrorlist.pm:42 +msgid "Mirror" +msgstr "Mirror" + +#: ../IkiWiki/Plugin/more.pm:8 +msgid "more" +msgstr "altro" + +#: ../IkiWiki/Plugin/norcs.pm:65 +msgid "getctime not implemented" +msgstr "getctime non implementata" + +#: ../IkiWiki/Plugin/openid.pm:61 +msgid "Log in with" +msgstr "Accedi tramite" + +#: ../IkiWiki/Plugin/openid.pm:64 +msgid "Get an OpenID" +msgstr "Ottieni un OpenID" + +#: ../IkiWiki/Plugin/orphans.pm:45 +msgid "All pages have other pages linking to them." +msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." + +#: ../IkiWiki/Plugin/pagetemplate.pm:30 +msgid "bad or missing template" +msgstr "modello errato o mancante" + +#: ../IkiWiki/Plugin/passwordauth.pm:248 +msgid "Account creation successful. Now you can Login." +msgstr "Account creato con successo. È ora possibile effettuare l'accesso." + +#: ../IkiWiki/Plugin/passwordauth.pm:251 +msgid "Error creating account." +msgstr "Errore nella creazione dell'account." + +#: ../IkiWiki/Plugin/passwordauth.pm:258 +msgid "No email address, so cannot email password reset instructions." +msgstr "Nessun indirizzo email, impossibile inviare per email le istruzioni per reimpostare la password." + +#: ../IkiWiki/Plugin/passwordauth.pm:292 +msgid "Failed to send mail" +msgstr "Impossibile spedire il messaggio" + +#: ../IkiWiki/Plugin/passwordauth.pm:294 +msgid "You have been mailed password reset instructions." +msgstr "Il messaggio con le istruzioni per reimpostare la password è stato inviato." + +#: ../IkiWiki/Plugin/passwordauth.pm:329 +msgid "incorrect password reset url" +msgstr "url per il reset della password non corretto" + +#: ../IkiWiki/Plugin/passwordauth.pm:332 +msgid "password reset denied" +msgstr "reset della password non permesso" + +#: ../IkiWiki/Plugin/pingee.pm:30 +msgid "Ping received." +msgstr "Ping ricevuto." + +#: ../IkiWiki/Plugin/pinger.pm:53 +msgid "requires 'from' and 'to' parameters" +msgstr "sono richiesti i parametri \"to\" e \"from\"" + +#: ../IkiWiki/Plugin/pinger.pm:58 +#, perl-format +msgid "Will ping %s" +msgstr "Verrà inviato un ping a %s" + +#: ../IkiWiki/Plugin/pinger.pm:61 +#, perl-format +msgid "Ignoring ping directive for wiki %s (this wiki is %s)" +msgstr "Ignorata la richiesta di ping per il wiki %s (questo wiki è %s)" + +#: ../IkiWiki/Plugin/pinger.pm:77 +msgid "LWP not found, not pinging" +msgstr "LWP non trovato, ping non inviato" + +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno alla versione 0.35." + +#: ../IkiWiki/Plugin/po.pm:136 +#, perl-format +msgid "%s is not a valid language code" +msgstr "%s non è una codifica di lingua valida" + +#: ../IkiWiki/Plugin/po.pm:148 +#, perl-format +msgid "%s is not a valid value for po_link_to, falling back to po_link_to=default" +msgstr "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" + +#: ../IkiWiki/Plugin/po.pm:153 +msgid "po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default" +msgstr "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato po_link_to=default" + +#: ../IkiWiki/Plugin/po.pm:383 +#, perl-format +msgid "rebuilding all pages to fix meta titles" +msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" + +#: ../IkiWiki/Plugin/po.pm:387 +#: ../IkiWiki/Render.pm:426 +#, perl-format +msgid "building %s" +msgstr "compilazione di %s" + +#: ../IkiWiki/Plugin/po.pm:424 +msgid "updated PO files" +msgstr "file PO aggiornati" + +#: ../IkiWiki/Plugin/po.pm:448 +msgid "Can not remove a translation. If the master page is removed, however, its translations will be removed as well." +msgstr "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è stata eliminata anche le traduzioni lo saranno." + +#: ../IkiWiki/Plugin/po.pm:468 +msgid "Can not rename a translation. If the master page is renamed, however, its translations will be renamed as well." +msgstr "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è stata rinominata anche le traduzioni lo saranno." + +#: ../IkiWiki/Plugin/po.pm:829 +#, perl-format +msgid "POT file (%s) does not exist" +msgstr "Il file POT (%s) non esiste" + +#: ../IkiWiki/Plugin/po.pm:843 +#, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "impossibile copiare il file PO di underlay in %s" + +#: ../IkiWiki/Plugin/po.pm:852 +#, perl-format +msgid "failed to update %s" +msgstr "impossibile aggiornare %s" + +#: ../IkiWiki/Plugin/po.pm:858 +#, perl-format +msgid "failed to copy the POT file to %s" +msgstr "impossibile copiare il file POT in %s" + +#: ../IkiWiki/Plugin/po.pm:894 +msgid "N/A" +msgstr "N/D" + +#: ../IkiWiki/Plugin/po.pm:907 +#, perl-format +msgid "failed to translate %s" +msgstr "impossibile tradurre %s" + +#: ../IkiWiki/Plugin/po.pm:983 +msgid "removed obsolete PO files" +msgstr "file PO obsoleti rimossi" + +#: ../IkiWiki/Plugin/po.pm:1046 +#: ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1100 +#, perl-format +msgid "failed to write %s" +msgstr "impossibile scrivere %s" + +#: ../IkiWiki/Plugin/po.pm:1058 +msgid "failed to translate" +msgstr "impossibile tradurre" + +#: ../IkiWiki/Plugin/po.pm:1063 +#, perl-format +msgid "failed to read %s" +msgstr "impossibile leggere %s" + +#: ../IkiWiki/Plugin/po.pm:1112 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "dati gettext non validi, tornare alle pagina precedente per continuare le modifiche" + +#: ../IkiWiki/Plugin/poll.pm:69 +msgid "vote" +msgstr "voto" + +#: ../IkiWiki/Plugin/poll.pm:77 +msgid "Total votes:" +msgstr "Voti totali:" + +#: ../IkiWiki/Plugin/polygen.pm:41 +msgid "polygen not installed" +msgstr "polygen non è installato" + +#: ../IkiWiki/Plugin/polygen.pm:60 +msgid "command failed" +msgstr "errore nel comando" + +#: ../IkiWiki/Plugin/postsparkline.pm:41 +msgid "missing formula" +msgstr "formula mancante" + +#: ../IkiWiki/Plugin/postsparkline.pm:48 +msgid "unknown formula" +msgstr "formula sconosciuta" + +#. translators: These descriptions of times of day are used +#. translators: in messages like "last edited ". +#. translators: %A is the name of the day of the week, while +#. translators: %A- is the name of the previous day. +#: ../IkiWiki/Plugin/prettydate.pm:15 +msgid "late %A- night" +msgstr "%A- a tarda notte" + +#: ../IkiWiki/Plugin/prettydate.pm:17 +msgid "in the wee hours of %A- night" +msgstr "%A prima dell'alba" + +#: ../IkiWiki/Plugin/prettydate.pm:20 +msgid "terribly early %A morning" +msgstr "%A mattina molto presto" + +#: ../IkiWiki/Plugin/prettydate.pm:22 +msgid "early %A morning" +msgstr "%A mattina presto" + +#: ../IkiWiki/Plugin/prettydate.pm:25 +msgid "mid-morning %A" +msgstr "%A metà mattina" + +#: ../IkiWiki/Plugin/prettydate.pm:26 +msgid "late %A morning" +msgstr "%A mattina tardi" + +#: ../IkiWiki/Plugin/prettydate.pm:27 +msgid "at lunch time on %A" +msgstr "%A all'ora di pranzo" + +#: ../IkiWiki/Plugin/prettydate.pm:29 +msgid "%A afternoon" +msgstr "%A pomeriggio" + +#: ../IkiWiki/Plugin/prettydate.pm:32 +msgid "late %A afternoon" +msgstr "%A pomeriggio tardo" + +#: ../IkiWiki/Plugin/prettydate.pm:33 +msgid "%A evening" +msgstr "%A sera" + +#: ../IkiWiki/Plugin/prettydate.pm:35 +msgid "late %A evening" +msgstr "%A sera tardi" + +#: ../IkiWiki/Plugin/prettydate.pm:37 +msgid "%A night" +msgstr "%A notte" + +#: ../IkiWiki/Plugin/prettydate.pm:101 +msgid "at teatime on %A" +msgstr "%A all'ora di merenda" + +#: ../IkiWiki/Plugin/prettydate.pm:105 +msgid "at midnight" +msgstr "a mezzanotte" + +#: ../IkiWiki/Plugin/prettydate.pm:108 +msgid "at noon on %A" +msgstr "%A a mezzogiorno" + +#: ../IkiWiki/Plugin/progress.pm:34 +#, perl-format +msgid "illegal percent value %s" +msgstr "valore percentuale %s non ammesso" + +#: ../IkiWiki/Plugin/progress.pm:59 +msgid "need either `percent` or `totalpages` and `donepages` parameters" +msgstr "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e \"donepages\"" + +#: ../IkiWiki/Plugin/recentchangesdiff.pm:37 +msgid "(Diff truncated)" +msgstr "(Diff troncato)" + +#: ../IkiWiki/Plugin/remove.pm:31 +#: ../IkiWiki/Plugin/rename.pm:36 +#, perl-format +msgid "%s does not exist" +msgstr "%s non esiste" + +#: ../IkiWiki/Plugin/remove.pm:38 +#, perl-format +msgid "%s is not in the srcdir, so it cannot be deleted" +msgstr "%s non è in src, quindi non può essere eliminato" + +#: ../IkiWiki/Plugin/remove.pm:41 +#: ../IkiWiki/Plugin/rename.pm:45 +#, perl-format +msgid "%s is not a file" +msgstr "%s non è un file" + +#: ../IkiWiki/Plugin/remove.pm:134 +#, perl-format +msgid "confirm removal of %s" +msgstr "conferma rimozione di %s" + +#: ../IkiWiki/Plugin/remove.pm:171 +msgid "Please select the attachments to remove." +msgstr "Selezionare l'allegato da rimuovere." + +#: ../IkiWiki/Plugin/remove.pm:211 +msgid "removed" +msgstr "rimosso" + +#: ../IkiWiki/Plugin/rename.pm:42 +#, perl-format +msgid "%s is not in the srcdir, so it cannot be renamed" +msgstr "%s non è in src, quindi non può essere rinominato" + +#: ../IkiWiki/Plugin/rename.pm:62 +msgid "no change to the file name was specified" +msgstr "non è stata specificata nessuna modifica al nome del file" + +#: ../IkiWiki/Plugin/rename.pm:68 +#, perl-format +msgid "illegal name" +msgstr "nome non valido" + +#: ../IkiWiki/Plugin/rename.pm:73 +#, perl-format +msgid "%s already exists" +msgstr "%s esiste già" + +#: ../IkiWiki/Plugin/rename.pm:79 +#, perl-format +msgid "%s already exists on disk" +msgstr "%s già presente su disco" + +#: ../IkiWiki/Plugin/rename.pm:122 +#, perl-format +msgid "rename %s" +msgstr "rinomina di %s" + +#: ../IkiWiki/Plugin/rename.pm:161 +msgid "Also rename SubPages and attachments" +msgstr "Rinomina anche SottoPagine e allegati" + +#: ../IkiWiki/Plugin/rename.pm:247 +msgid "Only one attachment can be renamed at a time." +msgstr "Si può rinominare un solo allegato alla volta." + +#: ../IkiWiki/Plugin/rename.pm:250 +msgid "Please select the attachment to rename." +msgstr "Selezionare l'allegato da rinominare." + +#: ../IkiWiki/Plugin/rename.pm:347 +#, perl-format +msgid "rename %s to %s" +msgstr "rinomina %s in %s" + +#: ../IkiWiki/Plugin/rename.pm:571 +#, perl-format +msgid "update for rename of %s to %s" +msgstr "aggiornamento per rinomina di %s in %s" + +#: ../IkiWiki/Plugin/search.pm:182 +#, perl-format +msgid "need Digest::SHA1 to index %s" +msgstr "è necessario Digest::SHA1 per l'indice di %s" + +#: ../IkiWiki/Plugin/search.pm:217 +msgid "search" +msgstr "cerca" + +#: ../IkiWiki/Plugin/shortcut.pm:31 +#, perl-format +msgid "shortcut plugin will not work without %s" +msgstr "il plugin scorciatoia non può funzionare senza %s" + +#: ../IkiWiki/Plugin/shortcut.pm:44 +msgid "missing name or url parameter" +msgstr "parametro nome o url mancante" + +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:54 +#, perl-format +msgid "shortcut %s points to %s" +msgstr "la scorciatoia %s punta a %s" + +#: ../IkiWiki/Plugin/smiley.pm:43 +msgid "failed to parse any smileys" +msgstr "impossibile interpretare gli smile" + +#: ../IkiWiki/Plugin/sparkline.pm:72 +msgid "parse error" +msgstr "errore nell'interpretazione" + +#: ../IkiWiki/Plugin/sparkline.pm:78 +msgid "invalid featurepoint diameter" +msgstr "Diametro featurepoint non valido" + +#: ../IkiWiki/Plugin/sparkline.pm:88 +msgid "invalid featurepoint location" +msgstr "Posizione featurepoint non valida" + +#: ../IkiWiki/Plugin/sparkline.pm:99 +msgid "missing values" +msgstr "valori mancanti" + +#: ../IkiWiki/Plugin/sparkline.pm:104 +msgid "invalid height value" +msgstr "valore altezza non valido" + +#: ../IkiWiki/Plugin/sparkline.pm:111 +msgid "missing width parameter" +msgstr "parametro larghezza mancante" + +#: ../IkiWiki/Plugin/sparkline.pm:115 +msgid "invalid width value" +msgstr "valore larghezza non valido" + +#: ../IkiWiki/Plugin/sparkline.pm:153 +msgid "failed to run php" +msgstr "impossibile eseguire php" + +#: ../IkiWiki/Plugin/table.pm:31 +msgid "cannot find file" +msgstr "impossibile trovare il file" + +#: ../IkiWiki/Plugin/table.pm:87 +msgid "unknown data format" +msgstr "formato dati sconosiuto" + +#: ../IkiWiki/Plugin/table.pm:95 +msgid "empty data" +msgstr "nessun dato" + +#: ../IkiWiki/Plugin/table.pm:114 +msgid "Direct data download" +msgstr "Scaricamento diretto dei dati" + +#: ../IkiWiki/Plugin/table.pm:148 +#, perl-format +msgid "parse fail at line %d: %s" +msgstr "errore di interpretazione alla riga %d: %s" + +#: ../IkiWiki/Plugin/template.pm:29 +msgid "missing id parameter" +msgstr "parametro id mancante" + +#: ../IkiWiki/Plugin/template.pm:36 +#, perl-format +msgid "template %s not found" +msgstr "modello %s non trovato" + +#: ../IkiWiki/Plugin/template.pm:55 +msgid "failed to process:" +msgstr "errore nell'elaborazione:" + +#: ../IkiWiki/Plugin/teximg.pm:70 +msgid "missing tex code" +msgstr "codice tex mancante" + +#: ../IkiWiki/Plugin/teximg.pm:77 +msgid "code includes disallowed latex commands" +msgstr "nel codice sono presenti comandi latex non permessi" + +#: ../IkiWiki/Plugin/teximg.pm:128 +msgid "failed to generate image from code" +msgstr "impossibile generare l'immagine dal codice" + +#: ../IkiWiki/Plugin/websetup.pm:89 +msgid "plugin" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:108 +#, perl-format +msgid "enable %s?" +msgstr "abilitare %s?" + +#: ../IkiWiki/Plugin/websetup.pm:240 +msgid "setup file for this wiki is not known" +msgstr "il file di setup di questo wiki non è noto" + +#: ../IkiWiki/Plugin/websetup.pm:256 +msgid "main" +msgstr "principale" + +#: ../IkiWiki/Plugin/websetup.pm:257 +msgid "plugins" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:395 +msgid "The configuration changes shown below require a wiki rebuild to take effect." +msgstr "Le sottostanti modifiche alla configurazione richiedono la ricompilazione del wiki." + +#: ../IkiWiki/Plugin/websetup.pm:399 +msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." +msgstr "Affinché le sottostanti modifiche alla configurazione abbiano effetto, occorre ricostruire il wiki." + +#: ../IkiWiki/Plugin/websetup.pm:436 +#, perl-format +msgid "Error: %s exited nonzero (%s). Discarding setup changes." +msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." + +#: ../IkiWiki/Receive.pm:35 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "impossibile determinare l'id del committer non fidato %s" + +#: ../IkiWiki/Receive.pm:85 +#, perl-format +msgid "bad file name %s" +msgstr "nome file %s scorretto" + +#: ../IkiWiki/Render.pm:264 +#, perl-format +msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this" +msgstr "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare allow_symlinks_before_srcdir per abilitare questa configurazione" + +#: ../IkiWiki/Render.pm:287 +#: ../IkiWiki/Render.pm:312 +#, perl-format +msgid "skipping bad filename %s" +msgstr "ignorato il file dal nome scorretto %s" + +#: ../IkiWiki/Render.pm:294 +#, perl-format +msgid "%s has multiple possible source pages" +msgstr "%s ha diverse pagine sorgenti possibili" + +#: ../IkiWiki/Render.pm:380 +#, perl-format +msgid "removing old page %s" +msgstr "rimozione della vecchia pagina %s" + +#: ../IkiWiki/Render.pm:421 +#, perl-format +msgid "scanning %s" +msgstr "scansione %s" + +#: ../IkiWiki/Render.pm:447 +#, perl-format +msgid "building %s, which links to %s" +msgstr "compilazione di %s, che è collegato a %s" + +#: ../IkiWiki/Render.pm:468 +#, perl-format +msgid "building %s, which depends on %s" +msgstr "compilazione di %s, che dipende da %s" + +#: ../IkiWiki/Render.pm:507 +#, perl-format +msgid "building %s, to update its backlinks" +msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" + +#: ../IkiWiki/Render.pm:519 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "rimozione di %s, non più richiesto da %s" + +#: ../IkiWiki/Render.pm:543 +#, perl-format +msgid "ikiwiki: cannot build %s" +msgstr "ikiwiki: impossibile compilare %s" + +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:19 +#, perl-format +msgid "cannot read %s: %s" +msgstr "impossibile leggere %s: %s" + +#: ../IkiWiki/Setup/Automator.pm:34 +msgid "you must enter a wikiname (that contains alphanumerics)" +msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" + +#: ../IkiWiki/Setup/Automator.pm:71 +#, perl-format +msgid "unsupported revision control system %s" +msgstr "sistema di controllo di revisione %s non supportato" + +#: ../IkiWiki/Setup/Automator.pm:97 +msgid "failed to set up the repository with ikiwiki-makerepo" +msgstr "impossibile creare un repository tramite ikiwiki-makerepo" + +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" + +#: ../IkiWiki/Wrapper.pm:16 +#, perl-format +msgid "%s doesn't seem to be executable" +msgstr "%s non sembra essere eseguibile" + +#: ../IkiWiki/Wrapper.pm:20 +msgid "cannot create a wrapper that uses a setup file" +msgstr "impossibile creare un contenitore che utilizzi un file di setup" + +#: ../IkiWiki/Wrapper.pm:24 +msgid "wrapper filename not specified" +msgstr "nome del file del contenitore non specificato" + +#. translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:152 +#, perl-format +msgid "failed to compile %s" +msgstr "errore nel compilare %s" + +#. translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:172 +#, perl-format +msgid "successfully generated %s" +msgstr "%s generato con successo" + +#: ../ikiwiki.in:13 +msgid "usage: ikiwiki [options] source dest" +msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" + +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr " ikiwiki --setup configfile" + +#: ../ikiwiki.in:91 +msgid "usage: --set var=value" +msgstr "utilizzo: --set var=valore" + +#: ../ikiwiki.in:140 +msgid "generating wrappers.." +msgstr "generazione contenitori..." + +#: ../ikiwiki.in:199 +msgid "rebuilding wiki.." +msgstr "ricostruzione wiki..." + +#: ../ikiwiki.in:202 +msgid "refreshing wiki.." +msgstr "aggiornamento wiki..." + +#: ../IkiWiki.pm:225 +msgid "Discussion" +msgstr "Discussione" + +#: ../IkiWiki.pm:494 +msgid "Must specify url to wiki with --url when using --cgi" +msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" + +#: ../IkiWiki.pm:540 +msgid "cannot use multiple rcs plugins" +msgstr "impossibile usare più plugin rcs" + +#: ../IkiWiki.pm:569 +#, perl-format +msgid "failed to load external plugin needed for %s plugin: %s" +msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" + +#: ../IkiWiki.pm:1243 +#, perl-format +msgid "preprocessing loop detected on %s at depth %i" +msgstr "ciclo del preprocessore individuato su %s alla profondità %i" + +#: ../IkiWiki.pm:1783 +msgid "yes" +msgstr "sì" + +#: ../IkiWiki.pm:1915 +#, perl-format +msgid "cannot match pages: %s" +msgstr "impossibile trovare pagine corrispondenti: %s" + +#: ../auto.setup:16 +msgid "What will the wiki be named?" +msgstr "Quale sarà il nome del wiki?" + +#: ../auto.setup:16 +msgid "wiki" +msgstr "wiki" + +#: ../auto.setup:18 +msgid "What revision control system to use?" +msgstr "Che sistema di controllo di revisione usare?" + +#: ../auto.setup:20 +msgid "Which user (wiki account or openid) will be admin?" +msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" + +#: ../auto.setup:23 +msgid "What is the domain name of the web server?" +msgstr "Qual è il nome del dominio del server web?" + -- cgit v1.2.3 From 99626615ff41a257090414bf500a83674e8fdc27 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Aug 2009 13:39:33 -0400 Subject: Fix example blog's tags/life to not have a broken PageSpec. Closes: #543510 --- debian/changelog | 2 ++ doc/examples/blog/tags/life.mdwn | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5b021ec24..cfe45c3b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low Closes: #542036 * po: Fixed to run rcs_add ralative to srcdir. * Italian program translation from Luca Bruno. + * Fix example blog's tags/life to not have a broken PageSpec. + Closes: #543510 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/examples/blog/tags/life.mdwn b/doc/examples/blog/tags/life.mdwn index ddc2e646c..719f2b192 100644 --- a/doc/examples/blog/tags/life.mdwn +++ b/doc/examples/blog/tags/life.mdwn @@ -1,4 +1,4 @@ This feed contains pages in the "life" category. -[[!inline pages="link(tags/life) and ./posts/* and !*/Discussion" +[[!inline pages="link(tags/life) and !*/Discussion" show="10" actions=yes]] -- cgit v1.2.3 From 2ef6b15973290619fdcbda2e323dbb50224622cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Aug 2009 17:27:32 -0400 Subject: changelog and news file, also make postinst rebuild on upgrade --- debian/NEWS | 10 ++++++++++ debian/changelog | 10 ++++++++-- debian/postinst | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 75b6d0471..535708872 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,13 @@ +ikiwiki (3.1415926) UNRELEASED; urgency=low + + In order to fix a performance bug, all wikis need to be rebuilt on + upgrade to this version. If you listed your wiki in + /etc/ikiwiki/wikilist this will be done automatically when the + Debian package is upgraded. Or use ikiwiki-mass-rebuild to force + a rebuild. + + -- Joey Hess Tue, 25 Aug 2009 17:24:43 -0400 + ikiwiki (3.13) unstable; urgency=low The `ikiwiki-transition deduplinks` command introduced in the diff --git a/debian/changelog b/debian/changelog index cfe45c3b3..0d3f61e6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.141593) UNRELEASED; urgency=low +ikiwiki (3.1415926) UNRELEASED; urgency=low * po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205 @@ -22,6 +22,12 @@ ikiwiki (3.141593) UNRELEASED; urgency=low * Italian program translation from Luca Bruno. * Fix example blog's tags/life to not have a broken PageSpec. Closes: #543510 + * Optimize the dependencies list. This also fixes a bug + that could cause repeated refreshes of the wiki to grow + increasingly larger dependency lists, and get increasingly + slower. (smcv) + * Rebuild wikis on upgrade to this version to fix bloat caused + by the dependency bug. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 @@ -29,7 +35,7 @@ ikiwiki (3.141592) unstable; urgency=low * Add new hooks: canremove, canrename, rename. (intrigeri) * rename: Refactor subpage rename handling code into rename hook. (intrigeri) - * po: New plugin, suporting translation of wiki pages using po files. + * po: New plugin, suporting translation of wiki pages using po files. (intrigeri) * Add build machinery to build po files to translate the underlay wikis, * Add further build machinery to generate translated underlays from diff --git a/debian/postinst b/debian/postinst index 0a836a0b2..2ba26e5b6 100755 --- a/debian/postinst +++ b/debian/postinst @@ -4,7 +4,7 @@ set -e # Change this when some incompatible change is made that requires # rebuilding all wikis. -firstcompat=2.52 +firstcompat=3.1415926 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then -- cgit v1.2.3 From 4e70f2f0d20bbfc800aafb1b78cc6a41f4617d32 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:24:51 -0400 Subject: htmltidy: Print a warning message if tidy fails. Closes: #543722 --- IkiWiki/Plugin/htmltidy.pm | 5 ++++- debian/changelog | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 6f3379ef4..fc0d3b1d6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -46,7 +46,10 @@ sub sanitize (@) { waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return "" if $sigpipe || ! defined $ret; + if ($sigpipe || ! defined $ret) { + print STDERR gettext("warning: tidy failed")."\n"; + return ""; + } return $ret; } diff --git a/debian/changelog b/debian/changelog index 0d3f61e6f..69e197e37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. + * htmltidy: Print a warning message if tidy fails. Closes: #543722 -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From f8ad1bfec4e12944482d5f58a0961b0c476602c9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 15:50:43 -0400 Subject: fix cherry-picked --- debian/changelog | 1 + doc/plugins/po.mdwn | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 69e197e37..9f10c2913 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. * htmltidy: Print a warning message if tidy fails. Closes: #543722 + * po: Fix name of translated toplevel index page. (intrigeri) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 9c4d8ffbd..f020adac2 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -289,27 +289,6 @@ order, as `po_slave_languages` is a hash. It would need to be converted to an array to support this. (If twere done, twere best done quickly.) --[[Joey]] -Name of toplevel index page ---------------------------- - -Normally at the top index page of a wiki, you see the wiki name at -the top. However, at the top *translated* index page, you see something -like "index.da". --[[Joey]] - -> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'` -> test with a predicate call such as isindexpage($page). Such a predicate -> function could then be overriden by the po plugin. --[[intrigeri]] - ->> Could do that, but if you have such a function it's natural to want to ->> use it elsewhere. Not clear to me it would make sense for po to override ->> such a function if it were used in some of the other places that compare ->> to index. ->> ->> The other option would be for po to override the template setting. ->> --[[Joey]] - ->>> Great idea. Commit 6c0f9c691c3df3a in my po branch does it. --[[intrigeri]] - Pagespecs --------- -- cgit v1.2.3 From 18e4fa65399f2a21bd943b0e62b81a100f941d44 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 15:54:44 -0400 Subject: fix merged --- debian/changelog | 1 + doc/plugins/po.mdwn | 27 --------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9f10c2913..b4169c576 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low by the dependency bug. * htmltidy: Print a warning message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) + * po: Fix display of links from a translated page to itself (ntrigeri) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index f020adac2..57459c1ef 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -253,33 +253,6 @@ once [[intrigeri]]'s `meta` branch is merged. An integration branch, called `meta-po`, merges [[intrigeri]]'s `po` and `meta` branches, and thus has this additional features. -Self links ----------- - -If a page contains a WikiLink to itself, ikiwiki does not normally -turn that into a hyperlink. However, if a translated page contains a -WikiLink to itself, a hyperlink is inserted, at least with the default -`po_link_to` the link points to the English version of the page. Is there a -good reason for that to be done? --[[Joey]] - -> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]] - ->> It may fix it in passing, but shouldn't it also be fixed for the other ->> `po_link_to` styles? - ->>> Other `po_link_to` styles already work ok: say there is ->>> a \[[dest]] link on a page called `dest`. When rendering ->>> `dest.LL`, `mybestlink` returns `dest.LL`, and `htmllink` is then ->>> able to detect, and manage correctly, that it is a self-link. ->>> --[[intrigeri]] - ->> (Also, if `mybestlink` is going to always just return `bestlink` in ->> this case, there seems no reason to inject it.) --[[Joey]] - ->>> Right. Commit cdc3576c8d1efb2 in my po branch prevents ->>> `mybestlink` to be injected when `po_link_to` is ->>> `default`. --[[intrigeri]] - Language display order ---------------------- -- cgit v1.2.3 From 0c1a71896d792e3fb2fe6624a2dc9fdac30e1b80 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 16:27:57 -0400 Subject: htmltidy: Return an error message if tidy fails. Closes: #543722 On second^Wthird^Wfourth thought, putting the message into the page seems better than using stderr. --- IkiWiki/Plugin/htmltidy.pm | 3 +-- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index fc0d3b1d6..e6d377f8a 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -47,8 +47,7 @@ sub sanitize (@) { $SIG{PIPE}="DEFAULT"; if ($sigpipe || ! defined $ret) { - print STDERR gettext("warning: tidy failed")."\n"; - return ""; + return gettext("htmltidy failed to parse this html"); } return $ret; diff --git a/debian/changelog b/debian/changelog index b4169c576..8cd5032cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. - * htmltidy: Print a warning message if tidy fails. Closes: #543722 + * htmltidy: Return an error message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) -- cgit v1.2.3 From 29e1c8e033880abd4541b99cbd436ab2c81d752e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 06:12:05 -0400 Subject: Czech basewiki enabled --- debian/changelog | 1 + po/underlay.setup | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8cd5032cd..045f27540 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * htmltidy: Return an error message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) + * Add Czech basewiki translation from Miroslav Kure. -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/po/underlay.setup b/po/underlay.setup index 3e6c12566..76df2e29c 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -11,6 +11,7 @@ use IkiWiki::Setup::Standard { #'es' => 'Español', #'de' => 'Deutsch', 'da' => 'Dansk', + 'cs' =" 'česky', }, po_master_language => { 'code' => 'en', 'name' => 'English' }, po_translatable_pages => "*", -- cgit v1.2.3 From cc6000f0b9b82b19ea4635edcace2f6ba164adf1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 07:34:09 -0400 Subject: both changes picked --- debian/changelog | 3 +++ doc/plugins/po.mdwn | 2 ++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 045f27540..d10bc36cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,9 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) * Add Czech basewiki translation from Miroslav Kure. + * po: fix interdiction to create pages of type po (intrigeri) + * po: po: favor the type of linking page's masterpage on page creation + (intrigeri) -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 3b152586e..fdef41e45 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -330,6 +330,8 @@ This code favors the type of the linking page's masterpage on page creation (when `from=page.LL`). This is commit c9301d2c296f682. --[[intrigeri]] +> Both cherry picked. --[[Joey]] + Documentation ------------- -- cgit v1.2.3 From 4e3a2a370cdc431091b32e8d5fa03c8718e6ea4a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 15:11:21 -0400 Subject: changelpg --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d10bc36cf..870abfdd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. + * Further optimisation of dependency handling by adding a special + case for simple page dependencies. (smcv) * htmltidy: Return an error message if tidy fails. Closes: #543722 * po: Fix name of translated toplevel index page. (intrigeri) * po: Fix display of links from a translated page to itself (ntrigeri) -- cgit v1.2.3 From 03449610d6c666ba24bea68f01d896613e522278 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 23:23:06 -0400 Subject: img: Don't generate new verison of image if it is scaled to be larger in either dimension. Although imagemagick handles even really large sizes sanely, using a page file, doing so would just waste time and disk space, since the browser can be told to resize it larger. --- IkiWiki/Plugin/img.pm | 39 ++++++++++++++++++++++++++++++++++++--- debian/changelog | 2 ++ 2 files changed, 38 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 5f97e3810..9ae85c4e6 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -65,6 +65,8 @@ sub preprocess (@) { my $imglink; my $r; + my ($dwidth, $dheight); + if ($params{size} ne 'full') { add_depends($params{page}, $image); @@ -86,7 +88,15 @@ sub preprocess (@) { $r = $im->Read($srcfile); error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; - $r = $im->Resize(geometry => "${w}x${h}"); + # don't resize any larger + my ($rw, $rh) = ($w, $h); + if ((length $rw && $rw > $im->Get("width")) || + (length $rh && $rh > $im->Get("height"))) { + $rw=$im->Get("width"); + $rh=$im->Get("height"); + } + + $r = $im->Resize(geometry => "${rw}x${rh}"); error sprintf(gettext("failed to resize: %s"), $r) if $r; # don't actually write file in preview mode @@ -98,11 +108,34 @@ sub preprocess (@) { $imglink = $file; } } + + # since we don't really resize larger, set the display + # size, so the browser can scale the image up if necessary + if (length $w && length $h) { + ($dwidth, $dheight)=($w, $h); + } + # avoid division by zero on 0x0 image + elsif ($im->Get("width") == 0 || $im->Get("height") == 0) { + ($dwidth, $dheight)=(0, 0); + } + # calculate unspecified size from the other one, preserving + # aspect ratio + elsif (length $w) { + $dwidth=$w; + $dheight=$w / $im->Get("width") * $im->Get("height"); + } + elsif (length $h) { + $dheight=$h; + $dwidth=$h / $im->Get("height") * $im->Get("width"); + } + } else { $r = $im->Read($srcfile); error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; $imglink = $file; + $dwidth = $im->Get("width"); + $dheight = $im->Get("height"); } my ($fileurl, $imgurl); @@ -120,8 +153,8 @@ sub preprocess (@) { } my $imgtag=''.$params{alt}.' Wed, 12 Aug 2009 12:25:30 -0400 -- cgit v1.2.3 From 9f75d3b1f3c43820cff9ce554601f64c60d72b14 Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Fri, 28 Aug 2009 23:07:27 -0700 Subject: teximg: Make TeX handle preventing unsafe things; remove insufficient blacklist TeX has configuration options that prevent unsafe things like shell escapes and insecure file reads/writes. Turn all of them on. teximg's regex-based blacklist does not suffice. For instance: [[!teximg code=""" \catcode`\%=0 %input{/etc/passwd} """]] Remove the blacklist, since the TeX configuration options seal off the underlying mechanisms more safely, and the blacklist blocks other TeX commands that can prove useful. --- IkiWiki/Plugin/teximg.pm | 40 ++-------------------------------------- debian/changelog | 5 +++++ 2 files changed, 7 insertions(+), 38 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm index dba5372b5..f92ed0132 100644 --- a/IkiWiki/Plugin/teximg.pm +++ b/IkiWiki/Plugin/teximg.pm @@ -69,13 +69,7 @@ sub preprocess (@) { if (! defined $code && ! length $code) { error gettext("missing tex code"); } - - if (check($code)) { - return create($code, check_height($height), \%params); - } - else { - error gettext("code includes disallowed latex commands") - } + return create($code, check_height($height), \%params); } sub check_height ($) { @@ -155,7 +149,7 @@ sub gen_image ($$$$) { my $tmp = eval { create_tmp_dir($digest) }; if (! $@ && writefile("$digest.tex", $tmp, $tex) && - system("cd $tmp; latex --interaction=nonstopmode $tmp/$digest.tex > /dev/null") == 0 && + system("cd $tmp; shell_escape=f openout_any=p openin_any=p latex --interaction=nonstopmode $digest.tex < /dev/null > /dev/null") == 0 && # ensure destination directory exists writefile("$imagedir/$digest.png", $config{destdir}, "") && (($config{teximg_dvipng} && @@ -191,34 +185,4 @@ sub create_tmp_dir ($) { return $tmpdir; } -sub check ($) { - # Check if the code is ok - my $code = shift; - - my @badthings = ( - qr/\$\$/, - qr/\\include/, - qr/\\includegraphic/, - qr/\\usepackage/, - qr/\\newcommand/, - qr/\\renewcommand/, - qr/\\def/, - qr/\\input/, - qr/\\open/, - qr/\\loop/, - qr/\\errorstopmode/, - qr/\\scrollmode/, - qr/\\batchmode/, - qr/\\read/, - qr/\\write/, - ); - - foreach my $thing (@badthings) { - if ($code =~ m/$thing/ ) { - return 0; - } - } - return 1; -} - 1 diff --git a/debian/changelog b/debian/changelog index 992692566..a5b07aac1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low + [ Joey Hess ] * po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205 * inline: Avoid use of my $_ as it fails with older perls. @@ -40,6 +41,10 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * img: Don't generate new verison of image if it is scaled to be larger in either dimension. + [ Josh Triplett ] + * teximg: Replace the insufficient blacklist with the built-in security + mechanisms of TeX. + -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 ikiwiki (3.141592) unstable; urgency=low -- cgit v1.2.3 From 7823eb7c932d49228f55a83f33e47d10e7f5ec13 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Aug 2009 15:29:08 -0400 Subject: finalize release --- debian/changelog | 4 +-- po/bg.po | 99 +++++++++++++++++++++++++++-------------------------- po/cs.po | 99 +++++++++++++++++++++++++++-------------------------- po/da.po | 102 +++++++++++++++++++++++++++++-------------------------- po/de.po | 102 +++++++++++++++++++++++++++++-------------------------- po/es.po | 102 +++++++++++++++++++++++++++++-------------------------- po/fr.po | 98 +++++++++++++++++++++++++++------------------------- po/gu.po | 99 +++++++++++++++++++++++++++-------------------------- po/ikiwiki.pot | 94 +++++++++++++++++++++++++------------------------- po/it.po | 98 +++++++++++++++++++++++++++------------------------- po/pl.po | 99 +++++++++++++++++++++++++++-------------------------- po/sv.po | 99 +++++++++++++++++++++++++++-------------------------- po/vi.po | 99 +++++++++++++++++++++++++++-------------------------- 13 files changed, 610 insertions(+), 584 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a5b07aac1..ee8e74027 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.1415926) UNRELEASED; urgency=low +ikiwiki (3.1415926) unstable; urgency=high [ Joey Hess ] * po: Detect if nowrapi18n can't be passed to po4a, and warn about @@ -45,7 +45,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low * teximg: Replace the insufficient blacklist with the built-in security mechanisms of TeX. - -- Joey Hess Wed, 12 Aug 2009 12:25:30 -0400 + -- Joey Hess Sun, 30 Aug 2009 15:20:46 -0400 ikiwiki (3.141592) unstable; urgency=low diff --git a/po/bg.po b/po/bg.po index d29f81723..d21205272 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Грешка" @@ -363,7 +363,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -397,28 +397,33 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "няма разпознати усмивки; изключване на приставката „smiley”" + #: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" @@ -453,16 +458,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -591,99 +596,99 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -979,11 +984,7 @@ msgstr "грешка при обработване на шаблона" msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" @@ -1035,54 +1036,54 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1180,16 +1181,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 657d2852c..398a14211 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -53,7 +53,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Chyba" @@ -360,7 +360,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -393,28 +393,33 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "nepodařilo se rozpoznat žádné smajlíky" + #: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen není nainstalován" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "nelze změnit velikost: %s" @@ -447,16 +452,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -581,99 +586,99 @@ msgstr "RPC::XML::Client nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "nelze zapsat %s: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -964,11 +969,7 @@ msgstr "nepodařilo se zpracovat:" msgid "missing tex code" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 #, fuzzy msgid "failed to generate image from code" msgstr "nelze změnit velikost: %s" @@ -1021,54 +1022,54 @@ msgstr "" msgid "bad file name %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -1164,16 +1165,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "nemohu číst %s: %s" diff --git a/po/da.po b/po/da.po index b4e06535b..c7cbbb352 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Fejl" @@ -364,7 +364,7 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -399,27 +399,32 @@ msgstr "" "advarsel: highlight perl modul ikke tilgængelig: falder tilbage til simpel " "gennemkørsel" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "afkodning af smileys mislykkedes" + #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "læsning af %s mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -450,16 +455,16 @@ msgstr "Sort::Naturally krævet for title_natural sortering" msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -583,12 +588,12 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -596,7 +601,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -604,21 +609,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -626,7 +631,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -634,55 +639,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, perl-format msgid "failed to read %s" msgstr "læsning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -967,11 +972,7 @@ msgstr "dannelsen mislykkedes:" msgid "missing tex code" msgstr "manglende tex-kode" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "kode indeholder ikke-tilladte latec-kommandoer" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" @@ -1026,7 +1027,7 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1035,47 +1036,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1172,16 +1173,16 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1206,5 +1207,8 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" +#~ msgid "code includes disallowed latex commands" +#~ msgstr "kode indeholder ikke-tilladte latec-kommandoer" + #~ msgid "discussion" #~ msgstr "diskussion" diff --git a/po/de.po b/po/de.po index 51c1b0fca..13a7355bb 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Fehler" @@ -362,7 +362,7 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -397,27 +397,32 @@ msgstr "" "Warnung: das highlight Perlmodul ist nicht verfügbar; greife zurück auf pass " "through" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "Smileys konnten nicht ausgewertet werden" + #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." @@ -450,16 +455,16 @@ msgstr "Sort::Naturally wird benötigt für title_natural sort" msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -586,12 +591,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -599,7 +604,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -607,21 +612,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -629,7 +634,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -637,55 +642,55 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, perl-format msgid "failed to read %s" msgstr "lesen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -973,11 +978,7 @@ msgstr "Fehler beim Ablauf:" msgid "missing tex code" msgstr "fehlender TeX-Code" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "Code enthält verbotene LaTeX-Befehle" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" @@ -1035,7 +1036,7 @@ msgstr "" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1044,47 +1045,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1186,16 +1187,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1220,5 +1221,8 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#~ msgid "code includes disallowed latex commands" +#~ msgstr "Code enthält verbotene LaTeX-Befehle" + #~ msgid "discussion" #~ msgstr "Diskussion" diff --git a/po/es.po b/po/es.po index 77f1cea6e..56d7e62bd 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Error" @@ -366,7 +366,7 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -402,27 +402,32 @@ msgstr "" "aviso: el módulo Perl hightlight no está disponible; retrocedo la entrada " "para continuar el proceso. " +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "Algunos emoticonos tienen errores" + #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" @@ -457,16 +462,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -594,99 +599,99 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -974,11 +979,7 @@ msgstr "se ha producido un error fatal mientras procesaba la plantilla:" msgid "missing tex code" msgstr "falta el código tex" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "el código incluye órdenes latex anuladas" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" @@ -1035,7 +1036,7 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1044,49 +1045,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1186,18 +1187,18 @@ msgstr "no puedo emplear varios complementos rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1225,6 +1226,9 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#~ msgid "code includes disallowed latex commands" +#~ msgstr "el código incluye órdenes latex anuladas" + #, fuzzy #~ msgid "discussion" #~ msgstr "Comentarios" diff --git a/po/fr.po b/po/fr.po index df3b23891..75142e55c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-25 18:43-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -358,7 +358,7 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -393,27 +393,32 @@ msgstr "" "Avertissement : le module perl « highlight » n'est pas disponible. " "Continuation malgré tout." +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "Aucun smiley n'a pu être analysé" + #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" @@ -446,16 +451,16 @@ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:614 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -583,12 +588,12 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -596,7 +601,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -604,23 +609,23 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -628,7 +633,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -636,55 +641,55 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, perl-format msgid "failed to read %s" msgstr "Impossible de lire %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " @@ -971,11 +976,7 @@ msgstr "Échec du traitement :" msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "Le code comporte des commandes LaTeX non permises" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" @@ -1031,7 +1032,7 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1040,47 +1041,47 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:473 +#: ../IkiWiki/Render.pm:497 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:513 +#: ../IkiWiki/Render.pm:533 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:525 +#: ../IkiWiki/Render.pm:545 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:549 +#: ../IkiWiki/Render.pm:569 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1187,11 +1188,11 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1791 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1216,6 +1217,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "code includes disallowed latex commands" +#~ msgstr "Le code comporte des commandes LaTeX non permises" + #~ msgid "discussion" #~ msgstr "Discussion" diff --git a/po/gu.po b/po/gu.po index d7e6eaa6a..9dd1d0114 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "ક્ષતિ" @@ -361,7 +361,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -394,28 +394,33 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" + #: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -448,16 +453,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -581,99 +586,99 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -965,11 +970,7 @@ msgstr "ક્રિયા કરવામાં નિષ્ફળ:" msgid "missing tex code" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -1021,54 +1022,54 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1164,16 +1165,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 29a2d508c..7903fa19d 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-25 18:43-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -353,7 +353,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -386,27 +386,31 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +msgid "htmltidy failed to parse this html" +msgstr "" + #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, perl-format msgid "failed to determine size of image %s" msgstr "" @@ -437,16 +441,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:614 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -566,98 +570,98 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, perl-format msgid "failed to read %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -941,11 +945,7 @@ msgstr "" msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 msgid "failed to generate image from code" msgstr "" @@ -996,54 +996,54 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:473 +#: ../IkiWiki/Render.pm:497 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:513 +#: ../IkiWiki/Render.pm:533 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:525 +#: ../IkiWiki/Render.pm:545 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:549 +#: ../IkiWiki/Render.pm:569 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1144,11 +1144,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1791 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index c740fb0cb..a44199dae 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-25 18:43-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -355,7 +355,7 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -391,27 +391,32 @@ msgid "" msgstr "" "attenzione: modulo perl highlight non trovato, verrà passato inalterato" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "impossibile interpretare gli smile" + #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, perl-format msgid "failed to read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" @@ -443,16 +448,16 @@ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki/Plugin/inline.pm:329 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:349 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:614 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -579,19 +584,19 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -599,21 +604,21 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -621,7 +626,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -629,55 +634,55 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, perl-format msgid "failed to read %s" msgstr "impossibile leggere %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " @@ -965,11 +970,7 @@ msgstr "errore nell'elaborazione:" msgid "missing tex code" msgstr "codice tex mancante" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "nel codice sono presenti comandi latex non permessi" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" @@ -1024,7 +1025,7 @@ msgstr "impossibile determinare l'id del committer non fidato %s" msgid "bad file name %s" msgstr "nome file %s scorretto" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1033,47 +1034,47 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "scansione %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:473 +#: ../IkiWiki/Render.pm:497 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:513 +#: ../IkiWiki/Render.pm:533 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:525 +#: ../IkiWiki/Render.pm:545 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:549 +#: ../IkiWiki/Render.pm:569 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1175,11 +1176,11 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1791 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -1203,3 +1204,6 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" + +#~ msgid "code includes disallowed latex commands" +#~ msgstr "nel codice sono presenti comandi latex non permessi" diff --git a/po/pl.po b/po/pl.po index 6ecda8d88..23f1af5f6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Błąd" @@ -365,7 +365,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -399,28 +399,33 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "awaria w trakcie przetwarzania emitoikonki" + #: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -455,16 +460,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -594,99 +599,99 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -987,11 +992,7 @@ msgstr "awaria w trakcie przetwarzania:" msgid "missing tex code" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -1043,54 +1044,54 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1188,16 +1189,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 075de56d0..b81830763 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Fel" @@ -362,7 +362,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -396,28 +396,33 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "misslyckades med att tolka smilisar, inaktiverar instick" + #: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" @@ -450,16 +455,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -587,99 +592,99 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -974,11 +979,7 @@ msgstr "misslyckades med att behandla mall:" msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" @@ -1030,54 +1031,54 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1173,16 +1174,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/vi.po b/po/vi.po index b500ed581..6f50e2c65 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-30 15:25-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Lỗi" @@ -363,7 +363,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -397,28 +397,33 @@ msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +#: ../IkiWiki/Plugin/htmltidy.pm:50 +#, fuzzy +msgid "htmltidy failed to parse this html" +msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" + #: ../IkiWiki/Plugin/img.pm:63 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/img.pm:72 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 -#: ../IkiWiki/Plugin/img.pm:104 +#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 +#: ../IkiWiki/Plugin/img.pm:135 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:90 +#: ../IkiWiki/Plugin/img.pm:100 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:119 +#: ../IkiWiki/Plugin/img.pm:152 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" @@ -453,16 +458,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:318 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:338 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:603 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" @@ -588,99 +593,99 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:136 +#: ../IkiWiki/Plugin/po.pm:138 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:148 +#: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:153 +#: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:383 +#: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:424 +#: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:448 +#: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:468 +#: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:829 +#: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:843 +#: ../IkiWiki/Plugin/po.pm:883 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:852 +#: ../IkiWiki/Plugin/po.pm:892 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:858 +#: ../IkiWiki/Plugin/po.pm:898 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:907 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:983 +#: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1148 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1058 +#: ../IkiWiki/Plugin/po.pm:1106 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1063 +#: ../IkiWiki/Plugin/po.pm:1111 #, fuzzy, perl-format msgid "failed to read %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1112 +#: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -975,11 +980,7 @@ msgstr "mẫu không xử lý được:" msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:77 -msgid "code includes disallowed latex commands" -msgstr "" - -#: ../IkiWiki/Plugin/teximg.pm:128 +#: ../IkiWiki/Plugin/teximg.pm:122 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" @@ -1031,54 +1032,54 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:264 +#: ../IkiWiki/Render.pm:266 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:294 +#: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:380 +#: ../IkiWiki/Render.pm:382 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:421 +#: ../IkiWiki/Render.pm:423 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:450 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:497 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:533 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:545 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:569 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1174,16 +1175,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1808 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1915 +#: ../IkiWiki.pm:1932 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From 8aeac3b6666eee4bcabf0e5c49bf1806d9410983 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 30 Aug 2009 17:48:14 -0400 Subject: CVE --- debian/changelog | 2 +- doc/news/version_3.1415926.mdwn | 2 +- doc/security.mdwn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ee8e74027..4dd47d2dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,7 +43,7 @@ ikiwiki (3.1415926) unstable; urgency=high [ Josh Triplett ] * teximg: Replace the insufficient blacklist with the built-in security - mechanisms of TeX. + mechanisms of TeX. (CVE-2009-2944) -- Joey Hess Sun, 30 Aug 2009 15:20:46 -0400 diff --git a/doc/news/version_3.1415926.mdwn b/doc/news/version_3.1415926.mdwn index c914c83cd..d31812c8e 100644 --- a/doc/news/version_3.1415926.mdwn +++ b/doc/news/version_3.1415926.mdwn @@ -50,4 +50,4 @@ ikiwiki 3.1415926 released with [[!toggle text="these changes"]] larger in either dimension. * [ Josh Triplett ] * teximg: Replace the insufficient blacklist with the built-in security - mechanisms of TeX."""]] \ No newline at end of file + mechanisms of TeX. ([[!cve CVE-2009-2944]])"""]] diff --git a/doc/security.mdwn b/doc/security.mdwn index 200ae29e2..3924186c2 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -426,4 +426,4 @@ bypassed and used to read arbitrary files. This was fixed by enabling TeX configuration options that disallow unsafe TeX commands. The fix was released on 30 Aug 2009 in version 3.1415926, and was backported to stable in version 2.53.4. If you use the teximg plugin, -I recommend upgrading. +I recommend upgrading. ([[!cve CVE-2009-2944]]) -- cgit v1.2.3 From 81b9321e61f545be3ca94fc484f62b44ec836fb5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Sep 2009 15:04:27 -0400 Subject: Add French basewiki translation from the Debian French l10n team, including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello. --- debian/changelog | 7 + po/underlay.setup | 2 +- po/underlays/basewiki/ikiwiki.fr.po | 69 +++++ po/underlays/basewiki/ikiwiki/directive.fr.po | 132 ++++++++++ po/underlays/basewiki/ikiwiki/formatting.fr.po | 291 +++++++++++++++++++++ po/underlays/basewiki/ikiwiki/markdown.fr.po | 49 ++++ po/underlays/basewiki/ikiwiki/openid.fr.po | 118 +++++++++ po/underlays/basewiki/ikiwiki/pagespec.fr.po | 236 +++++++++++++++++ .../basewiki/ikiwiki/pagespec/attachment.fr.po | 114 ++++++++ po/underlays/basewiki/ikiwiki/pagespec/po.fr.po | 57 ++++ po/underlays/basewiki/ikiwiki/searching.fr.po | 87 ++++++ po/underlays/basewiki/ikiwiki/subpage.fr.po | 51 ++++ .../basewiki/ikiwiki/subpage/linkingrules.fr.po | 103 ++++++++ po/underlays/basewiki/ikiwiki/wikilink.fr.po | 107 ++++++++ po/underlays/basewiki/index.fr.po | 26 ++ po/underlays/basewiki/recentchanges.fr.po | 37 +++ po/underlays/basewiki/sandbox.fr.po | 88 +++++++ po/underlays/basewiki/shortcuts.fr.po | 224 ++++++++++++++++ po/underlays/basewiki/templates.fr.po | 241 +++++++++++++++++ po/underlays/basewiki/templates/note.fr.po | 40 +++ po/underlays/basewiki/templates/popup.fr.po | 46 ++++ 21 files changed, 2124 insertions(+), 1 deletion(-) create mode 100644 po/underlays/basewiki/ikiwiki.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/directive.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/formatting.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/markdown.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/openid.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/searching.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/subpage.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.fr.po create mode 100644 po/underlays/basewiki/index.fr.po create mode 100644 po/underlays/basewiki/recentchanges.fr.po create mode 100644 po/underlays/basewiki/sandbox.fr.po create mode 100644 po/underlays/basewiki/shortcuts.fr.po create mode 100644 po/underlays/basewiki/templates.fr.po create mode 100644 po/underlays/basewiki/templates/note.fr.po create mode 100644 po/underlays/basewiki/templates/popup.fr.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4dd47d2dd..6109a7012 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.14159265) UNRELEASED; urgency=low + + * Add French basewiki translation from the Debian French l10n team, + including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello. + + -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 + ikiwiki (3.1415926) unstable; urgency=high [ Joey Hess ] diff --git a/po/underlay.setup b/po/underlay.setup index 237acef5d..a7d307e71 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -7,9 +7,9 @@ use IkiWiki::Setup::Standard { # Listing languages without active translations # will excessively bloat things. po_slave_languages => { - #'fr' => 'Français', #'es' => 'Español', #'de' => 'Deutsch', + 'fr' => 'Français', 'da' => 'Dansk', 'cs' => 'česky', }, diff --git a/po/underlays/basewiki/ikiwiki.fr.po b/po/underlays/basewiki/ikiwiki.fr.po new file mode 100644 index 000000000..6fceab6f2 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki.fr.po @@ -0,0 +1,69 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-30 09:46+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then=\"(Currently running version [[!version ]].)\"\n" +"]]\n" +msgstr "" +"Ce wiki est propulsé par [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then \"(version actuelle : [[!version ]].)\"\n" +"]]\n" + +#. type: Plain text +msgid "Some documentation on using ikiwiki:" +msgstr "Voici quelques pages de documentation sur l'utilisation d'ikiwiki :" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/formatting]]" +msgstr "[[ikiwiki/formatting]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/wikilink]]" +msgstr "[[ikiwiki/wikilink]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/subpage]]" +msgstr "[[ikiwiki/subpage]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/pagespec]]" +msgstr "[[ikiwiki/pagespec]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/directive]]" +msgstr "[[ikiwiki/directive]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/markdown]]" +msgstr "[[ikiwiki/markdown]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/openid]]" +msgstr "[[ikiwiki/openid]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/searching]]" +msgstr "[[ikiwiki/searching]]" diff --git a/po/underlays/basewiki/ikiwiki/directive.fr.po b/po/underlays/basewiki/ikiwiki/directive.fr.po new file mode 100644 index 000000000..b4d7513c9 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/directive.fr.po @@ -0,0 +1,132 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-25 11:25+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin " +"with `!` and may contain parameters. The general form is:" +msgstr "" +"Les directives sont semblables aux [[ikiwiki/WikiLink]] mais elles " +"commencent par un `!` et peuvent contenir des paramètres. La forme d'une " +"directive est la suivante :" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n" +msgstr "\t\\[[!directive param=\"value\" param=\"value\"]]\n" + +#. type: Plain text +msgid "" +"This gets expanded before the rest of the page is processed, and can be used " +"to transform the page in various ways." +msgstr "" +"Le contenu de cette directive est traité avant que la page ne soit traitée " +"et cela peut être utilisé pour modifier cette page." + +#. type: Plain text +msgid "" +"The quotes around values can be omitted if the value is a simple word. " +"Also, some directives may use parameters without values, for example:" +msgstr "" +"Les guillements autour des valeurs des paramètres peuvent être omis si cette " +"valeur est un simple mot. D'autre part, certaines directives peuvent avoir " +"des paramètres sans valeur, par exemple : " + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!tag foo]]\n" +msgstr "\t\\[[!tag foo]]\n" + +#. type: Plain text +msgid "" +"A directive does not need to all be on one line, it can be wrapped to " +"multiple lines if you like:" +msgstr "" +"Il n'est pas nécessaire d'écrire une directive sur une seule ligne ; elle " +"peut l'être sur plusieurs si vous préférez. Par exemple :" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!directive foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" +msgstr "" +"\t\\[[!directive foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" + +#. type: Plain text +msgid "" +"Also, multiple lines of *quoted* text can be used for a value. To allow " +"quote marks inside the quoted text, delimit the block of text with triple-" +"quotes:" +msgstr "" +"De plus, une *citation* sur plusieurs lignes peut servir de valeur. Pour " +"autoriser les guillemets du texte, il suffit de mettre trois séries de " +"guillemets autour du texte :" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive text=\"\"\"\n" +msgstr "\t\\[[!directive text=\"\"\"\n" + +#. type: Bullet: ' 1. ' +msgid "\"foo\"" +msgstr "\"foo\"" + +#. type: Bullet: ' 2. ' +msgid "\"bar\"" +msgstr "\"bar\"" + +#. type: Bullet: ' 3. ' +msgid "\"baz\"" +msgstr "\"baz\"" + +#. type: Plain text +msgid "" +"ikiwiki also has an older syntax for directives, which requires a space in " +"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This " +"syntax has several disadvantages: it requires a space after directives with " +"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in " +"[[wikilinks|ikiwiki/wikilink]]. ikiwiki now provides the `!`-prefixed " +"syntax shown above as default. However, ikiwiki still supports wikis using " +"the older syntax, if the `prefix_directives` option is disabled." +msgstr "" +"Il existe aussi une ancienne syntaxe pour les directives. Elle demande un " +"espace dans la directive pour les distinguer des [[wikilinks|ikiwiki/" +"wikilink]]. Cette syntaxe a plusieurs défauts : elle demande un espace après " +"une directive sans paramètre, comme `\\[[pagecount ]]`, et elle interdit les " +"espaces dans les [[wikilinks|ikiwiki/wikilink]]. Par défaut, ikiwiki utilise " +"maintenant la syntaxe montrée plus haut, avec le `!`. Cependant, l'ancienne " +"syntaxe est toujours acceptée, une fois que l'option `prefix_directives` est " +"désactivée." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +msgid "Here is a list of currently available directives in this wiki:" +msgstr "Voici une liste des directives actuellement disponibles sur ce wiki :" + +#. type: Plain text +#, no-wrap +msgid "[[!listdirectives ]]\n" +msgstr "[[!listdirectives ]]\n" diff --git a/po/underlays/basewiki/ikiwiki/formatting.fr.po b/po/underlays/basewiki/ikiwiki/formatting.fr.po new file mode 100644 index 000000000..05231364e --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/formatting.fr.po @@ -0,0 +1,291 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-26 13:39-0300\n" +"PO-Revision-Date: 2009-08-26 21:18+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"Formatting wiki pages\"]]\n" +msgstr "[[!meta title=\"Formater les pages\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Text on this wiki is, by default, written in a form very close to how you " +"might write text for an email message. This style of text formatting is " +"called [[MarkDown]], and it works like this:" +msgstr "" +"Sur ce wiki, la mise en forme du texte est semblable à celle utilisée dans " +"les courriels. Ce style de formatage s'appelle [[MarkDown]]. Voici comment " +"il fonctionne :" + +#. type: Plain text +msgid "Leave blank lines between paragraphs." +msgstr "Lignes vides entre les paragraphes." + +#. type: Plain text +msgid "" +"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by " +"placing it in single or double asterisks." +msgstr "" +"Texte en *\\*italique\\** avec un astérisque ou texte en **\\*\\*gras\\*" +"\\*** avec deux astérisques." + +#. type: Plain text +msgid "To create a list, start each line with an asterisk:" +msgstr "Une liste, chaque ligne commençant par un astérisque :" + +#. type: Bullet: '* ' +msgid "\"* this is my list\"" +msgstr "\"* ma liste\"" + +#. type: Bullet: '* ' +msgid "\"* another item\"" +msgstr "\"* un autre élément\"" + +#. type: Plain text +msgid "" +"To make a numbered list, start each line with a number (any number will do) " +"followed by a period:" +msgstr "" +"Une liste numérotée, chaque ligne commençant par un chiffre (n'importe " +"lequel), suivi d'un point :" + +#. type: Bullet: '1. ' +msgid "\"1. first line\"" +msgstr "\"1. première ligne\"" + +#. type: Bullet: '2. ' +msgid "\"2. second line\"" +msgstr "\"2. deuxième ligne\"" + +#. type: Bullet: '2. ' +msgid "\"2. third line\"" +msgstr "\"2. troisième ligne\"" + +#. type: Plain text +msgid "" +"To create a header, start a line with one or more `#` characters followed by " +"a space and the header text. The number of `#` characters controls the size " +"of the header:" +msgstr "" +"Un titre, une ligne commençant par un ou plusieurs caractères `#` suivis " +"d'un caractère espace et du texte du titre. Le nombre de `#` détermine la " +"taille du titre :" + +#. type: Title # +#, no-wrap +msgid "# h1" +msgstr "# h1" + +#. type: Title ## +#, no-wrap +msgid "## h2" +msgstr "## h2" + +#. type: Title ### +#, no-wrap +msgid "### h3" +msgstr "### h3" + +#. type: Title #### +#, no-wrap +msgid "#### h4" +msgstr "#### h4" + +#. type: Title ##### +#, no-wrap +msgid "##### h5" +msgstr "##### h5" + +#. type: Title ###### +#, no-wrap +msgid "###### h6" +msgstr "###### h6" + +#. type: Plain text +msgid "" +"To create a horizontal rule, just write three or more dashes or stars on " +"their own line:" +msgstr "" +"Une règle horizontale, au moins trois tirets ou étoiles sur la même ligne :" + +#. type: Plain text +#, no-wrap +msgid "To quote someone, prefix the quote with \">\":\n" +msgstr "Pour citer quelqu'un, faire précéder la citation de \">\" :\n" + +#. type: Plain text +#, no-wrap +msgid "" +"> To be or not to be,\n" +"> that is the question.\n" +msgstr "" +"> To be or not to be,\n" +"> that is the question.\n" + +#. type: Plain text +msgid "To write a code block, indent each line with a tab or 4 spaces:" +msgstr "" +"Un morceau de code, faire précéder chaque ligne par une tabulation ou quatre " +"espaces :" + +#. type: Plain text +#, no-wrap +msgid "" +"\t10 PRINT \"Hello, world!\"\n" +"\t20 GOTO 10\n" +msgstr "" +"\t10 PRINT \"Hello, world!\"\n" +"\t20 GOTO 10\n" + +#. type: Plain text +#, no-wrap +msgid "" +"To link to an url or email address, you can just put the\n" +"url in angle brackets: <>, or you can use the\n" +"form \\[link text\\]\\(url\\)\n" +msgstr "" +"Pour créer un lien avec une URL ou une adresse électronique,\n" +"mettre l'URL entre crochets, <>,\n" +"ou utiliser la forme \\[texte du lien\\]\\(url\\)\n" + +#. type: Plain text +msgid "" +"In addition to basic html formatting using [[MarkDown]], this wiki lets you " +"use the following additional features:" +msgstr "" +"En plus du formatage html élémentaire avec [[MarkDown]], ce wiki offre " +"d'autres possibilités :" + +#. type: Bullet: '* ' +msgid "" +"To link to another page on the wiki, place the page's name inside double " +"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]." +msgstr "" +"Pour créer un lien vers une autre page du wiki, mettre le nom de la page " +"entre deux paires de crochets. Ainsi, utilisez `\\[[WikiLink]]` pour un lien " +"avec [[WikiLink]]." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Insert [[smileys]] and some other useful symbols. :-)" +msgstr "Insérer des [[smileys]] et d'autres symboles très utiles :-)" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Use [[shortcuts]] to link to common resources." +msgstr "Utiliser des [[shortcuts]] pour renvoyer à des ressources communes." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n" +msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "" +"Create and fill out [[templates]] for repeated chunks of parameterized wiki " +"text." +msgstr "" +"Créer et utiliser des modèles ([[templates]]) pour répéter des morceaux de " +"texte standard." + +#. type: Plain text +#, no-wrap +msgid "" +"* Insert various [[directives|directive]] onto a page to perform useful\n" +" actions.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n" +msgstr "" +"Insérer diverses [[directives|directive]] sur une page pour modifier cette page.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " For example, you can:\n" +msgstr " Par exemple, vous pouvez :\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Add a table of contents to a page:" +msgstr "ajouter une table des matières sur une page :" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc]]\n" +msgstr "\t\\[[!toc]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Change the title of a page:" +msgstr "changer le titre d'une page :" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!meta title=\"full page title\"]]\n" +msgstr "\t\\[[!meta title=\"titre complet de la page\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Create a blog by inlining a set of pages:" +msgstr "" +"créer un blog en enchaînant un ensemble de pages (directive « inline ») :" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"blog/*\"]]\n" +msgstr "\t\\[[!inline pages=\"blog/*\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " Full list of [[directives|directive]] enabled for this wiki:\n" +msgstr " Voici la liste complète des directives activées sur ce wiki :\n" + +#. type: Plain text +#, no-wrap +msgid " [[!listdirectives ]]\n" +msgstr " [[!listdirectives ]]\n" diff --git a/po/underlays/basewiki/ikiwiki/markdown.fr.po b/po/underlays/basewiki/ikiwiki/markdown.fr.po new file mode 100644 index 000000000..71dc70c64 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/markdown.fr.po @@ -0,0 +1,49 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-25 09:31+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"[Markdown](http://daringfireball.net/projects/markdown/) is a minimal " +"markup language that resembles plain text as used in email messages. It is " +"the markup language used by this wiki by default." +msgstr "" +"[Markdown](http://daringfireball.net/projects/markdown/) est un langage de " +"balisage élémentaire, comparable à celui utilisé dans la messagerie " +"électronique. Il s'agit du langage de balisage utilisé par défaut dans ce " +"wiki." + +#. type: Plain text +msgid "" +"For documentation about the markdown syntax, see [[formatting]] and " +"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)." +msgstr "" +"Référez vous à [[formatting]] et [Syntaxe Markdown](http://daringfireball." +"net/projects/markdown/syntax) pour la documentation sur la syntaxe du langage " +"markdown." + +#. type: Plain text +msgid "" +"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part " +"of the markdown syntax, and are the only bit of markup that this wiki " +"handles internally." +msgstr "" +"Notez que les [[WikiLinks|WikiLink]] et les [[directives|directive]] ne font " +"pas partie de la syntaxe du langage markdown. Il s'agit des seules balises " +"qui sont traitées en interne par ce wiki." diff --git a/po/underlays/basewiki/ikiwiki/openid.fr.po b/po/underlays/basewiki/ikiwiki/openid.fr.po new file mode 100644 index 000000000..81d36e068 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/openid.fr.po @@ -0,0 +1,118 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-25 09:52+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"OpenID\"]]\n" +msgstr "[[!meta title=\"OpenID\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"This wiki has OpenID **enabled**.\"\n" +" else=\"This wiki has OpenID **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"OpenID est **activé** sur ce wiki.\"\n" +" else=\"OpenID est **desactivé** sur ce wiki.\"]]\n" + +#. type: Plain text +msgid "" +"[OpenID](http://openid.net) is a decentralized authentication mechanism that " +"allows you to have one login that you can use on a growing number of " +"websites." +msgstr "" +"[OpenID](http://openid.net) est un système d'authentification décentralisé " +"qui permet d'avoir un identifiant unique, utilisable sur un nombre croissant " +"de sites internet." + +#. type: Plain text +msgid "" +"To sign up for an OpenID, visit one of the following identity providers:" +msgstr "" +"Pour obtenir un identifiant OpenID, visitez l'un des fournisseurs d'identité " +"suivants :" + +#. type: Bullet: '* ' +msgid "[MyOpenID](https://www.myopenid.com/)" +msgstr "[MyOpenID](https://www.myopenid.com/)" + +#. type: Bullet: '* ' +msgid "[GetOpenID](https://getopenid.com/)" +msgstr "[GetOpenID](https://getopenid.com/)" + +#. type: Bullet: '* ' +msgid "[Videntity](http://videntity.org/)" +msgstr "[Videntity](http://videntity.org/)" + +#. type: Bullet: '* ' +msgid "[LiveJournal](http://www.livejournal.com/openid/)" +msgstr "[LiveJournal](http://www.livejournal.com/openid/)" + +#. type: Bullet: '* ' +msgid "[TrustBearer](https://openid.trustbearer.com/)" +msgstr "[TrustBearer](https://openid.trustbearer.com/)" + +#. type: Bullet: '* ' +msgid "" +"or any of the [many others out there](http://openiddirectory.com/openid-" +"providers-c-1.html)" +msgstr "" +"ou n'importe lequel des [nombreux autres fournisseurs existants](http://" +"openiddirectory.com/openid-providers-c-1.html)" + +#. type: Plain text +#, no-wrap +msgid "" +"Your OpenID is the URL that you are given when you sign up.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" +msgstr "" +"Votre identifiant OpenID est l'URL qui vous est attribuée lorsque vous vous inscrivez.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" + +#. type: Plain text +msgid "" +"To sign in to this wiki using OpenID, just enter it in the OpenID field in " +"the signin form. You do not need to give this wiki a password or go through " +"any registration process when using OpenID." +msgstr "" +"Pour vous connecter à ce wiki en utilisant OpenID, entrez simplement votre " +"identifiant dans le champ OpenID du formulaire de connexion. Vous n'avez pas " +"besoin de donner un mot de passe pour ce wiki ou de passer par le processus " +"d'enregistrement lorsque vous utilisez OpenID." + +#. type: Plain text +msgid "" +"It's also possible to make a page in the wiki usable as an OpenID url, by " +"delegating it to an openid server. Here's an example of how to do that:" +msgstr "" +"Il est également possible de faire une page dans le wiki utilisable comme un " +"identifiant OpenID (URL) en la déléguant à un serveur OpenID. Voici un " +"exemple permettant de faire cela :" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" +msgstr "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" diff --git a/po/underlays/basewiki/ikiwiki/pagespec.fr.po b/po/underlays/basewiki/ikiwiki/pagespec.fr.po new file mode 100644 index 000000000..aeec3b95e --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec.fr.po @@ -0,0 +1,236 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the ikiwiki package. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki 3.141\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-09-02 17:42+0200\n" +"Last-Translator: Steve Petruzzello \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"To select a set of pages, such as pages that are locked, pages whose commit " +"emails you want subscribe to, or pages to combine into a blog, the wiki uses " +"a PageSpec. This is an expression that matches a set of pages." +msgstr "" +"Le wiki utilise un concept de spécification de page « PageSpec » afin de " +"choisir un ensemble de pages. Par exemple il est possible de choisir les " +"pages verrouillées, les pages dont vous recevez par courriel les " +"modifications ou des pages à regrouper pour faire blog. Une spécification " +"correspond à un ensemble de pages." + +#. type: Plain text +msgid "" +"The simplest PageSpec is a simple list of pages. For example, this matches " +"any of the three listed pages:" +msgstr "" +"La spécification la plus simple est la liste de pages. Par exemple, " +"l'expression suivante correspond à l'une ou l'autre des trois pages listées :" + +#. type: Plain text +#, no-wrap +msgid "\tfoo or bar or baz\n" +msgstr "\tfoo or bar or baz\n" + +#. type: Plain text +msgid "" +"More often you will want to match any pages that have a particular thing in " +"their name. You can do this using a glob pattern. \"`*`\" stands for any " +"part of a page name, and \"`?`\" for any single letter of a page name. So " +"this matches all pages about music, and any [[SubPage]]s of the SandBox, but " +"does not match the SandBox itself:" +msgstr "La plupart du temps, vous voulez trouver les pages qui contiennent une expression particulière dans leur nom. Cela s'obtient en utilisant un motif (« glob pattern »). Le métacaractère « `*` » correspond à n'importe quelle partie du nom de la page et le métacaractère « `?` » à n'importe quelle lettre. Ainsi, l'expression suivante correspond à toutes les pages traitant de musique et à n'importe quelle sous-page [[SubPage]] de la *SandBox*, mais pas à la *SandBox* elle-même :" + +#. type: Plain text +#, no-wrap +msgid "\t*music* or SandBox/*\n" +msgstr "\t*musique* or SandBox/*\n" + +#. type: Plain text +msgid "" +"You can also prefix an item with \"`!`\" to skip pages that match it. So to " +"match all pages except for Discussion pages and the SandBox:" +msgstr "Vous pouvez également préfixer un élément avec « `!` » pour ignorer les pages correspondantes. Ainsi pour trouver toutes les pages sauf les pages Discussion et la page *SandBox* :" + +#. type: Bullet: ' * ' +msgid "and !SandBox and !*/Discussion" +msgstr "and !SandBox and !*/Discussion" + +#. type: Plain text +msgid "" +"Some more elaborate limits can be added to what matches using these " +"functions:" +msgstr "" +"Des contraintes plus élaborées peuvent être ajoutées avec les fonctions " +"suivantes :" + +#. type: Bullet: '* ' +msgid "" +"\"`link(page)`\" - matches only pages that link to a given page (or glob)" +msgstr "« `link(page)` » - correspond aux pages ayant un lien vers cette page (ou motif)" + +#. type: Bullet: '* ' +msgid "" +"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag " +"(or tags matched by a glob)" +msgstr "" +"« `tagged(tag)` » - correspond aux pages qui sont marquées ou qui sont liées " +"à l'étiquette donnée (ou des étiquettes correspondant à un motif)." + +#. type: Bullet: '* ' +msgid "\"`backlink(page)`\" - matches only pages that a given page links to" +msgstr "" +"« `backlink(page)` » - correspond seulement aux pages qui sont pointées " +"(lien) par la page donnée." + +#. type: Bullet: '* ' +msgid "" +"\"`creation_month(month)`\" - matches only pages created on the given month" +msgstr "« `creation_month(mois)` » - correspond aux pages créées durant ce mois" + +#. type: Bullet: '* ' +msgid "\"`creation_day(mday)`\" - or day of the month" +msgstr "« `creation_day(jour)` » - ou au jour de ce mois" + +#. type: Bullet: '* ' +msgid "\"`creation_year(year)`\" - or year" +msgstr "« `creation_year(année)` » - ou année" + +#. type: Bullet: '* ' +msgid "" +"\"`created_after(page)`\" - matches only pages created after the given page " +"was created" +msgstr "" +"« `created_after(page)` » - correspond aux pages créées après la page donnée" + +#. type: Bullet: '* ' +msgid "" +"\"`created_before(page)`\" - matches only pages created before the given " +"page was created" +msgstr "« `created_before(page) » - correspond aux pages créées avant la page donnée" + +#. type: Bullet: '* ' +msgid "" +"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing " +"the glob by itself is actually a shorthand for this function." +msgstr "" +"« `glob(motif)` » - correspond aux pages correspondantes au motif donné. " +"N'écrire que le motif lui-même est un raccourci pour cette fonction." + +#. type: Bullet: '* ' +msgid "" +"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages " +"that globs do not usually match." +msgstr "" +"« `internal(motif)` » - pareil à `glob()`, mais correspond en plus aux pages " +"à usage interne que la fonction glob ne trouve pas en général." + +#. type: Bullet: '* ' +msgid "" +"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license" +"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, " +"matching the specified glob." +msgstr "" +"« `title(motif)`, `author(motif)`, `authorurl(motif)`, `license(motif)`, " +"`copyright(motif)` » - renvoient les pages qui possèdent les métadonnées " +"correspondant au motif donné." + +#. type: Bullet: '* ' +msgid "" +"\"`user(username)`\" - tests whether a modification is being made by a user " +"with the specified username. If openid is enabled, an openid can also be put " +"here." +msgstr "" +"« `user(identifiant)` » - teste si une modification est faite par " +"l'identifiant donné. Si openid est activé, on peut aussi l'utiliser." + +#. type: Bullet: '* ' +msgid "" +"\"`admin()`\" - tests whether a modification is being made by one of the " +"wiki admins." +msgstr "" +"« `admin()` » - teste si une modification par un administrateur est en cours." + +#. type: Bullet: '* ' +msgid "" +"\"`ip(address)`\" - tests whether a modification is being made from the " +"specified IP address." +msgstr "" +"« `ip(adresse)` » - teste si une modification par l'IP donnée est en cours." + +#. type: Bullet: '* ' +msgid "" +"\"`postcomment(glob)`\" - matches only when comments are being posted to a " +"page matching the specified glob" +msgstr "" +"« `postcomment(motif) » - ne correspond que si des commentaires sont postés " +"vers une page correspondant au motif donné." + +#. type: Plain text +msgid "" +"For example, to match all pages in a blog that link to the page about music " +"and were written in 2005:" +msgstr "" +"Par exemple, pour trouver toutes les pages d'un blog qui ont un lien vers la " +"page traitant de musique et qui ont été créées en 2005 :" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and link(music) and creation_year(2005)\n" +msgstr "\tblog/* and link(musique) and creation_year(2005)\n" + +#. type: Plain text +msgid "" +"Note the use of \"and\" in the above example, that means that only pages " +"that match each of the three expressions match the whole. Use \"and\" when " +"you want to combine expression like that; \"or\" when it's enough for a page " +"to match one expression. Note that it doesn't make sense to say \"index and " +"SandBox\", since no page can match both expressions." +msgstr "" +"Veuillez noter l'utilisation du « and » dans l'exemple ci-dessus. Seules les " +"pages dont les trois conditions sont vraies seront trouvées. Utilisez « and » " +"pour ce genre d'expression combinée. « or » est utilisé quand une seule des " +"trois conditions est suffisante. Veuillez noter que « index and SandBox » n'a " +"pas de sens puisqu'aucune page ne peut correspondre aux deux expressions." + +#. type: Plain text +msgid "" +"More complex expressions can also be created, by using parentheses for " +"grouping. For example, to match pages in a blog that are tagged with either " +"of two tags, use:" +msgstr "" +"On peut créer des expressions plus complexes à l'aide de parenthèses. Par " +"exemple, pour trouver les pages d'un blog possédantl'une ou l'autre " +"étiquette, on utiliserait :" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and (tagged(foo) or tagged(bar))\n" +msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n" + +#. type: Plain text +msgid "" +"Note that page names in PageSpecs are matched against the absolute filenames " +"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will " +"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the " +"directory of the page containing the pagespec, you can use \"./\". For " +"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"." +msgstr "" +"Veuillez noter que le nom d'une page dans une spécification de page " +"correspond au nom absolu du fichier dans le wiki. Ainsi une expression " +"« foo » utilisée sur une page « a/b » ne correspondra pas à une page nommée « a/" +"foo » ni à une page « a/b/foo ». Pour une correspondance relative au " +"répertoire de la page contenant la spécification, vous pouvez utiliser " +"« ./ ». Par exemple, « ./foo » sur la page « a/b » correspondra à la page « a/" +"foo »." diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po new file mode 100644 index 000000000..10f942033 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.fr.po @@ -0,0 +1,114 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-26 14:46+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"This wiki has attachments **enabled**.\"\n" +" else=\"This wiki has attachments **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"Les pièces jointes sont autorisées sur ce wiki.\"\n" +" else=\"Les pièces jointes ne sont pas autorisées sur ce wiki.\"]]\n" + +#. type: Plain text +msgid "" +"If attachments are enabled, the wiki admin can control what types of " +"attachments will be accepted, via the `allowed_attachments` configuration " +"setting." +msgstr "" +"Quand les pièces jointes sont autorisées, l'administrateur du wiki peut " +"contrôler le type des pièces acceptées, avec l'option de configuration " +"`allowed_attachments`." + +#. type: Plain text +msgid "" +"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 " +"files to be uploaded by joey into a specific directory, and check all " +"attachments for viruses, something like this could be used:" +msgstr "" +"Par exemple, pour limiter tous les fichiers à 50 kilooctets mais permettre " +"que des fichiers mp3 plus grands soient envoyés par joey dans un répertoire " +"donné et pour vérifier que toutes les pièces jointes sont sans virus, on " +"peut utiliser quelque chose comme ça :" + +#. type: Plain text +#, no-wrap +msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" +msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" + +#. type: Plain text +msgid "" +"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following " +"additional tests:" +msgstr "" +"La syntaxe normale de [[ikiwiki/PageSpec]] est appliquée avec les tests " +"supplémentaires suivants :" + +#. type: Bullet: '* ' +msgid "" +"\"`maxsize(size)`\" - tests whether the attachment is no larger than the " +"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb" +"\" etc can be used to specify the units." +msgstr "" +"`maxsize(size)` - teste si la taille de la pièce n'est pas plus grande que " +"la taille donnée. La taille est mesurée en octet mais on peut l'indiquer en " +"« ko », « mo », « go » etc." + +#. type: Bullet: '* ' +msgid "" +"\"`minsize(size)`\" - tests whether the attachment is no smaller than the " +"specified size." +msgstr "" +"`minsize(size)` - teste si la taille de la pièce n'est pas plus petite que " +"la taille donnée." + +#. type: Bullet: '* ' +msgid "" +"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as " +"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other " +"enabled page format)." +msgstr "" +"`ispage()` - teste si la pièce jointe sera traitée comme page de wiki par " +"ikiwiki, c'est-à-dire si son extension est « .mdwn » ou un autre format " +"accepté." + +#. type: Plain text +#, no-wrap +msgid "" +" So, if you don't want to allow wiki pages to be uploaded as attachments,\n" +" use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n" +" as attachments, use `ispage()`.\n" +msgstr "" +" Donc, si vous ne voulez pas que des pages de wiki puissent être envoyées en pièces jointes, utilisez `!ispage()`\n" +" et dans le cas contraire, `ispage()`.\n" + +#. type: Bullet: '* ' +msgid "" +"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can " +"include a glob in the type, for example `mimetype(image/*)`." +msgstr "" +"`mimetype(foo/bar)` - teste le type MIME de la pièce jointe. Vous pouvez " +"inclure un motif dans le type, par exemple `mimetype(image/*)`." + +#. type: Bullet: '* ' +msgid "\"`virusfree()`\" - checks the attachment with an antiviral program." +msgstr "`virusfree()` - teste la pièce jointe avec un programme antivirus." diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po new file mode 100644 index 000000000..a771f6ef7 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/po.fr.po @@ -0,0 +1,57 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-30 09:37+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(po)\"\n" +" then=\"This wiki has po support **enabled**.\"\n" +" else=\"This wiki has po support **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(po)\"\n" +" then=\"Ce wiki gère le mode po.\"\n" +" else=\"Ce wiki ne gère pas le mode po.\"]]\n" + +#. type: Plain text +msgid "" +"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/" +"PageSpec]] syntax is expanded with the following additional tests that can " +"be used to improve user navigation in a multi-lingual wiki:" +msgstr "Si le greffon [[!iki plugins/po desc=po]] est activé, la syntaxe normale de [[ikiwiki/PageSpec]] est développée avec les tests supplémentaires suivants qui peuvent améliorer la navigation d'un utilisateur de wiki plurilinguistique :" + +#. type: Bullet: '* ' +msgid "" +"\"`lang(LL)`\" - tests whether a page is written in the language specified " +"as a ISO639-1 (two-letter) language code." +msgstr "" +"`lang(LL)` - teste si la page est écrite dans la langue indiquée par le code " +"ISO639-1 (deux lettres)." + +#. type: Bullet: '* ' +msgid "" +"\"`currentlang()`\" - tests whether a page is written in the same language " +"as the current page." +msgstr "" +"`currentlang()` - teste si une page est écrite dans la langue de la page " +"donnée." + +#. type: Plain text +msgid "" +"Note that every non-po page is considered to be written in " +"`po_master_language`, as specified in `ikiwiki.setup`." +msgstr "" +"Notez que chaque page qui n'est pas de type po est considérée comme une page " +"écrite selon le `po_master_language`, tel que spécifié dans le fichier de " +"configuration `ikiwiki.setup`." diff --git a/po/underlays/basewiki/ikiwiki/searching.fr.po b/po/underlays/basewiki/ikiwiki/searching.fr.po new file mode 100644 index 000000000..1fdee43dc --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/searching.fr.po @@ -0,0 +1,87 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-25 10:10+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(search)\"\n" +"then=\"This wiki has searching **enabled**.\"\n" +"else=\"This wiki has searching **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(search)\"\n" +"then=\"La fonction de recherche est **activée** sur ce wiki.\"\n" +"else=\"La fonction de recherche est **désactivée** sur ce wiki.\"]]\n" + +#. type: Plain text +msgid "" +"If searching is enabled, you can enter search terms in the search field, as " +"you'd expect. There are a few special things you can do to construct more " +"powerful searches." +msgstr "" +"Si la fonction de recherche est activée, vous pouvez saisir des mots clefs " +"dans le champ de recherche, comme vous pouvez vous y attendre. Il y a " +"quelques petits trucs que vous pouvez utiliser pour obtenir des résultats " +"plus précis." + +#. type: Bullet: '* ' +msgid "To match a phrase, enclose it in double quotes." +msgstr "Pour rechercher précisément une phrase, mettez-la entre guillemets." + +#. type: Bullet: '* ' +msgid "`AND` can be used to search for documents containing two expressions." +msgstr "" +"`AND` peut être utilisé pour rechercher des documents contenant deux " +"expressions." + +#. type: Bullet: '* ' +msgid "" +"`OR` can be used to search for documents containing either one of two " +"expressions." +msgstr "" +"`OR` peut être utilisé pour rechercher des documents contenant l'une des " +"deux expressions." + +#. type: Bullet: '* ' +msgid "" +"Parentheses can be used to build up complicated search expressions. For " +"example, \"(foo AND bar) OR (me AND you)\"" +msgstr "" +"Les parenthèses peuvent être utilisées pour construire des requêtes plus " +"compliquées, comme par exemple \"(foo AND bar) OR (me AND you)\"" + +#. type: Bullet: '* ' +msgid "" +"Prefix a search term with \"-\" to avoid it from appearing in the results. " +"For example, \"-discussion\" will omit \"discussion\"." +msgstr "" +"Préfixez un mot clef avec \"-\" pour éviter que les pages contenant ce mot " +"clef n'apparaissent dans les résultats. Par exemple, \"-discussion\" ne " +"prendra pas en compte les pages contenant \"discussion\"." + +#. type: Bullet: '* ' +msgid "To search for a page with a given title, use \"title:foo\"." +msgstr "" +"Pour chercher une page dont le titre est connu, utilisez \"title:foo\"." + +#. type: Bullet: '* ' +msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"." +msgstr "" +"Pour rechercher les pages contenant un lien vers une page \"truc\", utilisez " +"\"link:truc\"." diff --git a/po/underlays/basewiki/ikiwiki/subpage.fr.po b/po/underlays/basewiki/ikiwiki/subpage.fr.po new file mode 100644 index 000000000..cf0e56cd9 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage.fr.po @@ -0,0 +1,51 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-25 10:31+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"ikiwiki supports placing pages in a directory hierarchy. For example, this " +"page, [[SubPage]] has some related pages placed under it, like [[SubPage/" +"LinkingRules]]. This is a useful way to add some order to your wiki rather " +"than just having a great big directory full of pages." +msgstr "" +"ikiwiki permet de ranger les pages dans une arborescence de répertoires. Par " +"exemple cette page, [[SubPage]], est liée à des pages placées " +"hiérarchiquement sous elle, comme la page [[SubPage/LinkingRules]]. C'est " +"une façon pratique d'ordonner le wiki au lieu d'avoir un seul gros " +"répertoire plein de pages." + +#. type: Plain text +msgid "" +"To add a SubPage, just make a subdirectory and put pages in it. For example, " +"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage " +"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be " +"nested as deeply as you'd like." +msgstr "" +"Pour ajouter une sous-page, faites simplement un sous-répertoire et mettez-y " +"les pages. Par exemple, cette page est `subpage.mdwn` dans les sources de ce " +"wiki et il y a également un sous-répertoire `subpage`, qui contient `subpage/" +"linkingrules.mdwn`. Les sous-pages peuvent être emboîtées autant que vous le " +"souhaitez." + +#. type: Plain text +msgid "Linking to and from a SubPage is explained in [[LinkingRules]]." +msgstr "" +"Faire un lien depuis et vers une sous-page est expliqué dans " +"[[LinkingRules]]." diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po new file mode 100644 index 000000000..36f7ef96f --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.fr.po @@ -0,0 +1,103 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-25 10:59+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"To link to or from a [[SubPage]], you can normally use a regular " +"[[WikiLink]] that does not contain the name of the parent directory of the " +"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page " +"that matches your link." +msgstr "" +"Pour faire un lien depuis ou vers une sous-page ([[SubPage]]), vous pouvez " +"normalement utiliser un [[WikiLink]] classique qui ne contient pas le nom du " +"répertoire parent de la sous-page. Ikiwiki parcourt l'arborescence des " +"répertoires pour trouver une page qui corresponde au lien." + +#. type: Plain text +msgid "" +"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first " +"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to " +"FooBar/OtherPage and finally to OtherPage in the root of the wiki." +msgstr "" +"Par exemple, si FooBar/SubPage est liée à \"OtherPage\", ikiwiki préfèrera " +"d'abord chercher la page dans FooBar/SubPage/OtherPage si elle existe, " +"ensuite dans FooBar/OtherPage et finalement dans OtherPage à la racine du " +"wiki." + +#. type: Plain text +msgid "" +"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" " +"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage " +"is created, the link will _change_ to point to FooBar/OtherPage. On the " +"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this " +"creation of a [[SubPage]] of FooBar." +msgstr "" +"Cela signifie que si un lien de FooBar/SomePage vers \"OtherPage\" pointe " +"actuellement vers OtherPage à la racine du wiki, et que la page FooBar/" +"OtherPage est créée, alors le lien _changera_ pour pointer vers la page " +"FooBar/OtherPage. Cependant, un lien de BazBar vers \"OtherPage\" ne serait " +"pas impacté par cette création d'une sous-page ([[SubPage]]) de FooBar." + +#. type: Plain text +msgid "" +"You can also specify a link that contains a directory name, like \"FooBar/" +"OtherPage\" to more exactly specify what page to link to. This is the only " +"way to link to an unrelated [[SubPage]]." +msgstr "" +"Vous pouvez également définir un lien qui contient le nom d'un répertoire, " +"comme \"FooBar/OtherPage\" pour spécifier plus précisément vers quelle page " +"il faut pointer. C'est le seul moyen de faire un lien vers une sous-page qui " +"n'est pas apparentée." + +#. type: Plain text +msgid "" +"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", " +"or from BazBar/SubPage to \"FooBar/SubPage\"." +msgstr "" +"Vous pouvez utiliser ceci pour, par exemple, faire un lien depuis BazBar " +"vers \"FooBar/SubPage\", ou de BazBar/SubPage vers \"FooBar/SubPage\"." + +#. type: Plain text +msgid "" +"You can also use \"/\" at the start of a link, to specify exactly which page " +"to link to, when there are multiple pages with similar names and the link " +"goes to the wrong page by default. For example, linking from \"FooBar/SubPage" +"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, " +"even if there is a \"FooBar/OtherPage\"." +msgstr "" +"Vous pouvez également utiliser \"/\" au début d'un lien pour indiquer " +"précisément quelle page doit être pointée lorsqu'il y a plusieurs pages avec " +"des noms identiques et que le lien ne pointe pas vers la bonne page par " +"défaut. Par exemple, faire un lien depuis \"FooBar/SubPage\" vers \"/" +"OtherPage\" pointera vers la page \"OtherPage\" à la racine du wiki même " +"s'il existe une page \"FooBar/OtherPage\"." + +#. type: Plain text +msgid "" +"Also, if the wiki is configured with a userdir, you can link to pages within " +"the userdir without specifying a path to them. This is to allow for easy " +"linking to a user's page in the userdir, to sign a comment. These links are " +"checked for last of all." +msgstr "" +"De plus, si le wiki est configuré avec un répertoire `userdir`, vous pouvez " +"facilement faire des liens vers les pages dans `userdir` sans spécifier le " +"chemin vers ces pages. Cela permet de facilement pointer vers la page d'un " +"utilisateur dans `userdir` pour signer un commentaire. La correspondance des " +"liens avec ces pages est testée en tout dernier lieu." diff --git a/po/underlays/basewiki/ikiwiki/wikilink.fr.po b/po/underlays/basewiki/ikiwiki/wikilink.fr.po new file mode 100644 index 000000000..ac464fb18 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/wikilink.fr.po @@ -0,0 +1,107 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-28 16:05+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"WikiLinks provide easy linking between pages of the wiki. To create a " +"[[WikiLink]], just put the name of the page to link to in double brackets. " +"For example `\\[[WikiLink]]`." +msgstr "" +"Un WikiLink est un moyen simple de lier des pages entre elles. Pour créer un " +"[[WikiLink]], il suffit de mettre le nom d'une page à lier entre double " +"crochets. Par exemple, `\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"If you ever need to write something like `\\[[WikiLink]]` without creating a " +"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`." +msgstr "" +"Si jamais vous avez besoin d'écrire quelque chose comme `\\[[WikiLink]]` " +"sans créer de lien, il suffit de préfixer le mot par une barre oblique `\\`, " +"comme `\\\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"There are some special [[SubPage/LinkingRules]] that come into play when " +"linking between [[SubPages|SubPage]]." +msgstr "" +"Quelques règles spéciales, [[SubPage/LinkingRules]], entrent en jeu pour " +"lier des sous-pages, [[SubPages|SubPage]]." + +#. type: Plain text +msgid "" +"Also, if the file linked to by a WikiLink looks like an image, it will be " +"displayed inline on the page." +msgstr "" +"De plus, quand le fichier pointé par un WikiLink ressemble à une image, il " +"est affiché au fil du texte sur la page." + +#. type: Plain text +msgid "" +"WikiLinks are matched with page names in a case-insensitive manner, so you " +"don't need to worry about getting the case the same, and can capitalise " +"links at the start of a sentence, and so on." +msgstr "" +"La recherche de correspondance entre WikiLinks et noms de page ne tient pas " +"compte de la casse des lettres. Inutile de s'embêter avec les majuscules et " +"les minuscules et vous pouvez mettre une lettre capitale au lien qui se " +"trouve en début de phrase, etc." + +#. type: Plain text +msgid "" +"It's also possible to write a WikiLink that uses something other than the " +"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the " +"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]." +msgstr "" +"Il est aussi possible d'écrire un WikiLink dont le texte n'est pas un nom de " +"page. Ainsi, `\\[[foo_bar|SandBox]]` pointe vers la page SandBox, mais le " +"lien apparaît comme ceci : [[foo_bar|SandBox]]." + +#. type: Plain text +msgid "" +"To link to an anchor inside a page, you can use something like `" +"\\[[WikiLink#foo]]` ." +msgstr "" +"Pour pointer vers une ancre à l'intérieur d'une page, vous pouvez utiliser " +"quelque chose comme `\\[[WikiLink#foo]]`." + +#. type: Title ## +#, no-wrap +msgid "Directives and WikiLinks" +msgstr "Directives et WikiLinks" + +#. type: Plain text +msgid "" +"ikiwiki has two syntaxes for [[directives|directive]]. The older syntax " +"used spaces to distinguish between directives and wikilinks; as a result, " +"with that syntax in use, you cannot use spaces in WikiLinks, and must " +"replace spaces with underscores. The newer syntax, enabled with the " +"`prefix_directives` option in an ikiwiki setup file, prefixes directives " +"with `!`, and thus does not prevent links with spaces. Future versions of " +"ikiwiki will turn this option on by default." +msgstr "" +"Il existe deux syntaxes pour les [[directives|directive]]. L'ancienne " +"syntaxe se sert d'espaces pour différencier les directives et les Wikilinks. " +"Ainsi, avec cette syntaxe, vous ne pouvez pas utiliser d'espaces dans les " +"WikiLinks et vous devez les remplacer par des tirets bas `_`. La nouvelle " +"syntaxe, activée par l'option `prefix_directives` dans le fichier de " +"configuration d'ikiwiki, préfixe les directives par un `!`, ce qui permet " +"l'utilisation d'espaces dans les liens. Dans les futures versions d'ikiwiki, " +"cette option sera activée par défaut." diff --git a/po/underlays/basewiki/index.fr.po b/po/underlays/basewiki/index.fr.po new file mode 100644 index 000000000..c63ce98cd --- /dev/null +++ b/po/underlays/basewiki/index.fr.po @@ -0,0 +1,26 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-23 18:50+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Plain text +msgid "Welcome to your new wiki." +msgstr "Bienvenue sur votre nouveau wiki." + +#. type: Plain text +msgid "All wikis are supposed to have a [[SandBox]], so this one does too." +msgstr "Comme tous les wikis, ce wiki possède une page [[SandBox]]." + +#. type: Plain text +msgid "This wiki is powered by [[ikiwiki]]." +msgstr "Ce wiki est propulsé par [[ikiwiki]]." diff --git a/po/underlays/basewiki/recentchanges.fr.po b/po/underlays/basewiki/recentchanges.fr.po new file mode 100644 index 000000000..8f12155bb --- /dev/null +++ b/po/underlays/basewiki/recentchanges.fr.po @@ -0,0 +1,37 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: Ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-23 09:32+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"RecentChanges\"]]\n" +msgstr "[[!meta title=\"RecentChanges\"]]\n" + +#. type: Plain text +msgid "Recent changes to this wiki:" +msgstr "Dernières modifications :" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" +msgstr "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" diff --git a/po/underlays/basewiki/sandbox.fr.po b/po/underlays/basewiki/sandbox.fr.po new file mode 100644 index 000000000..ab24b8c7a --- /dev/null +++ b/po/underlays/basewiki/sandbox.fr.po @@ -0,0 +1,88 @@ +# Traduction de ikiwiki +# Copyright (C)2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-26 21:07+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: french \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +msgid "" +"This is the SandBox, a page anyone can edit to learn how to use the wiki." +msgstr "Voici le bac à sable, une page que tout le monde peut éditer pour apprendre à se servir du wiki." + +#. type: Plain text +msgid "Here's a paragraph." +msgstr "Voici un paragraphe." + +#. type: Plain text +msgid "Here's another one with *emphasised* text." +msgstr "Un autre avec du texte en *italique*." + +#. type: Title # +#, no-wrap +msgid "Header" +msgstr "Titre" + +#. type: Title ## +#, no-wrap +msgid "Subheader" +msgstr "Sous-titre" + +#. type: Plain text +#, no-wrap +msgid "" +"> This is a blockquote.\n" +">\n" +"> This is the first level of quoting.\n" +">\n" +"> > This is nested blockquote.\n" +">\n" +"> Back to the first level.\n" +msgstr "" +"> Un bloc de citation.\n" +">\n" +"> Le premier niveau de citation.\n" +">\n" +"> > Une citation imbriquée.\n" +">\n" +"> Retour au premier niveau.\n" + +#. type: Plain text +msgid "Numbered list" +msgstr "Liste numérotée" + +#. type: Bullet: '1. ' +msgid "First item." +msgstr "Premier élément." + +#. type: Bullet: '1. ' +msgid "Another." +msgstr "Un autre." + +#. type: Bullet: '1. ' +msgid "And another.." +msgstr "Encore un autre..." + +#. type: Plain text +msgid "Bulleted list" +msgstr "Liste avec point" + +#. type: Bullet: '* ' +msgid "*item*" +msgstr "*élement*" + +#. type: Bullet: '* ' +msgid "item" +msgstr "élement" + +#. type: Plain text +msgid "[[ikiwiki/WikiLink]]" +msgstr "[[ikiwiki/WikiLink]]" diff --git a/po/underlays/basewiki/shortcuts.fr.po b/po/underlays/basewiki/shortcuts.fr.po new file mode 100644 index 000000000..3849918e4 --- /dev/null +++ b/po/underlays/basewiki/shortcuts.fr.po @@ -0,0 +1,224 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-26 13:39-0300\n" +"PO-Revision-Date: 2009-08-26 21:17+0200\n" +"Last-Translator: Philippe Batailler \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"This wiki has shortcuts **enabled**.\"\n" +" else=\"This wiki has shortcuts **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"Les raccourcis sont **activés** dans ce wiki.\"\n" +" else=\"Les raccourcis sont **désactivés** dans ce wiki.\"]]\n" + +#. type: Plain text +msgid "Some examples of using shortcuts include:" +msgstr "Voici quelques exemples de raccourcis :" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n" +msgstr "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tConsultez la \\[[!cia ikiwiki desc=\"page du projet CIA pour %s\"]].\n" + +#. type: Plain text +msgid "This page controls what shortcut links the wiki supports." +msgstr "Cette page définit les raccourcis connus par ce wiki." + +#. type: Bullet: '* ' +msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]" +msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" +msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]" +msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]" +msgstr "" +"[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" +msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]" +msgstr "" +"[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc=" +"\"debian-%s@lists.debian.org\"]]" +msgstr "" +"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc=" +"\"debian-%s@lists.debian.org\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" +msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]" +msgstr "" +"[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s" +"\"]]" +msgstr "" +"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s" +"\"]]" + +#. type: Plain text +#, no-wrap +msgid "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`. See http://snapshot.debian.net for details.\n" +"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n" +"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n" +"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n" +"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n" +"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n" +"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n" +"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n" +"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n" +"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n" +"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n" +"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n" +"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n" +"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n" +"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n" +"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n" +"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n" +"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n" +"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n" +"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n" +"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n" +"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n" +"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n" +"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n" +"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n" +"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n" +"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n" +"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n" +"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n" +"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n" +"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n" +"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n" +"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n" +msgstr "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Usage : `\\[[!debss package]]`, `\\[[!debss package#version]]`, ou `\\[[!debss package/version]]`. Consultez http://snapshot.debian.net pour d'autres précisions.\n" +"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n" +"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n" +"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n" +"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n" +"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\\\"Linux bug #%s\"]]\n" +"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n" +"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n" +"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n" +"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n" +"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n" +"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n" +"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n" +"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n" +"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n" +"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n" +"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n" +"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n" +"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n" +"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n" +"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n" +"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n" +"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n" +"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n" +"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n" +"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n" +"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n" +"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n" +"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n" +"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n" +"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n" +"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n" +"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n" + +#. type: Plain text +msgid "" +"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, " +"\"%s\" is replaced with the text passed to the named shortcut, after [[!" +"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded " +"text. The optional `desc` parameter controls the description of the link." +msgstr "" +"Pour ajouter un raccourci, utilisez la [[ikiwiki/directive]] `shortcut`. " +"Dans l'URL, \"%s\" est remplacé par le texte passé au raccourci, après " +"l'avoir codé [[!\"wikipedia url_encoding]], et le \"%S\" est remplacé par le " +"texte brut, non codé. La paramètre facultatif `desc` contrôle la description " +"du lien." + +#. type: Plain text +msgid "" +"Remember that the `name` you give the shortcut will become a new [[ikiwiki/" +"directive]]. Avoid using a `name` that conflicts with an existing " +"directive. These directives also accept a `desc` parameter that will " +"override the one provided at definition time." +msgstr "" +"N'oubliez pas que le paramètre `name` donné au raccourci devient une " +"nouvelle [[ikiwiki/directive]]. Évitez de donner un nom qui entre en conflit " +"avec une directive existante. Ces directives acceptent aussi un paramètre " +"`desc` qui primera celui fourni au moment de la définition du raccourci." + +#. type: Plain text +msgid "" +"If you come up with a shortcut that you think others might find useful, " +"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://" +"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include " +"your shortcut in the standard underlay." +msgstr "" +"Si vous trouvez un raccourci qui vous paraît utile, proposez-le sur la [page " +"des raccourcis du wiki d'ikiwiki](http://ikiwiki.info/shortcuts/). Ainsi les " +"futures versions d'ikiwiki incluront automatiquement ce raccourci." diff --git a/po/underlays/basewiki/templates.fr.po b/po/underlays/basewiki/templates.fr.po new file mode 100644 index 000000000..3321cc597 --- /dev/null +++ b/po/underlays/basewiki/templates.fr.po @@ -0,0 +1,241 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-23 21:20+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bits\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(template)\"\n" +"then=\"This wiki has templates **enabled**.\"\n" +"else=\"This wiki has templates **disabled**.\"\n" +"]]\n" +msgstr "" +"[[!if test=\"enabled(template)\"\n" +"then=\"Les modèles sont **activés** dans ce wiki.\"\n" +"else=\"Les modèles sont **désactivés** dans ce wiki.\"\n" +"]]\n" + +#. type: Plain text +msgid "" +"Templates are files that can be filled out and inserted into pages in the " +"wiki." +msgstr "" +"Les modèles sont des fichiers pouvant être remplis et insérés dans les pages " +"du wiki." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" + +#. type: Plain text +msgid "" +"These templates are available for inclusion onto other pages in this wiki:" +msgstr "Ces modèles peuvent être insérés dans d'autres pages de ce wiki :" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" +msgstr "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" + +#. type: Title ## +#, no-wrap +msgid "Using a template" +msgstr "Utiliser un modèle" + +#. type: Plain text +msgid "Using a template works like this:" +msgstr "Voici comment fonctionne un modèle :" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n" +msgstr "\t\\[[!template id=note text=\"\"\"Ici se trouve le texte à insérer dans ma note.\"\"\"]]\n" + +#. type: Plain text +msgid "" +"This fills out the [[note]] template, filling in the `text` field with the " +"specified value, and inserts the result into the page." +msgstr "" +"Ceci remplit le modèle [[note]], remplaçant le champ `text` par la valeur " +"spécifiée, et insérant le résultat dans la page." + +#. type: Plain text +msgid "" +"Generally, a value can include any markup that would be allowed in the wiki " +"page outside the template. Triple-quoting the value even allows quotes to be " +"included in it. Combined with multi-line quoted values, this allows for " +"large chunks of marked up text to be embedded into a template:" +msgstr "" +"Généralement, une valeur peut inclure n'importe quelle balise qui serait " +"autorisée dans les pages du wiki. Tripler les guillemets autour de la valeur " +"permet même d'y inclure des guillemets. Ainsi, avec des valeurs sur " +"plusieurs lignes, de larges morceaux de texte mis en forme peuvent être " +"intégrés dans un modèle :" + +#. type: Plain text +#, no-wrap +msgid " \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n" +msgstr " \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "\\[[Charley]]'s sister." +msgstr "soeur de \\[[Charley]]." + +#. type: Bullet: ' * ' +msgid "\"I want to be an astronaut when I grow up.\"" +msgstr "\"Je veux devenir une astronaute lorsque je serai grande.\"" + +#. type: Bullet: ' * ' +msgid "Really 8 and a half." +msgstr "Réellement 8 ans et demi." + +#. type: Title ## +#, no-wrap +msgid "Creating a template" +msgstr "Créer un modèle" + +#. type: Plain text +msgid "" +"To create a template, simply add a template directive to a page, and the " +"page will provide a link that can be used to create the template. The " +"template is a regular wiki page, located in the `templates/` subdirectory " +"inside the source directory of the wiki." +msgstr "" +"Pour créer un modèle, ajoutez simplement une directive `template` à une " +"page. La page fournira alors un lien qui peut être utilisé pour créer le " +"modèle. Le modèle est une page de wiki régulière, enregistrée dans le sous-" +"répertoire `templates/` du répertoire source du wiki." + +#. type: Plain text +msgid "" +"The template uses the syntax used by the [[!cpan HTML::Template]] perl " +"module, which allows for some fairly complex things to be done. Consult its " +"documentation for the full syntax, but all you really need to know are a few " +"things:" +msgstr "" +"Le modèle utilise la syntaxe définie par le module perl [[!cpan HTML::" +"Template]], qui permet de faire des choses plutôt complexes. Consultez sa " +"documentation pour obtenir la syntaxe complète. Cependant, vous n'avez " +"réellement besoin que de quelques informations :" + +#. type: Bullet: '* ' +msgid "" +"Each parameter you pass to the template directive will generate a template " +"variable. There are also some pre-defined variables like PAGE and BASENAME." +msgstr "" +"Chaque paramètre que vous donnez à la directive `template` générera une " +"variable dans le modèle. Il y a en plus quelques variables prédéfinies comme " +"PAGE et BASENAME." + +#. type: Bullet: '* ' +msgid "" +"To insert the value of a variable, use ``. Wiki markup in " +"the value will first be converted to html." +msgstr "" +"Pour insérer la valeur d'une variable, utilisez ``. La " +"syntaxe wiki dans la valeur sera d'abord transformée en html." + +#. type: Bullet: '* ' +msgid "" +"To insert the raw value of a variable, with wiki markup not yet converted to " +"html, use ``." +msgstr "" +"Pour insérer la valeur brute d'une variable, sans que la syntaxe wiki soit " +"convertie en html, utilisez ``." + +#. type: Bullet: '* ' +msgid "" +"To make a block of text conditional on a variable being set use `text`." +msgstr "" +"Pour écrire un bloc de texte si une variable est définie, utilisez `texte`." + +#. type: Bullet: '* ' +msgid "" +"To use one block of text if a variable is set and a second if it's not, use " +"`textother text`" +msgstr "" +"Pour utiliser un bloc de texte si une variable est définie et un autre dans " +"le cas contraire, utilisez `texteautre " +"texte`" + +#. type: Plain text +msgid "Here's a sample template:" +msgstr "Voici un exemple de modèle :" + +#. type: Plain text +#, no-wrap +msgid "" +" \n" +" Name: \\[[]]
    \n" +" Age:
    \n" +" \n" +" Favorite color:
    \n" +" \n" +" No favorite color.
    \n" +"
    \n" +" \n" +"
    \n" +" \n" +"
    \n" +"
    \n" +msgstr "" +" \n" +" Nom : \\[[]]
    \n" +" Age :
    \n" +" \n" +" Couleur favorite :
    \n" +" \n" +" Pas de couleur favorite.
    \n" +"
    \n" +" \n" +"
    \n" +" \n" +"
    \n" +"
    \n" + +#. type: Plain text +msgid "" +"The filled out template will be formatted the same as the rest of the page " +"that contains it, so you can include WikiLinks and all other forms of wiki " +"markup in the template. Note though that such WikiLinks will not show up as " +"backlinks to the page that uses the template." +msgstr "" +"Le modèle rempli sera mis en forme comme le reste de la page qui le " +"contient. Vous pouvez donc inclure des WikiLinks et toutes les autres formes " +"de balises wiki dans les modèles. Notez cependant que de tels WikiLinks " +"n'apparaîtront pas dans les BackLinks de la page qui utilise le modèle." + +#. type: Plain text +msgid "" +"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This " +"ensures that if the name contains something that might be mistaken for wiki " +"markup, it's not converted to html before being processed as a [[ikiwiki/" +"WikiLink]]." +msgstr "" +"Notez l'utilisation de \"raw_name\" à l'intérieur du générateur de [[ikiwiki/" +"WikiLink]]. Cela assure que si le nom contient quelque chose pouvant être " +"confondu avec une balise wiki, alors il n'est pas converti en html avant " +"d'être traité comme un [[ikiwiki/WikiLink]]." diff --git a/po/underlays/basewiki/templates/note.fr.po b/po/underlays/basewiki/templates/note.fr.po new file mode 100644 index 000000000..b02e62e3b --- /dev/null +++ b/po/underlays/basewiki/templates/note.fr.po @@ -0,0 +1,40 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-24 00:18+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: ENCODING\n" + +#. type: Plain text +#, no-wrap +msgid "" +"
    \n" +"\n" +"
    \n" +"\n" +"Use this template to insert a note into a page. The note will be styled to\n" +"float to the right of other text on the page. This template has one\n" +"parameter:\n" +"
      \n" +"
    • `text` - the text to display in the note\n" +"
    \n" +"
    \n" +msgstr "" +"
    \n" +"\n" +"
    \n" +"\n" +"Utilisez ce modèle pour insérer une note dans une page. La note sera placée à la droite du texte de la page. Ce modèle possède un paramètre :\n" +"
      \n" +"
    • `text` - le texte à afficher dans la note\n" +"
    \n" +"
    \n" diff --git a/po/underlays/basewiki/templates/popup.fr.po b/po/underlays/basewiki/templates/popup.fr.po new file mode 100644 index 000000000..d2cd29118 --- /dev/null +++ b/po/underlays/basewiki/templates/popup.fr.po @@ -0,0 +1,46 @@ +# Traduction de ikiwiki +# Copyright (C) 2009 Debian French l10n team +# This file is distributed under the same license as the PACKAGE Ikiwiki. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-24 10:27+0200\n" +"Last-Translator: Alexandre Dupas \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: ENCODING\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\n" +"Use this template to create a popup window that is displayed when the mouse\n" +"is over part of the page. This template has two parameters:\n" +"
      \n" +"
    • `mouseover` - This is the text or other content that triggers the\n" +"popup.\n" +"
    • `popup` - This should be the content of the popup window. It can be\n" +"anything, even images or a whole little wiki page, but should not be too\n" +"large for good usability.\n" +"
    \n" +"Note that browsers that do not support the CSS will display the popup\n" +"inline in the page, inside square brackets.\n" +"
    \n" +"\n" +"[]\n" +"\n" +msgstr "" +"\n" +"Utilisez ce modèle pour créer un popup qui est affiché lorsque la souris est au dessus d'une partie de la page. Ce modèle possède deux paramètres :\n" +"
      \n" +"
    • `mouseover` - Ce paramètre indique le contenu (texte ou autre) qui déclenche le popup.\n" +"
    • `popup` - Ce paramètre est le contenu du popup. Il peut être quelconque, aussi bien des images qu'une page de wiki complète, mais ne doit pas être trop grand pour une bonne utilisabilité.\n" +"
    \n" +"Notez que les navigateurs qui ne gèrent pas les feuilles de style CSS afficheront le popup au fil du texte dans la page, entre crochets.\n" +"
    \n" +"\n" +"[]\n" +"\n" -- cgit v1.2.3 From 55474f44d93ffb35f650ab8ba8b32f4478eba1c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Sep 2009 15:17:39 -0400 Subject: Expand banned_users; it can now include PageSpecs, which allows banning by IP address. --- IkiWiki/CGI.pm | 28 +++++++++++++++++++++------- debian/changelog | 2 ++ doc/banned_users.mdwn | 8 +++++++- doc/todo/blocking_ip_ranges.mdwn | 3 +++ 4 files changed, 33 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index af58d7cb5..52cafade0 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -252,16 +252,30 @@ sub check_banned ($$) { my $q=shift; my $session=shift; + my $banned=0; my $name=$session->param("name"); - if (defined $name) { - if (grep { $name eq $_ } @{$config{banned_users}}) { - $session->delete(); - cgi_savesession($session); - cgi_custom_failure( - $q->header(-status => "403 Forbidden"), - gettext("You are banned.")); + if (defined $name && + grep { $name eq $_ } @{$config{banned_users}}) { + $banned=1; + } + + foreach my $b (@{$config{banned_users}}) { + if (pagespec_match("", $b, + ip => $ENV{REMOTE_ADDR}, + name => defined $name ? $name : "", + )) { + $banned=1; + last; } } + + if ($banned) { + $session->delete(); + cgi_savesession($session); + cgi_custom_failure( + $q->header(-status => "403 Forbidden"), + gettext("You are banned.")); + } } sub cgi_getsession ($) { diff --git a/debian/changelog b/debian/changelog index 6109a7012..86e8513f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * Add French basewiki translation from the Debian French l10n team, including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello. + * Expand banned_users; it can now include PageSpecs, which + allows banning by IP address. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 diff --git a/doc/banned_users.mdwn b/doc/banned_users.mdwn index d2bec90f0..c44f8c587 100644 --- a/doc/banned_users.mdwn +++ b/doc/banned_users.mdwn @@ -1,4 +1,10 @@ -Banned users can be configured in the setup file. +Banned users can be configured in the setup file via the `banned_users` +setting. This is a list of user names, or [[PageSpecs|ikiwiki/PageSpec]] +to ban. Using a PageSpec is useful to block an IP address. + +For example: + + banned_users => ['evilspammer', 'ip(192.168.1.1)'], If a banned user attempts to use the ikiwiki CGI, they will receive a 403 Forbidden webpage indicating they are banned. diff --git a/doc/todo/blocking_ip_ranges.mdwn b/doc/todo/blocking_ip_ranges.mdwn index 95026eef1..ac2344ece 100644 --- a/doc/todo/blocking_ip_ranges.mdwn +++ b/doc/todo/blocking_ip_ranges.mdwn @@ -2,3 +2,6 @@ Admins need the ability to block IP ranges. They can already ban users. See [[fileupload]] for a propsal that grew to encompass the potential to do this. + +[[done]] (well, there is no pagespec for IP ranges yet, but we can block +individual IPs) -- cgit v1.2.3 From 2a99ebf2766a08f8d68a82255d1518ecac73ec84 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Sep 2009 17:27:37 -0400 Subject: underlay: Also allow configuring additional directories to search for template files in. --- IkiWiki.pm | 10 +++++++++- IkiWiki/Plugin/underlay.pm | 11 +++++++++-- debian/changelog | 2 ++ doc/plugins/underlay.mdwn | 8 +++++++- 4 files changed, 27 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 01898936f..2f11069c6 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -150,6 +150,13 @@ sub getsetup () { safe => 0, # path rebuild => 1, }, + templatedirs => { + type => "internal", + default => [], + description => "additional directories containing template files", + safe => 0, + rebuild => 0, + }, underlaydir => { type => "string", default => "$installdir/share/ikiwiki/basewiki", @@ -1610,7 +1617,8 @@ sub saveindex () { sub template_file ($) { my $template=shift; - foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") { + foreach my $dir ($config{templatedir}, @{$config{templatedirs}}, + "$installdir/share/ikiwiki/templates") { return "$dir/$template" if -e "$dir/$template"; } return; diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm index 380d418fb..c59935672 100644 --- a/IkiWiki/Plugin/underlay.pm +++ b/IkiWiki/Plugin/underlay.pm @@ -27,14 +27,21 @@ sub getsetup () { safe => 0, rebuild => 1, }, + add_templates => { + type => "string", + default => [], + description => "extra template directories to add", + advanced => 1, + safe => 0, + rebuild => 1, + }, } sub checkconfig () { - return unless exists $config{add_underlays}; - foreach my $dir (@{$config{add_underlays}}) { add_underlay($dir); } + push @{$config{templatedirs}}, @{$config{add_templates}}; } 1; diff --git a/debian/changelog b/debian/changelog index 86e8513f7..de165e4ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello. * Expand banned_users; it can now include PageSpecs, which allows banning by IP address. + * underlay: Also allow configuring additional directories to search + for template files in. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 diff --git a/doc/plugins/underlay.mdwn b/doc/plugins/underlay.mdwn index 09d096a6e..f7eafee7c 100644 --- a/doc/plugins/underlay.mdwn +++ b/doc/plugins/underlay.mdwn @@ -1,7 +1,7 @@ [[!template id=plugin name=underlay author="[[Simon_McVittie|smcv]]"]] [[!tag type/useful]] -This plugin adds an `add_underlays` option to the `.setup` file. +This plugin adds an `add_underlays` option to the setup file. Its value is a list of underlay directories whose content is added to the wiki. Multiple underlays are normally set up automatically by other plugins (for @@ -12,3 +12,9 @@ like photos or software releases. Directories in `add_underlays` should usually be absolute. If relative, they're interpreted as relative to the parent directory of the basewiki underlay, which is probably not particularly useful in this context. + +-- + +This plugin also adds an `add_templates` option to the setup file. +Its value is a list of template directories to look for template files in, +if they are not present in the `templatedir`. -- cgit v1.2.3 From 98ed7cb1d7f99790821b99b3779d6685114fa662 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Sep 2009 13:32:13 -0400 Subject: Fix parsing web commits from ipv6 addresses. I weakended the regexp, so this matches ipv6 addresses too. It does not ensure that the address is valid, but that should not matter here. Note that addresses ending in "::" are not matched, so eg, the unspecified address will not match -- but should never appear here anyway. --- IkiWiki.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 2f11069c6..187d40a3a 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -364,7 +364,7 @@ sub getsetup () { }, web_commit_regexp => { type => "internal", - default => qr/^web commit (by (.*?(?=: |$))|from (\d+\.\d+\.\d+\.\d+)):?(.*)/, + default => qr/^web commit (by (.*?(?=: |$))|from ([0-9a-fA-F:.]+[0-9a-fA-F])):?(.*)/, description => "regexp to parse web commits from logs", safe => 0, rebuild => 0, diff --git a/debian/changelog b/debian/changelog index de165e4ff..2e1781713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low allows banning by IP address. * underlay: Also allow configuring additional directories to search for template files in. + * Fix parsing web commits from ipv6 addresses. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 -- cgit v1.2.3 From 3ebd4e0b45a8a6bd4c12604a3bb683dcb3a60eb8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Sep 2009 14:04:46 -0400 Subject: Add genwrapper hook, that can be used to add code into the C wrapper. --- IkiWiki/Plugin/skeleton.pm.example | 5 +++++ IkiWiki/Wrapper.pm | 8 ++++---- debian/changelog | 1 + doc/plugins/write.mdwn | 7 +++++++ 4 files changed, 17 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index 573510191..ddf2996d6 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -39,6 +39,7 @@ sub import { hook(type => "renamepage", id => "skeleton", call => \&renamepage); hook(type => "rename", id => "skeleton", call => \&rename); hook(type => "savestate", id => "skeleton", call => \&savestate); + hook(type => "genwrapper", id => "skeleton", call => \&genwrapper); } sub getopt () { @@ -239,4 +240,8 @@ sub savestate () { debug("skeleton plugin running in savestate"); } +sub genwrapper () { + debug("skeleton plugin running in genwrapper"); +} + 1 diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 6555fe625..cf85738d6 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -38,11 +38,12 @@ sub gen_wrapper () { EOF } - my $test_receive=""; if ($config{test_receive}) { require IkiWiki::Receive; - $test_receive=IkiWiki::Receive::gen_wrapper(); } + + my @wrapper_hooks; + run_hooks(genwrapper => sub { push @wrapper_hooks, shift->() }); my $check_commit_hook=""; my $pre_exec=""; @@ -120,7 +121,7 @@ int main (int argc, char **argv) { char *s; $check_commit_hook -$test_receive +@wrapper_hooks $envsave newenviron[i++]="HOME=$ENV{HOME}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; @@ -144,7 +145,6 @@ $pre_exec exit(1); } EOF - close OUT; my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc'; if (system($cc, "$wrapper.c", "-o", "$wrapper.new") != 0) { diff --git a/debian/changelog b/debian/changelog index 2e1781713..488aef866 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * underlay: Also allow configuring additional directories to search for template files in. * Fix parsing web commits from ipv6 addresses. + * Add genwrapper hook, that can be used to add code into the C wrapper. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 3976f9adf..668f8d8b6 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -496,6 +496,13 @@ describes the plugin as a whole. For example: and undef if a rebuild could be needed in some circumstances, but is not strictly required. +### genwrapper + + hook(type => "genwrapper", id => "foo", call => \&genwrapper); + +This hook is used to inject C code (which it returns) into the `main` +function of the ikiwiki wrapper when it is being generated. + ## Plugin interface To import the ikiwiki plugin interface: -- cgit v1.2.3 From f2f3fe8a18dabcaf6acbfbfe927e07e8d9df5a25 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Sep 2009 16:34:45 -0400 Subject: changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 488aef866..1aa6c1c11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low for template files in. * Fix parsing web commits from ipv6 addresses. * Add genwrapper hook, that can be used to add code into the C wrapper. + * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by + Amitai Schlair. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 -- cgit v1.2.3 From 3b8673dbb20251bda898da4095bc2d5b1d84f482 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Sep 2009 16:40:36 -0400 Subject: add libfile-chdir-perl to build depends This is needed for the cvs plugin to load, which is needed for the setup file to include config stanzas for that plugin. --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 96ba221ff..5a0acf4c4 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,8 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, - libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34) + libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34), + libfile-chdir-perl Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.1 -- cgit v1.2.3 From 06c712a7f0c75da344da43cd6030924b856a9439 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 10 Sep 2009 17:07:21 -0400 Subject: update --- debian/copyright | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index b06d27f19..8f7d65322 100644 --- a/debian/copyright +++ b/debian/copyright @@ -164,3 +164,28 @@ License: GPL-2+ 118 Turnpike Rd., Southboro, MA 01772. . Republished with permission. + +Files: cvs.pm +Copyright: © 2009 Amitai Schlair +License: BSD-C2 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + THIS SOFTWARE IS PROVIDED BY IKIWIKI AND CONTRIBUTORS ``AS IS'' + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. -- cgit v1.2.3 From 245147312d83be2293b485871a48df055cf2c6d6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 11 Sep 2009 14:46:03 -0400 Subject: Updated Czech translation from Miroslav Kure. Closes: #546223 --- debian/changelog | 1 + po/cs.po | 446 ++++++++++++++++++++++++++----------------------------- 2 files changed, 214 insertions(+), 233 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1aa6c1c11..612792b86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * Add genwrapper hook, that can be used to add code into the C wrapper. * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by Amitai Schlair. + * Updated Czech translation from Miroslav Kure. Closes: #546223 -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 diff --git a/po/cs.po b/po/cs.po index 398a14211..0248d5f18 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,14 +1,14 @@ # Czech translation of ikiwiki. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the ikiwiki package. -# Miroslav Kure , 2007. +# Miroslav Kure , 2007-2009. # msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-08-30 15:25-0400\n" -"PO-Revision-Date: 2007-05-09 21:21+0200\n" +"PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -24,6 +24,8 @@ msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" +"pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale E" +"zkoušíte se přihlásit přes http a ne přes https" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" @@ -31,7 +33,7 @@ msgstr "přihlášení selhalo; možná si musíte povolit cookies?" #: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 msgid "Your login session has expired." -msgstr "" +msgstr "Vaše sezení expirovalo." #: ../IkiWiki/CGI.pm:189 msgid "Login" @@ -59,11 +61,11 @@ msgstr "Chyba" #: ../IkiWiki/Plugin/aggregate.pm:84 msgid "Aggregation triggered via web." -msgstr "" +msgstr "Agregace spuštěna přes web." #: ../IkiWiki/Plugin/aggregate.pm:93 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "" +msgstr "Není třeba nic dělat, všechny kanály jsou aktuální!" #: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format @@ -72,7 +74,7 @@ msgstr "chybí parametr %s" #: ../IkiWiki/Plugin/aggregate.pm:255 msgid "new feed" -msgstr "nový zdroj" +msgstr "nový kanál" #: ../IkiWiki/Plugin/aggregate.pm:269 msgid "posts" @@ -95,35 +97,35 @@ msgstr "expiruji %s" #: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" -msgstr "" +msgstr "poslední kontrola %s" #: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." -msgstr "kontroluji zdroj %s ..." +msgstr "kontroluji kanál %s ..." #: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" -msgstr "nemohu najít zdroj na %s" +msgstr "nemohu najít kanál na %s" #: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" -msgstr "zdroj nebyl nalezen" +msgstr "kanál nebyl nalezen" #: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" -msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)" +msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)" #: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" -msgstr "" +msgstr "(entity byly v kanálu zakódovány)" #: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" -msgstr "zdroj shodil XML::Feed!" +msgstr "kanál shodil XML::Feed!" #: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format @@ -132,7 +134,7 @@ msgstr "vytvářím novou stránku %s" #: ../IkiWiki/Plugin/amazon_s3.pm:31 msgid "deleting bucket.." -msgstr "" +msgstr "mažu bucket..." #: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 msgid "done" @@ -141,54 +143,53 @@ msgstr "hotovo" #: ../IkiWiki/Plugin/amazon_s3.pm:97 #, perl-format msgid "Must specify %s" -msgstr "" +msgstr "Musíte zadat %s" #: ../IkiWiki/Plugin/amazon_s3.pm:136 -#, fuzzy msgid "Failed to create S3 bucket: " -msgstr "Nepodařilo se odeslat email." +msgstr "Nepodařilo se vytvořit S3 bucket:" #: ../IkiWiki/Plugin/amazon_s3.pm:221 -#, fuzzy msgid "Failed to save file to S3: " -msgstr "Nepodařilo se odeslat email." +msgstr "Nepodařilo se uložit soubor na S3:" #: ../IkiWiki/Plugin/amazon_s3.pm:243 -#, fuzzy msgid "Failed to delete file from S3: " -msgstr "nelze změnit velikost: %s" +msgstr "Nelze smazat soubor z S3:" #: ../IkiWiki/Plugin/attachment.pm:49 #, perl-format msgid "there is already a page named %s" -msgstr "" +msgstr "stránka nazvaná %s již existuje" #: ../IkiWiki/Plugin/attachment.pm:65 msgid "prohibited by allowed_attachments" -msgstr "" +msgstr "zakázáno proměnnou allowed_attachments" #: ../IkiWiki/Plugin/attachment.pm:140 msgid "bad attachment filename" -msgstr "" +msgstr "chybné jméno souboru s přílohou" #: ../IkiWiki/Plugin/attachment.pm:182 msgid "attachment upload" -msgstr "" +msgstr "příloha nahrána" #: ../IkiWiki/Plugin/autoindex.pm:105 msgid "automatic index generation" -msgstr "" +msgstr "automatické vytváření indexu" #: ../IkiWiki/Plugin/blogspam.pm:108 msgid "" "Sorry, but that looks like spam to blogspam: " msgstr "" +"Je mi líto, ale podle blogspam to " +"vypadá jako spam: " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format msgid "%s from %s" -msgstr "" +msgstr "%s z %s" #: ../IkiWiki/Plugin/brokenlinks.pm:50 msgid "There are no broken links!" @@ -197,88 +198,88 @@ msgstr "Žádné porušené odkazy!" #: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" -msgstr "" +msgstr "nepodporovaný formát stránky %s" #: ../IkiWiki/Plugin/comments.pm:129 msgid "comment must have content" -msgstr "" +msgstr "komentář musí mít obsah" #: ../IkiWiki/Plugin/comments.pm:185 msgid "Anonymous" -msgstr "" +msgstr "Anonym" #: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" -msgstr "" +msgstr "chybný název stránky" #: ../IkiWiki/Plugin/comments.pm:345 -#, fuzzy, perl-format +#, perl-format msgid "commenting on %s" -msgstr "vytvářím %s" +msgstr "komentář k %s" #: ../IkiWiki/Plugin/comments.pm:363 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" -msgstr "" +msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat" #: ../IkiWiki/Plugin/comments.pm:370 #, perl-format msgid "comments on page '%s' are closed" -msgstr "" +msgstr "komentáře na stránce „%s“ jsou uzamčeny" #: ../IkiWiki/Plugin/comments.pm:464 msgid "comment stored for moderation" -msgstr "" +msgstr "komentář uložen pro schválení" #: ../IkiWiki/Plugin/comments.pm:466 msgid "Your comment will be posted after moderator review" -msgstr "" +msgstr "Váš komentář bude zobrazen po schválení moderátorem" #: ../IkiWiki/Plugin/comments.pm:479 msgid "Added a comment" -msgstr "" +msgstr "Přidán komentář" #: ../IkiWiki/Plugin/comments.pm:483 #, perl-format msgid "Added a comment: %s" -msgstr "" +msgstr "Přidán komentář: %s" #: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" -msgstr "" +msgstr "nejste přihlášeni jako správce" #: ../IkiWiki/Plugin/comments.pm:576 msgid "Comment moderation" -msgstr "" +msgstr "Schvalování komentářů" #: ../IkiWiki/Plugin/comments.pm:615 msgid "comment moderation" -msgstr "" +msgstr "schvalování komentářů" #: ../IkiWiki/Plugin/comments.pm:766 msgid "Comments" -msgstr "" +msgstr "Komentáře" #: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 #: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" -msgstr "parametr %s je vyžadován" +msgstr "parametr %s je povinný" #: ../IkiWiki/Plugin/cutpaste.pm:66 msgid "no text was copied in this page" -msgstr "" +msgstr "na této stránce nebyl zkopírován žádný text" #: ../IkiWiki/Plugin/cutpaste.pm:69 #, perl-format msgid "no text was copied in this page with id %s" -msgstr "" +msgstr "na této stránce nebyl zkopírován žádný text s id %s" #: ../IkiWiki/Plugin/editpage.pm:40 -#, fuzzy, perl-format +#, perl-format msgid "removing old preview %s" -msgstr "odstraňuji starou stránku %s" +msgstr "odstraňuji starý náhled %s" #: ../IkiWiki/Plugin/editpage.pm:113 #, perl-format @@ -298,77 +299,72 @@ msgid "editing %s" msgstr "upravuji %s" #: ../IkiWiki/Plugin/edittemplate.pm:51 -#, fuzzy msgid "template not specified" -msgstr "šablona %s nebyla nalezena" +msgstr "nebyl zadán parametr template" #: ../IkiWiki/Plugin/edittemplate.pm:54 -#, fuzzy msgid "match not specified" -msgstr "jméno souboru s obalem nebylo zadáno" +msgstr "nebyl zadán parametr match" #: ../IkiWiki/Plugin/edittemplate.pm:62 #, perl-format msgid "edittemplate %s registered for %s" -msgstr "" +msgstr "edittemplate %s byla zaregistrována pro %s" #: ../IkiWiki/Plugin/edittemplate.pm:133 -#, fuzzy msgid "failed to process" -msgstr "nepodařilo se zpracovat:" +msgstr "nepodařilo se zpracovat" #: ../IkiWiki/Plugin/format.pm:20 msgid "must specify format and text" -msgstr "" +msgstr "musíte zadat formát a text" #: ../IkiWiki/Plugin/fortune.pm:27 msgid "fortune failed" msgstr "fortune selhal" #: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 -#, fuzzy msgid "missing page" -msgstr "chybí hodnoty" +msgstr "chybějící stránka" #: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." -msgstr "" +msgstr "Stránka %s neexistuje." #: ../IkiWiki/Plugin/getsource.pm:73 -#, fuzzy msgid "not a page" -msgstr "nemohu číst %s: %s" +msgstr "není stránkou" #: ../IkiWiki/Plugin/getsource.pm:75 -#, fuzzy, perl-format +#, perl-format msgid "%s is an attachment, not a page." -msgstr "%s není editovatelná stránka" +msgstr "%s není ani příloha, ani stránka." #: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" -msgstr "" +msgstr "nejste oprávněni měnit %s" #: ../IkiWiki/Plugin/git.pm:666 #, perl-format msgid "you cannot act on a file with mode %s" -msgstr "" +msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" #: ../IkiWiki/Plugin/git.pm:670 msgid "you are not allowed to change file modes" -msgstr "" +msgstr "nejste oprávněni měnit přístupová oprávnění souborů" #: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 -#, fuzzy, perl-format +#, perl-format msgid "Must specify %s when using the %s plugin" -msgstr "Při používání vyhledávacího modulu musíte zadat %s" +msgstr "%s musíte zadat při každém použití modulu %s" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "" +msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno." #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" @@ -381,32 +377,30 @@ msgstr "program není platným programem graphviz" #: ../IkiWiki/Plugin/highlight.pm:47 #, perl-format msgid "tohighlight contains unknown file type '%s'" -msgstr "" +msgstr "tohighlight obsahuje neznámý typ souboru „%s“" #: ../IkiWiki/Plugin/highlight.pm:58 #, perl-format msgid "Source code: %s" -msgstr "" +msgstr "Zdrojový kód: %s" #: ../IkiWiki/Plugin/highlight.pm:123 msgid "" "warning: highlight perl module not available; falling back to pass through" -msgstr "" +msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" #: ../IkiWiki/Plugin/htmltidy.pm:50 -#, fuzzy msgid "htmltidy failed to parse this html" -msgstr "nepodařilo se rozpoznat žádné smajlíky" +msgstr "htmltidy se nepodařilo zpracovat toto html" #: ../IkiWiki/Plugin/img.pm:63 -#, fuzzy msgid "Image::Magick is not installed" -msgstr "polygen není nainstalován" +msgstr "Image::Magick není nainstalován" #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" -msgstr "" +msgstr "chybné rozměry „%s“ (formát má být ŠxV)" #: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 #: ../IkiWiki/Plugin/img.pm:135 @@ -420,32 +414,30 @@ msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" #: ../IkiWiki/Plugin/img.pm:152 -#, fuzzy, perl-format +#, perl-format msgid "failed to determine size of image %s" -msgstr "nelze změnit velikost: %s" +msgstr "nelze určit velikost obrázku %s" #: ../IkiWiki/Plugin/inline.pm:92 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki" #: ../IkiWiki/Plugin/inline.pm:138 -#, fuzzy msgid "page editing not allowed" -msgstr "zdroj nebyl nalezen" +msgstr "úprava stránky není povolena" #: ../IkiWiki/Plugin/inline.pm:155 -#, fuzzy msgid "missing pages parameter" -msgstr "chybí parametr %s" +msgstr "chybí parametr pages" #: ../IkiWiki/Plugin/inline.pm:191 #, perl-format msgid "the %s and %s parameters cannot be used together" -msgstr "" +msgstr "parametry %s a %s nelze použít zároveň" #: ../IkiWiki/Plugin/inline.pm:212 msgid "Sort::Naturally needed for title_natural sort" -msgstr "" +msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" #: ../IkiWiki/Plugin/inline.pm:223 #, perl-format @@ -470,13 +462,13 @@ msgid "failed to run dot" msgstr "nepodařilo se spustit dot" #: ../IkiWiki/Plugin/lockedit.pm:47 -#, fuzzy, perl-format +#, perl-format msgid "%s is locked and cannot be edited" -msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit" +msgstr "Stránka %s je zamknutá a nelze ji měnit" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "" +msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format @@ -489,14 +481,12 @@ msgid "stylesheet not found" msgstr "styl nebyl nalezen" #: ../IkiWiki/Plugin/meta.pm:196 -#, fuzzy msgid "redir page not found" -msgstr "zdroj nebyl nalezen" +msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" #: ../IkiWiki/Plugin/meta.pm:210 -#, fuzzy msgid "redir cycle is not allowed" -msgstr "zdroj nebyl nalezen" +msgstr "cykly nejsou v přesměrování povoleny" #: ../IkiWiki/Plugin/mirrorlist.pm:42 msgid "Mirrors" @@ -523,13 +513,12 @@ msgid "Get an OpenID" msgstr "Získat OpenID" #: ../IkiWiki/Plugin/orphans.pm:45 -#, fuzzy msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." #: ../IkiWiki/Plugin/pagetemplate.pm:30 msgid "bad or missing template" -msgstr "" +msgstr "chybná nebo chybějící šablona" #: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." @@ -541,7 +530,7 @@ msgstr "Chyba při vytváření účtu." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "" +msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -549,138 +538,144 @@ msgstr "Nepodařilo se odeslat email." #: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." -msgstr "" +msgstr "Postup na resetování hesla vám byl odeslán na e-mail." #: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" -msgstr "" +msgstr "chybné URL pro resetování hesla" #: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" -msgstr "" +msgstr "resetování hesla bylo zamítnuto" #: ../IkiWiki/Plugin/pingee.pm:30 msgid "Ping received." -msgstr "" +msgstr "Obdrženo pinknutí." #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "" +msgstr "vyžaduje parametry „from“ a „to“" #: ../IkiWiki/Plugin/pinger.pm:58 -#, fuzzy, perl-format +#, perl-format msgid "Will ping %s" -msgstr "upravuji %s" +msgstr "Pinknu %s" #: ../IkiWiki/Plugin/pinger.pm:61 #, perl-format msgid "Ignoring ping directive for wiki %s (this wiki is %s)" -msgstr "" +msgstr "Ignoruji direktivu ping pro wiki %s (toto je wiki %s)" #: ../IkiWiki/Plugin/pinger.pm:77 -#, fuzzy msgid "LWP not found, not pinging" -msgstr "RPC::XML::Client nebyl nalezen, nepinkám" +msgstr "LWP nebyl nalezen, nepinkám" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." -msgstr "" +msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." #: ../IkiWiki/Plugin/po.pm:138 -#, fuzzy, perl-format +#, perl-format msgid "%s is not a valid language code" -msgstr "%s není editovatelná stránka" +msgstr "%s není platným kódem jazyka" #: ../IkiWiki/Plugin/po.pm:150 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" +"%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" #: ../IkiWiki/Plugin/po.pm:155 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" +"po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" #: ../IkiWiki/Plugin/po.pm:385 #, perl-format msgid "rebuilding all pages to fix meta titles" -msgstr "" +msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" #: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 -#, fuzzy, perl-format +#, perl-format msgid "building %s" -msgstr "upravuji %s" +msgstr "sestavuji %s" #: ../IkiWiki/Plugin/po.pm:426 msgid "updated PO files" -msgstr "" +msgstr "aktualizovány PO soubory" #: ../IkiWiki/Plugin/po.pm:450 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" +"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, budou " +"odstraněny také její překlady." #: ../IkiWiki/Plugin/po.pm:470 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" +"Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " +"budou přejmenovány také její překlady." #: ../IkiWiki/Plugin/po.pm:869 #, perl-format msgid "POT file (%s) does not exist" -msgstr "" +msgstr "POT soubor (%s) neexistuje" #: ../IkiWiki/Plugin/po.pm:883 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy underlay PO file to %s" -msgstr "nelze zkompilovat %s" +msgstr "nepodařilo se zkopírovat PO soubor na %s" #: ../IkiWiki/Plugin/po.pm:892 -#, fuzzy, perl-format +#, perl-format msgid "failed to update %s" -msgstr "nelze zkompilovat %s" +msgstr "nepodařilo se aktualizovat %s" #: ../IkiWiki/Plugin/po.pm:898 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy the POT file to %s" -msgstr "nelze zkompilovat %s" +msgstr "nepodařilo se zkopírovat POT soubor na %s" #: ../IkiWiki/Plugin/po.pm:934 msgid "N/A" -msgstr "" +msgstr "N/A" #: ../IkiWiki/Plugin/po.pm:947 -#, fuzzy, perl-format +#, perl-format msgid "failed to translate %s" -msgstr "nelze změnit velikost: %s" +msgstr "nepodařilo se přeložit %s" #: ../IkiWiki/Plugin/po.pm:1031 msgid "removed obsolete PO files" -msgstr "" +msgstr "odstraněny zastaralé PO soubory" #: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 #: ../IkiWiki/Plugin/po.pm:1148 -#, fuzzy, perl-format +#, perl-format msgid "failed to write %s" -msgstr "nelze zapsat %s: %s" +msgstr "nepodařilo se zapsat %s" #: ../IkiWiki/Plugin/po.pm:1106 -#, fuzzy msgid "failed to translate" -msgstr "nepodařilo se spustit dot" +msgstr "překlad se nezdařil" #: ../IkiWiki/Plugin/po.pm:1111 -#, fuzzy, perl-format +#, perl-format msgid "failed to read %s" -msgstr "nelze číst %s: %s" +msgstr "nepodařilo se přečíst %s" #: ../IkiWiki/Plugin/po.pm:1160 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" +"neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " +"stránku" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -695,9 +690,8 @@ msgid "polygen not installed" msgstr "polygen není nainstalován" #: ../IkiWiki/Plugin/polygen.pm:60 -#, fuzzy msgid "command failed" -msgstr "fortune selhal" +msgstr "příkaz selhal" #: ../IkiWiki/Plugin/postsparkline.pm:41 msgid "missing formula" @@ -774,109 +768,108 @@ msgstr "%A o poledni" #: ../IkiWiki/Plugin/progress.pm:34 #, perl-format msgid "illegal percent value %s" -msgstr "" +msgstr "neplatná procentuální hodnota %s" #: ../IkiWiki/Plugin/progress.pm:59 msgid "need either `percent` or `totalpages` and `donepages` parameters" -msgstr "" +msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" -msgstr "" +msgstr "(Diff oříznut)" #: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 #, perl-format msgid "%s does not exist" -msgstr "" +msgstr "%s neexistuje" #: ../IkiWiki/Plugin/remove.pm:38 -#, fuzzy, perl-format +#, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" -msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit" +msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" #: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 -#, fuzzy, perl-format +#, perl-format msgid "%s is not a file" -msgstr "%s není editovatelná stránka" +msgstr "%s není souborem" #: ../IkiWiki/Plugin/remove.pm:134 #, perl-format msgid "confirm removal of %s" -msgstr "" +msgstr "potvrďte odstranění %s" #: ../IkiWiki/Plugin/remove.pm:171 msgid "Please select the attachments to remove." -msgstr "" +msgstr "Vyberte prosím přílohy, které se mají odstranit." #: ../IkiWiki/Plugin/remove.pm:211 msgid "removed" -msgstr "" +msgstr "odstraněno" #: ../IkiWiki/Plugin/rename.pm:42 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" -msgstr "" +msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat" #: ../IkiWiki/Plugin/rename.pm:62 -#, fuzzy msgid "no change to the file name was specified" -msgstr "jméno souboru s obalem nebylo zadáno" +msgstr "jméno souboru nebylo změněno" #: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" -msgstr "" +msgstr "neplatné jméno" #: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" -msgstr "" +msgstr "%s již existuje" #: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" -msgstr "" +msgstr "%s již na disku existuje" #: ../IkiWiki/Plugin/rename.pm:122 -#, fuzzy, perl-format +#, perl-format msgid "rename %s" -msgstr "zpracovávám %s" +msgstr "přejmenování %s" #: ../IkiWiki/Plugin/rename.pm:161 msgid "Also rename SubPages and attachments" -msgstr "" +msgstr "Také přejmenovat podstránky a přílohy" #: ../IkiWiki/Plugin/rename.pm:247 msgid "Only one attachment can be renamed at a time." -msgstr "" +msgstr "Najednou lze přejmenovat pouze jednu přílohu." #: ../IkiWiki/Plugin/rename.pm:250 msgid "Please select the attachment to rename." -msgstr "" +msgstr "Vyberte přílohu, kterou chcete přejmenovat." #: ../IkiWiki/Plugin/rename.pm:347 #, perl-format msgid "rename %s to %s" -msgstr "" +msgstr "přejmenování %s na %s" #: ../IkiWiki/Plugin/rename.pm:571 -#, fuzzy, perl-format +#, perl-format msgid "update for rename of %s to %s" -msgstr "aktualizace %s (%s) uživatelem %s" +msgstr "aktualizace pro přejmenování %s na %s" #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" -msgstr "" +msgstr "pro indexování %s je potřeba Digest::SHA1" #: ../IkiWiki/Plugin/search.pm:217 msgid "search" -msgstr "" +msgstr "hledání" #: ../IkiWiki/Plugin/shortcut.pm:31 #, perl-format msgid "shortcut plugin will not work without %s" -msgstr "" +msgstr "Modul shortcut nebude pracovat bez %s" #: ../IkiWiki/Plugin/shortcut.pm:44 msgid "missing name or url parameter" @@ -896,24 +889,21 @@ msgstr "nepodařilo se rozpoznat žádné smajlíky" #: ../IkiWiki/Plugin/sparkline.pm:72 msgid "parse error" -msgstr "chyba rozpoznávání" +msgstr "chyba syntaktického rozboru" #: ../IkiWiki/Plugin/sparkline.pm:78 -#, fuzzy msgid "invalid featurepoint diameter" -msgstr "chybný průměr zvýrazněného bodu (featurepoint)" +msgstr "chybný průměr zvýrazněného bodu" #: ../IkiWiki/Plugin/sparkline.pm:88 -#, fuzzy msgid "invalid featurepoint location" -msgstr "chybné umístění zvýrazněného bodu (featurepoint)" +msgstr "chybné umístění zvýrazněného bodu" #: ../IkiWiki/Plugin/sparkline.pm:99 msgid "missing values" msgstr "chybí hodnoty" #: ../IkiWiki/Plugin/sparkline.pm:104 -#, fuzzy msgid "invalid height value" msgstr "chybná výška" @@ -922,7 +912,6 @@ msgid "missing width parameter" msgstr "chybí parametr šířka (width)" #: ../IkiWiki/Plugin/sparkline.pm:115 -#, fuzzy msgid "invalid width value" msgstr "chybná šířka" @@ -965,62 +954,62 @@ msgid "failed to process:" msgstr "nepodařilo se zpracovat:" #: ../IkiWiki/Plugin/teximg.pm:70 -#, fuzzy msgid "missing tex code" -msgstr "chybí hodnoty" +msgstr "chybí TeXový kód" #: ../IkiWiki/Plugin/teximg.pm:122 -#, fuzzy msgid "failed to generate image from code" -msgstr "nelze změnit velikost: %s" +msgstr "z kódu se nepodařilo vygenerovat obrázek" #: ../IkiWiki/Plugin/websetup.pm:89 msgid "plugin" -msgstr "" +msgstr "modul" #: ../IkiWiki/Plugin/websetup.pm:108 #, perl-format msgid "enable %s?" -msgstr "" +msgstr "povolit %s?" #: ../IkiWiki/Plugin/websetup.pm:240 msgid "setup file for this wiki is not known" -msgstr "" +msgstr "konfigurační soubor této wiki je neznámý" #: ../IkiWiki/Plugin/websetup.pm:256 -#, fuzzy msgid "main" -msgstr "Správce" +msgstr "hlavní" #: ../IkiWiki/Plugin/websetup.pm:257 msgid "plugins" -msgstr "" +msgstr "moduly" #: ../IkiWiki/Plugin/websetup.pm:395 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "" +msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." #: ../IkiWiki/Plugin/websetup.pm:399 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" +"Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " +"znovusestavit wiki." #: ../IkiWiki/Plugin/websetup.pm:436 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" +"Chyba: %s skončil s nenulovým návratovým kódem (%s). Ruším změny v konfiguraci" #: ../IkiWiki/Receive.pm:35 #, perl-format msgid "cannot determine id of untrusted committer %s" -msgstr "" +msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" #: ../IkiWiki/Receive.pm:85 -#, fuzzy, perl-format +#, perl-format msgid "bad file name %s" -msgstr "přeskakuji chybné jméno souboru %s" +msgstr "chybné jméno souboru %s" #: ../IkiWiki/Render.pm:266 #, perl-format @@ -1028,6 +1017,8 @@ msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" +"v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-li " +"to povolit, nastavte proměnnou allow_symlinks_before_srcdir" #: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format @@ -1037,7 +1028,7 @@ msgstr "přeskakuji chybné jméno souboru %s" #: ../IkiWiki/Render.pm:296 #, perl-format msgid "%s has multiple possible source pages" -msgstr "" +msgstr "%s má několik možných zdrojových stránek" #: ../IkiWiki/Render.pm:382 #, perl-format @@ -1050,29 +1041,29 @@ msgid "scanning %s" msgstr "prohledávám %s" #: ../IkiWiki/Render.pm:450 -#, fuzzy, perl-format +#, perl-format msgid "building %s, which links to %s" -msgstr "zpracovávám %s, která odkazuje na %s" +msgstr "sestavuji %s, která odkazuje na %s" #: ../IkiWiki/Render.pm:497 -#, fuzzy, perl-format +#, perl-format msgid "building %s, which depends on %s" -msgstr "zpracovávám %s, která závisí na %s" +msgstr "sestavuji %s, která závisí na %s" #: ../IkiWiki/Render.pm:533 -#, fuzzy, perl-format +#, perl-format msgid "building %s, to update its backlinks" -msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" +msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" #: ../IkiWiki/Render.pm:545 -#, fuzzy, perl-format +#, perl-format msgid "removing %s, no longer built by %s" -msgstr "odstraňuji %s, již není zpracovávána %s" +msgstr "odstraňuji %s, již není sestavována pomocí %s" #: ../IkiWiki/Render.pm:569 -#, fuzzy, perl-format +#, perl-format msgid "ikiwiki: cannot build %s" -msgstr "ikiwiki: nelze zpracovat %s" +msgstr "ikiwiki: nelze sestavit %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. @@ -1083,21 +1074,21 @@ msgstr "nemohu číst %s: %s" #: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" -msgstr "" +msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" #: ../IkiWiki/Setup/Automator.pm:71 #, perl-format msgid "unsupported revision control system %s" -msgstr "" +msgstr "nepodporovaný systém pro správu verzí: %s" #: ../IkiWiki/Setup/Automator.pm:97 msgid "failed to set up the repository with ikiwiki-makerepo" -msgstr "" +msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "" +msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1130,11 +1121,11 @@ msgstr "použití: ikiwiki [volby] zdroj cíl" #: ../ikiwiki.in:14 msgid " ikiwiki --setup configfile" -msgstr "" +msgstr " ikiwiki --setup konfigurační.soubor" #: ../ikiwiki.in:91 msgid "usage: --set var=value" -msgstr "" +msgstr "použití: --set proměnná=hodnota" #: ../ikiwiki.in:140 msgid "generating wrappers.." @@ -1142,7 +1133,7 @@ msgstr "generuji obaly..." #: ../ikiwiki.in:199 msgid "rebuilding wiki.." -msgstr "znovu vytvářím wiki..." +msgstr "znovusestavuji wiki..." #: ../ikiwiki.in:202 msgid "refreshing wiki.." @@ -1158,65 +1149,68 @@ msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" #: ../IkiWiki.pm:540 msgid "cannot use multiple rcs plugins" -msgstr "" +msgstr "nelze použít několik rcs modulů" #: ../IkiWiki.pm:569 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" -msgstr "" +msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" #: ../IkiWiki.pm:1251 -#, fuzzy, perl-format +#, perl-format msgid "preprocessing loop detected on %s at depth %i" -msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" +msgstr "Byla rozpoznána smyčka na %s v hloubce %i" #: ../IkiWiki.pm:1808 msgid "yes" -msgstr "" +msgstr "ano" #: ../IkiWiki.pm:1932 -#, fuzzy, perl-format +#, perl-format msgid "cannot match pages: %s" -msgstr "nemohu číst %s: %s" +msgstr "nelze vybrat stránky: %s" #: ../auto.setup:16 msgid "What will the wiki be named?" -msgstr "" +msgstr "Jak se bude wiki jmenovat?" #: ../auto.setup:16 msgid "wiki" -msgstr "" +msgstr "wiki" #: ../auto.setup:18 msgid "What revision control system to use?" -msgstr "" +msgstr "Který systém pro správu verzí se má použít?" #: ../auto.setup:20 msgid "Which user (wiki account or openid) will be admin?" -msgstr "" +msgstr "Který uživatel (wiki účet nebo openid) bude správce?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" -msgstr "" +msgstr "Jaké je doménové jméno webového serveru?" #~ msgid "discussion" #~ msgstr "diskuse" -#~ msgid "rendering %s" -#~ msgstr "zpracovávám %s" +#~ msgid "processed ok at %s" +#~ msgstr "zpracováno ok %s" -#, fuzzy -#~ msgid "Must specify %s when using the google search plugin" -#~ msgstr "Při používání vyhledávacího modulu musíte zadat %s" +#~ msgid "failed to find url in html" +#~ msgstr "v html se nepodařilo nalézt url" #~ msgid "bad size \"%s\"" #~ msgstr "chybná velikost \"%s\"" -#~ msgid "failed to find url in html" -#~ msgstr "v html se nepodařilo nalézt url" +#~ msgid "code includes disallowed latex commands" +#~ msgstr "kód obsahuje nepovolené příkazy LaTeXu" -#~ msgid "processed ok at %s" -#~ msgstr "zpracováno ok %s" +#~ msgid "

    Error: %s exited nonzero (%s)" +#~ msgstr "" +#~ "

    Chyba: %s skončil s nenulovým návratovým kódem (%s)" + +#~ msgid "rendering %s" +#~ msgstr "zpracovávám %s" #~ msgid "Your password has been emailed to you." #~ msgstr "Vaše heslo vám bylo zasláno." @@ -1230,20 +1224,6 @@ msgstr "" #~ msgid "updating hyperestraier search index" #~ msgstr "aktualizuji vyhledávací index hyperestraieru" -#, 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" -- cgit v1.2.3 From 324c1fae33889ee2c187e4a47f267e23edd96f3e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 11 Sep 2009 18:32:44 -0400 Subject: changelog and license --- debian/changelog | 2 ++ debian/copyright | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 612792b86..b859c9aef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by Amitai Schlair. * Updated Czech translation from Miroslav Kure. Closes: #546223 + * rsync: New plugin that allows pushing the srcdir to a remote host + via rsync or similar. Thanks, Amitai Schlair. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 diff --git a/debian/copyright b/debian/copyright index 8f7d65322..98feffc6f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -140,6 +140,10 @@ Files: wmd.pm, getsource.pm Copyright: © 2009 William Uther License: GPL-2+ +Files: rsync.pm +Copyright: © 2009 Amitai Schlair +License: BSD-C2 + Files: doc/logo/* Copyright: © 2006 Recai Oktaş License: GPL-2+ -- cgit v1.2.3 From 65bf8a278fa6a2aa13b4a1ffd98113aa1f3620f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 11 Sep 2009 18:44:53 -0400 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b859c9aef..b0ba63ea6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * cvs: Yeah, ikiwiki even supports CVS now. Plugin contributed by Amitai Schlair. * Updated Czech translation from Miroslav Kure. Closes: #546223 - * rsync: New plugin that allows pushing the srcdir to a remote host + * rsync: New plugin that allows pushing the destdir to a remote host via rsync or similar. Thanks, Amitai Schlair. -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 -- cgit v1.2.3 From 87c3370e04fdcecb6f296f3e5e0f6b7414e8fa3e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Sep 2009 19:33:19 -0400 Subject: note french is complete --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b0ba63ea6..be7c97119 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low - * Add French basewiki translation from the Debian French l10n team, - including Philippe Batailler, Alexandre Dupas, and Steve Petruzzello. + * Add complete French basewiki and underlays translation from the Debian + French l10n team, including Philippe Batailler, Alexandre Dupas, and + Steve Petruzzello. * Expand banned_users; it can now include PageSpecs, which allows banning by IP address. * underlay: Also allow configuring additional directories to search -- cgit v1.2.3 From 01a9a12bbfbc21b45c59e4bbc52fbf488776d386 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Sep 2009 13:46:32 -0400 Subject: auto.setup, auto-blog.setup: Fix sanitization of entered wikiname. Closes: #547378 --- IkiWiki/Setup/Automator.pm | 15 ++++++++++----- auto-blog.setup | 15 ++++++++------- auto.setup | 15 ++++++++------- debian/changelog | 2 ++ 4 files changed, 28 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 742d67666..d1594d7ea 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -24,15 +24,20 @@ sub prettydir ($) { return $dir; } -sub import (@) { - my $this=shift; - IkiWiki::Setup::merge({@_}); +sub sanitize_wikiname ($) { + my $wikiname=shift; # Sanitize this to avoid problimatic directory names. - $config{wikiname}=~s/[^-A-Za-z0-9_]//g; - if (! length $config{wikiname}) { + $wikiname=~s/[^-A-Za-z0-9_]//g; + if (! length $wikiname) { error gettext("you must enter a wikiname (that contains alphanumerics)"); } + return $wikiname; +} + +sub import (@) { + my $this=shift; + IkiWiki::Setup::merge({@_}); # Avoid overwriting any existing files. foreach my $key (qw{srcdir destdir repository dumpsetup}) { diff --git a/auto-blog.setup b/auto-blog.setup index 3ef734b39..cf77b3bf7 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -15,6 +15,7 @@ require IkiWiki::Setup::Automator; our $wikiname=IkiWiki::Setup::Automator::ask( gettext("What will the blog be named?"), gettext("blog")); +our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname); our $rcs=IkiWiki::Setup::Automator::ask( gettext("What revision control system to use?"), "git"); our $admin=IkiWiki::Setup::Automator::ask( @@ -27,13 +28,13 @@ IkiWiki::Setup::Automator->import( wikiname => $wikiname, adminuser => [$admin], rcs => $rcs, - srcdir => "$ENV{HOME}/$wikiname", - destdir => "$ENV{HOME}/public_html/$wikiname", - repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs), - dumpsetup => "$ENV{HOME}/$wikiname.setup", - url => "http://$domain/~$ENV{USER}/$wikiname", - cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi", - cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi", + srcdir => "$ENV{HOME}/$wikiname_short", + destdir => "$ENV{HOME}/public_html/$wikiname_short", + repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "$ENV{HOME}/$wikiname_short.setup", + url => "http://$domain/~$ENV{USER}/$wikiname_short", + cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", add_plugins => [qw{goodstuff websetup comments blogspam}], disable_plugins => [qw{}], diff --git a/auto.setup b/auto.setup index b3d2513d9..dc2b19992 100644 --- a/auto.setup +++ b/auto.setup @@ -14,6 +14,7 @@ require IkiWiki::Setup::Automator; our $wikiname=IkiWiki::Setup::Automator::ask( gettext("What will the wiki be named?"), gettext("wiki")); +our $wikiname_short=IkiWiki::Setup::Automator::sanitize_wikiname($wikiname); our $rcs=IkiWiki::Setup::Automator::ask( gettext("What revision control system to use?"), "git"); our $admin=IkiWiki::Setup::Automator::ask( @@ -26,13 +27,13 @@ IkiWiki::Setup::Automator->import( wikiname => $wikiname, adminuser => [$admin], rcs => $rcs, - srcdir => "$ENV{HOME}/$wikiname", - destdir => "$ENV{HOME}/public_html/$wikiname", - repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs), - dumpsetup => "$ENV{HOME}/$wikiname.setup", - url => "http://$domain/~$ENV{USER}/$wikiname", - cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi", - cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi", + srcdir => "$ENV{HOME}/$wikiname_short", + destdir => "$ENV{HOME}/public_html/$wikiname_short", + repository => "$ENV{HOME}/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "$ENV{HOME}/$wikiname_short.setup", + url => "http://$domain/~$ENV{USER}/$wikiname_short", + cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", + cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", add_plugins => [qw{goodstuff websetup}], disable_plugins => [qw{}], diff --git a/debian/changelog b/debian/changelog index be7c97119..bcdbd865c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * Updated Czech translation from Miroslav Kure. Closes: #546223 * rsync: New plugin that allows pushing the destdir to a remote host via rsync or similar. Thanks, Amitai Schlair. + * auto.setup, auto-blog.setup: Fix sanitization of entered wikiname. + Closes: #547378 -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 -- cgit v1.2.3 From 095a385c99eed6c3cba931bc8c14fa00827b5f7a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 24 Sep 2009 19:04:42 -0400 Subject: releasing version 3.14159265 --- debian/NEWS | 2 +- debian/changelog | 4 +-- debian/control | 2 +- po/bg.po | 68 ++++++++++++++++++++++++++-------------------- po/cs.po | 83 ++++++++++++++++++++++++++++++++------------------------ po/da.po | 68 ++++++++++++++++++++++++++-------------------- po/de.po | 68 ++++++++++++++++++++++++++-------------------- po/es.po | 68 ++++++++++++++++++++++++++-------------------- po/fr.po | 68 ++++++++++++++++++++++++++-------------------- po/gu.po | 68 ++++++++++++++++++++++++++-------------------- po/ikiwiki.pot | 68 ++++++++++++++++++++++++++-------------------- po/it.po | 68 ++++++++++++++++++++++++++-------------------- po/pl.po | 68 ++++++++++++++++++++++++++-------------------- po/sv.po | 68 ++++++++++++++++++++++++++-------------------- po/vi.po | 68 ++++++++++++++++++++++++++-------------------- 15 files changed, 480 insertions(+), 359 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 535708872..808105fd5 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.1415926) UNRELEASED; urgency=low +ikiwiki (3.1415926) unstable; urgency=low In order to fix a performance bug, all wikis need to be rebuilt on upgrade to this version. If you listed your wiki in diff --git a/debian/changelog b/debian/changelog index bcdbd865c..d50d31721 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.14159265) UNRELEASED; urgency=low +ikiwiki (3.14159265) unstable; urgency=low * Add complete French basewiki and underlays translation from the Debian French l10n team, including Philippe Batailler, Alexandre Dupas, and @@ -17,7 +17,7 @@ ikiwiki (3.14159265) UNRELEASED; urgency=low * auto.setup, auto-blog.setup: Fix sanitization of entered wikiname. Closes: #547378 - -- Joey Hess Wed, 02 Sep 2009 15:01:27 -0400 + -- Joey Hess Thu, 24 Sep 2009 18:50:43 -0400 ikiwiki (3.1415926) unstable; urgency=high diff --git a/debian/control b/debian/control index 5a0acf4c4..3e2fdc537 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libfile-chdir-perl Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki diff --git a/po/bg.po b/po/bg.po index d21205272..88d66b072 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -30,7 +30,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "" @@ -51,11 +51,11 @@ msgstr "" msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Грешка" @@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "готово" @@ -348,18 +348,18 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "" @@ -875,6 +875,16 @@ msgstr "" msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "грешка при запис на файла „%s”: %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1026,12 +1036,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, fuzzy, perl-format msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" @@ -1095,20 +1105,20 @@ msgstr "ikiwiki: неуспех при обновяване на страниц msgid "cannot read %s: %s" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1127,13 +1137,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1154,43 +1164,43 @@ msgstr "" msgid "generating wrappers.." msgstr "генериране на обвивки..." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1203,15 +1213,15 @@ msgstr "" msgid "wiki" msgstr "" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "" diff --git a/po/cs.po b/po/cs.po index 0248d5f18..9bd80d2bb 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -24,14 +24,14 @@ msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -"pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale E" -"zkoušíte se přihlásit přes http a ne přes https" +"pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale " +"Ezkoušíte se přihlásit přes http a ne přes https" #: ../IkiWiki/CGI.pm:149 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:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "Vaše sezení expirovalo." @@ -51,11 +51,11 @@ msgstr "Správce" msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Chyba" @@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "hotovo" @@ -341,18 +341,18 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" @@ -612,8 +612,8 @@ msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, budou " -"odstraněny také její překlady." +"Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " +"budou odstraněny také její překlady." #: ../IkiWiki/Plugin/po.pm:470 msgid "" @@ -857,6 +857,16 @@ msgstr "přejmenování %s na %s" msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "nepodařilo se přečíst %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -999,14 +1009,15 @@ msgstr "" #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -"Chyba: %s skončil s nenulovým návratovým kódem (%s). Ruším změny v konfiguraci" +"Chyba: %s skončil s nenulovým návratovým kódem (%s). Ruším změny v " +"konfiguraci" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "chybné jméno souboru %s" @@ -1017,8 +1028,8 @@ msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -"v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-li " -"to povolit, nastavte proměnnou allow_symlinks_before_srcdir" +"v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" +"li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" #: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 #, perl-format @@ -1072,20 +1083,20 @@ msgstr "ikiwiki: nelze sestavit %s" msgid "cannot read %s: %s" msgstr "nemohu číst %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "nepodporovaný systém pro správu verzí: %s" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" @@ -1104,13 +1115,13 @@ msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1131,41 +1142,41 @@ msgstr "použití: --set proměnná=hodnota" msgid "generating wrappers.." msgstr "generuji obaly..." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 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:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" @@ -1178,15 +1189,15 @@ msgstr "Jak se bude wiki jmenovat?" msgid "wiki" msgstr "wiki" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "Který systém pro správu verzí se má použít?" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "Který uživatel (wiki účet nebo openid) bude správce?" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" diff --git a/po/da.po b/po/da.po index c7cbbb352..b15cb27ff 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -35,7 +35,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "Din kørsel (login session) er udløbet" @@ -55,11 +55,11 @@ msgstr "Admin" msgid "Preferences saved." msgstr "Indstillinger gemt" -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Fejl" @@ -140,7 +140,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "færdig" @@ -349,18 +349,18 @@ msgstr "kan ikke få sider til at passe sammen: %s" msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" @@ -872,6 +872,16 @@ msgstr "omdøb %s til %s" msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "læsning af %s mislykkedes" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1017,12 +1027,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" @@ -1088,20 +1098,20 @@ msgstr "ikiwiki: kan ikke danne %s" msgid "cannot read %s: %s" msgstr "kan ikke læse %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "revisionskontrolsystem %s ikke understøttet" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" @@ -1120,13 +1130,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1147,42 +1157,42 @@ msgstr "brug: --set var=værdi" msgid "generating wrappers.." msgstr "bygger wrappers.." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 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:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1195,15 +1205,15 @@ msgstr "Hvad skal wikien hedde?" msgid "wiki" msgstr "wiki" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "Hvilket revisionskontrolsystem skal bruges?" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" diff --git a/po/de.po b/po/de.po index 13a7355bb..fb9e3964d 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -32,7 +32,7 @@ msgid "login failed, perhaps you need to turn on cookies?" msgstr "" "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "Ihre Anmeldezeit ist abgelaufen." @@ -52,11 +52,11 @@ msgstr "Administrator" msgid "Preferences saved." msgstr "Einstellungen gespeichert." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Fehler" @@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "fertig" @@ -347,18 +347,18 @@ msgstr "Kann die Seiten nicht zuordnen: %s" msgid "%s is an attachment, not a page." msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" @@ -878,6 +878,16 @@ msgstr "benenne %s in %s um" msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "lesen von %s fehlgeschlagen" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1025,13 +1035,13 @@ msgstr "" "Fehler: %s endet mit nicht Null (%s). Die Änderungen an der Konfiguration " "wurden verworfen." -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" @@ -1097,21 +1107,21 @@ msgstr "ikiwiki: kann %s nicht erzeugen" msgid "cannot read %s: %s" msgstr "kann %s nicht lesen: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "nicht unterstütztes Versionskontrollsystem %s" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1132,13 +1142,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1159,44 +1169,44 @@ msgstr "Aufruf: --set Variable=Wert" msgid "generating wrappers.." msgstr "erzeuge Wrapper.." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1209,15 +1219,15 @@ msgstr "Wie soll das Wiki heißen?" msgid "wiki" msgstr "Wiki" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "Welches Versionskontrollsystem soll verwandt werden?" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" diff --git a/po/es.po b/po/es.po index 56d7e62bd..f9497325e 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -36,7 +36,7 @@ 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:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "Su registro en el sistema ha expirado." @@ -56,11 +56,11 @@ msgstr "Administración" msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Error" @@ -142,7 +142,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "completado" @@ -351,18 +351,18 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" @@ -875,6 +875,16 @@ msgstr "%s cambia de nombre a %s" msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "no puedo leer de %s: %s " + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1026,12 +1036,12 @@ msgstr "" "Error: el programa %s finaliza con un código mayor que cero (%s). Descarto " "los cambios en la configuración." -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "no puedo determinar el identificador de un usuario no fiable como %s" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" @@ -1099,20 +1109,20 @@ msgstr "ikiwiki: no puedo convertir la página %s" msgid "cannot read %s: %s" msgstr "no puedo leer el archivo %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "el sistema de control de versiones %s no está soportado" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1133,13 +1143,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, 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:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1160,45 +1170,45 @@ msgstr "uso: --set variable=valor" msgid "generating wrappers.." msgstr "generando programas auxiliares.." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 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:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1211,18 +1221,18 @@ msgstr "¿ Qué nombre tendrá el wiki ?" msgid "wiki" msgstr "wiki" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "¿ Qué sistema de control de versiones empleará ?" -#: ../auto.setup:20 +#: ../auto.setup:21 #, fuzzy msgid "Which user (wiki account or openid) will be admin?" msgstr "" "¿ Qué usuario del wiki (ó qué identificador openid) será el empleado como " "administrador ? " -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" diff --git a/po/fr.po b/po/fr.po index 75142e55c..19a6c103b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -33,7 +33,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "Échec de l'identification, vous devez autoriser les cookies." -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "Session d'authentification expirée." @@ -53,11 +53,11 @@ msgstr "Administrateur" msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Erreur" @@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "Terminé" @@ -343,18 +343,18 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" @@ -876,6 +876,16 @@ msgstr "Renomme %s en %s" msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "Impossible de lire %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1021,13 +1031,13 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" @@ -1093,22 +1103,22 @@ msgstr "ikiwiki : impossible de reconstruire %s" msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1130,13 +1140,13 @@ msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1157,42 +1167,42 @@ msgstr "Syntaxe : -- set var=valeur" msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1205,15 +1215,15 @@ msgstr "Nom du wiki :" msgid "wiki" msgstr "wiki" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "Système de contrôle de version utilisé :" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" diff --git a/po/gu.po b/po/gu.po index 9dd1d0114..cdb613f9d 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -29,7 +29,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "" @@ -50,11 +50,11 @@ msgstr "" msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "ક્ષતિ" @@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "સંપૂર્ણ" @@ -346,18 +346,18 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "" @@ -865,6 +865,16 @@ msgstr "" msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "%s વાંચવામાં નિષ્ફળ: %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1012,12 +1022,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, fuzzy, perl-format msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" @@ -1081,20 +1091,20 @@ msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" msgid "cannot read %s: %s" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1113,13 +1123,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1140,41 +1150,41 @@ msgstr "" msgid "generating wrappers.." msgstr "આવરણ બનાવે છે.." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1187,15 +1197,15 @@ msgstr "" msgid "wiki" msgstr "" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 7903fa19d..1190ffd52 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,7 +30,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "" @@ -50,11 +50,11 @@ msgstr "" msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "" @@ -135,7 +135,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "" @@ -338,18 +338,18 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "" @@ -845,6 +845,16 @@ msgstr "" msgid "update for rename of %s to %s" msgstr "" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -986,12 +996,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "" @@ -1055,20 +1065,20 @@ msgstr "" msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1087,13 +1097,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1114,41 +1124,41 @@ msgstr "" msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "" @@ -1161,14 +1171,14 @@ msgstr "" msgid "wiki" msgstr "" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "" diff --git a/po/it.po b/po/it.po index a44199dae..72ebeb033 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -29,7 +29,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "La sessione è scaduta." @@ -49,11 +49,11 @@ msgstr "Amministrazione" msgid "Preferences saved." msgstr "Preferenze salvate." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Errore" @@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "fatto" @@ -340,18 +340,18 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" @@ -870,6 +870,16 @@ msgstr "rinomina %s in %s" msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "impossibile leggere %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1015,12 +1025,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "impossibile determinare l'id del committer non fidato %s" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, perl-format msgid "bad file name %s" msgstr "nome file %s scorretto" @@ -1086,20 +1096,20 @@ msgstr "ikiwiki: impossibile compilare %s" msgid "cannot read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "sistema di controllo di revisione %s non supportato" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "impossibile creare un repository tramite ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1119,13 +1129,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1146,41 +1156,41 @@ msgstr "utilizzo: --set var=valore" msgid "generating wrappers.." msgstr "generazione contenitori..." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -1193,15 +1203,15 @@ msgstr "Quale sarà il nome del wiki?" msgid "wiki" msgstr "wiki" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "Che sistema di controllo di revisione usare?" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" diff --git a/po/pl.po b/po/pl.po index 23f1af5f6..f3c752aea 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -32,7 +32,7 @@ msgstr "" "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są " "ciasteczka (ang. cookies)" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "" @@ -53,11 +53,11 @@ msgstr "" msgid "Preferences saved." msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Błąd" @@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "gotowe" @@ -350,18 +350,18 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "" @@ -880,6 +880,16 @@ msgstr "" msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "awaria w trakcie odczytu %s: %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1034,12 +1044,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, fuzzy, perl-format msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" @@ -1103,20 +1113,20 @@ msgstr "ikiwiki: awaria w trakcie tworzenia %s" msgid "cannot read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1135,13 +1145,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1162,43 +1172,43 @@ msgstr "" msgid "generating wrappers.." msgstr "tworzenie osłon..." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 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:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1211,15 +1221,15 @@ msgstr "" msgid "wiki" msgstr "" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "" diff --git a/po/sv.po b/po/sv.po index b81830763..6424c6df2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -29,7 +29,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "" @@ -50,11 +50,11 @@ msgstr "" msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Fel" @@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "klar" @@ -347,18 +347,18 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "" @@ -870,6 +870,16 @@ msgstr "" msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "misslyckades med att skriva %s: %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1021,12 +1031,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, fuzzy, perl-format msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" @@ -1090,20 +1100,20 @@ msgstr "ikiwiki: kan inte rita upp %s" msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1122,13 +1132,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1149,41 +1159,41 @@ msgstr "" msgid "generating wrappers.." msgstr "genererar wrappers.." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 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:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1196,15 +1206,15 @@ msgstr "" msgid "wiki" msgstr "" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "" diff --git a/po/vi.po b/po/vi.po index 6f50e2c65..8e6edd432 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-30 15:25-0400\n" +"POT-Creation-Date: 2009-09-24 18:53-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -30,7 +30,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 msgid "Your login session has expired." msgstr "" @@ -51,11 +51,11 @@ msgstr "" msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:262 +#: ../IkiWiki/CGI.pm:277 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 msgid "Error" msgstr "Lỗi" @@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 msgid "done" msgstr "xong" @@ -348,18 +348,18 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 -#: ../IkiWiki/Receive.pm:129 +#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:666 +#: ../IkiWiki/Plugin/git.pm:685 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:670 +#: ../IkiWiki/Plugin/git.pm:689 msgid "you are not allowed to change file modes" msgstr "" @@ -871,6 +871,16 @@ msgstr "" msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" +#: ../IkiWiki/Plugin/rsync.pm:37 +#, fuzzy, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "lỗi ghi %s: %s" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + #: ../IkiWiki/Plugin/search.pm:182 #, perl-format msgid "need Digest::SHA1 to index %s" @@ -1022,12 +1032,12 @@ msgstr "" msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" -#: ../IkiWiki/Receive.pm:35 +#: ../IkiWiki/Receive.pm:34 #, perl-format msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:85 +#: ../IkiWiki/Receive.pm:86 #, fuzzy, perl-format msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" @@ -1091,20 +1101,20 @@ msgstr "ikiwiki: không thể vẽ %s" msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Setup/Automator.pm:34 +#: ../IkiWiki/Setup/Automator.pm:33 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:71 +#: ../IkiWiki/Setup/Automator.pm:76 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:97 +#: ../IkiWiki/Setup/Automator.pm:102 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:115 +#: ../IkiWiki/Setup/Automator.pm:120 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1123,13 +1133,13 @@ msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:152 +#: ../IkiWiki/Wrapper.pm:148 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:172 +#: ../IkiWiki/Wrapper.pm:168 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1150,41 +1160,41 @@ msgstr "" msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:199 +#: ../ikiwiki.in:195 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:202 +#: ../ikiwiki.in:198 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:225 +#: ../IkiWiki.pm:233 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:494 +#: ../IkiWiki.pm:502 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:540 +#: ../IkiWiki.pm:548 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:569 +#: ../IkiWiki.pm:577 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1251 +#: ../IkiWiki.pm:1259 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1808 +#: ../IkiWiki.pm:1817 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1941 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1197,15 +1207,15 @@ msgstr "" msgid "wiki" msgstr "" -#: ../auto.setup:18 +#: ../auto.setup:19 msgid "What revision control system to use?" msgstr "" -#: ../auto.setup:20 +#: ../auto.setup:21 msgid "Which user (wiki account or openid) will be admin?" msgstr "" -#: ../auto.setup:23 +#: ../auto.setup:24 msgid "What is the domain name of the web server?" msgstr "" -- cgit v1.2.3 From 2acaa15830760695eb673ddb0b17aed715e97f3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Sep 2009 17:40:41 -0400 Subject: parentlinks: Add has_parentlinks template parameter to allow styling the toplevel index differently etc. --- IkiWiki/Plugin/parentlinks.pm | 7 +++++-- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm index 1ee69cbff..b01d76f80 100644 --- a/IkiWiki/Plugin/parentlinks.pm +++ b/IkiWiki/Plugin/parentlinks.pm @@ -55,8 +55,11 @@ sub pagetemplate (@) { my $page=$params{page}; my $template=$params{template}; - if ($template->query(name => "parentlinks")) { - $template->param(parentlinks => [parentlinks($page)]); + if ($template->query(name => "parentlinks") || + $template->query(name => "has_parentlinks")) { + my @links=[parentlinks($page)]; + $template->param(parentlinks => \@links); + $template->param(has_parentlinks => (@links > 0)); } } diff --git a/debian/changelog b/debian/changelog index d50d31721..2e27d623e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.14159266) UNRELEASED; urgency=low + + * parentlinks: Add has_parentlinks template parameter to allow styling + the toplevel index differently etc. + + -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 + ikiwiki (3.14159265) unstable; urgency=low * Add complete French basewiki and underlays translation from the Debian -- cgit v1.2.3 From f42215cb65173299bca13cd8bafabdcb9ad2ab2d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Sep 2009 20:53:02 -0400 Subject: img: Correct bug in image size calculation code. If an image was resized smaller, with width and height specified to values that did not fit its aspect ratio, the image tag with/height were not adjusted to the actual size imagemagick chooses. This was broken by 03449610d6c666ba24bea68f01d896613e522278. To fix it right, it unfortunatly needs to always read the src image now, in order to determine if the image is being displayed larger, or resized smaller. When resized smaller, it then always uses the size of the thumbnail, while for larger it calculates the size. (Only way to get rid of this sometimes extra image read would be to change it to not allow displaying images larger.) --- IkiWiki/Plugin/img.pm | 109 +++++++++++++++++++++++++------------------------- debian/changelog | 1 + 2 files changed, 55 insertions(+), 55 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 9ae85c4e6..223b5a11f 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -63,8 +63,9 @@ sub preprocess (@) { error gettext("Image::Magick is not installed") if $@; my $im = Image::Magick->new; my $imglink; - my $r; - + my $r = $im->Read($srcfile); + error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; + my ($dwidth, $dheight); if ($params{size} ne 'full') { @@ -74,69 +75,71 @@ sub preprocess (@) { error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size}) unless (defined $w && defined $h && (length $w || length $h)); - - my $outfile = "$config{destdir}/$dir/${w}x${h}-$base"; - $imglink = "$dir/${w}x${h}-$base"; - will_render($params{page}, $imglink); - - if (-e $outfile && (-M $srcfile >= -M $outfile)) { - $r = $im->Read($outfile); - error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r; + if ((length $w && $w > $im->Get("width")) || + (length $h && $h > $im->Get("height"))) { + # resizing larger + $imglink = $file; + + # don't generate larger image, just set display size + if (length $w && length $h) { + ($dwidth, $dheight)=($w, $h); + } + # avoid division by zero on 0x0 image + elsif ($im->Get("width") == 0 || $im->Get("height") == 0) { + ($dwidth, $dheight)=(0, 0); + } + # calculate unspecified size from the other one, preserving + # aspect ratio + elsif (length $w) { + $dwidth=$w; + $dheight=$w / $im->Get("width") * $im->Get("height"); + } + elsif (length $h) { + $dheight=$h; + $dwidth=$h / $im->Get("height") * $im->Get("width"); + } } else { - $r = $im->Read($srcfile); - error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; - - # don't resize any larger - my ($rw, $rh) = ($w, $h); - if ((length $rw && $rw > $im->Get("width")) || - (length $rh && $rh > $im->Get("height"))) { - $rw=$im->Get("width"); - $rh=$im->Get("height"); - } - - $r = $im->Resize(geometry => "${rw}x${rh}"); - error sprintf(gettext("failed to resize: %s"), $r) if $r; + # resizing smaller + my $outfile = "$config{destdir}/$dir/${w}x${h}-$base"; + $imglink = "$dir/${w}x${h}-$base"; + + will_render($params{page}, $imglink); - # don't actually write file in preview mode - if (! $params{preview}) { - my @blob = $im->ImageToBlob(); - writefile($imglink, $config{destdir}, $blob[0], 1); + if (-e $outfile && (-M $srcfile >= -M $outfile)) { + $im = Image::Magick->new; + $r = $im->Read($outfile); + error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r; + + $dwidth = $im->Get("width"); + $dheight = $im->Get("height"); } else { - $imglink = $file; + ($dwidth, $dheight)=($w, $h); + $r = $im->Resize(geometry => "${w}x${h}"); + error sprintf(gettext("failed to resize: %s"), $r) if $r; + + # don't actually write file in preview mode + if (! $params{preview}) { + my @blob = $im->ImageToBlob(); + writefile($imglink, $config{destdir}, $blob[0], 1); + } + else { + $imglink = $file; + } } } - - # since we don't really resize larger, set the display - # size, so the browser can scale the image up if necessary - if (length $w && length $h) { - ($dwidth, $dheight)=($w, $h); - } - # avoid division by zero on 0x0 image - elsif ($im->Get("width") == 0 || $im->Get("height") == 0) { - ($dwidth, $dheight)=(0, 0); - } - # calculate unspecified size from the other one, preserving - # aspect ratio - elsif (length $w) { - $dwidth=$w; - $dheight=$w / $im->Get("width") * $im->Get("height"); - } - elsif (length $h) { - $dheight=$h; - $dwidth=$h / $im->Get("height") * $im->Get("width"); - } - } else { - $r = $im->Read($srcfile); - error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; $imglink = $file; $dwidth = $im->Get("width"); $dheight = $im->Get("height"); } + + if (! defined($dwidth) || ! defined($dheight)) { + error sprintf(gettext("failed to determine size of image %s"), $file) + } my ($fileurl, $imgurl); if (! $params{preview}) { @@ -148,10 +151,6 @@ sub preprocess (@) { $imgurl="$config{url}/$imglink"; } - if (! defined($im->Get("width")) || ! defined($im->Get("height"))) { - error sprintf(gettext("failed to determine size of image %s"), $file) - } - my $imgtag=' Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 7cb620d0e8ed922184d3f1cc38d849665cf8d742 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Sep 2009 20:57:27 -0400 Subject: img: Fix dependency code for full size images. I had assumed that an image shown full size did not need add_depends, since a change would not need a change to the displaying page. But this is not true if the image is modified and its size changes. Then the page needs to update its img tag to reflect the current size. --- IkiWiki/Plugin/img.pm | 3 +-- debian/changelog | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 223b5a11f..e2f541506 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -44,6 +44,7 @@ sub preprocess (@) { } add_link($params{page}, $image); + add_depends($params{page}, $image); # optimisation: detect scan mode, and avoid generating the image if (! defined wantarray) { @@ -69,8 +70,6 @@ sub preprocess (@) { my ($dwidth, $dheight); if ($params{size} ne 'full') { - add_depends($params{page}, $image); - my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/); error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size}) unless (defined $w && defined $h && diff --git a/debian/changelog b/debian/changelog index d2ff88a2a..44c810b00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * parentlinks: Add has_parentlinks template parameter to allow styling the toplevel index differently etc. * img: Correct bug in image size calculation code. + * img: Fix dependency code for full size images. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 3525a6b7f23421779091daad7a1e19b02d7db141 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Sep 2009 16:21:03 -0400 Subject: toggle, relativedate: Support templates that add attributes to the body tag. --- IkiWiki/Plugin/relativedate.pm | 2 +- IkiWiki/Plugin/toggle.pm | 2 +- debian/changelog | 2 ++ doc/bugs/toggle_expects_body_element_without_attributes.mdwn | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index 3e33cd5c3..06df2efd5 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -26,7 +26,7 @@ sub getsetup () { sub format (@) { my %params=@_; - if (! ($params{content}=~s!^()!$1.include_javascript($params{page})!em)) { + if (! ($params{content}=~s!^(]*>)!$1.include_javascript($params{page})!em)) { # no tag, probably in preview mode $params{content}=include_javascript($params{page}, 1).$params{content}; } diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index aae8cdf84..ef066a42f 100644 --- a/IkiWiki/Plugin/toggle.pm +++ b/IkiWiki/Plugin/toggle.pm @@ -68,7 +68,7 @@ sub format (@) { if ($params{content}=~s!(

    \s*)
    !$1!g) { $params{content}=~s/
    //g; - if (! ($params{content}=~s!^()!$1.include_javascript($params{page})!em)) { + if (! ($params{content}=~s!^(]*>)!$1.include_javascript($params{page})!em)) { # no tag, probably in preview mode $params{content}=include_javascript($params{page}, 1).$params{content}; } diff --git a/debian/changelog b/debian/changelog index 44c810b00..b368618b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low the toplevel index differently etc. * img: Correct bug in image size calculation code. * img: Fix dependency code for full size images. + * toggle, relativedate: Support templates that add attributes + to the body tag. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 diff --git a/doc/bugs/toggle_expects_body_element_without_attributes.mdwn b/doc/bugs/toggle_expects_body_element_without_attributes.mdwn index 6cb03e934..0b39346f4 100644 --- a/doc/bugs/toggle_expects_body_element_without_attributes.mdwn +++ b/doc/bugs/toggle_expects_body_element_without_attributes.mdwn @@ -1 +1,3 @@ The toggle plugins checks for a `` in the page; if not found, javascript tags are inserted at the top of the document. Since my page uses ``; a plain `` is not found and I get script links before the docstring declaration. Please see the source of the following toggle-using page: http://kaizer.se/wiki/kupfer/ -- ulrik [kaizer.se] + +[[fixed|done]] --[[Joey]] -- cgit v1.2.3 From ac8ecdcf68b89544d126032718e225add0a09238 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Sep 2009 13:35:30 -0400 Subject: Support RPC::XML 0.69's incompatable object instantiation method. --- IkiWiki/Plugin/external.pm | 21 ++++++++++++++++----- debian/changelog | 1 + plugins/externaldemo | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm index 0d292dfc2..ec91c79db 100644 --- a/IkiWiki/Plugin/external.pm +++ b/IkiWiki/Plugin/external.pm @@ -8,7 +8,6 @@ use warnings; use strict; use IkiWiki 3.00; use RPC::XML; -use RPC::XML::Parser; use IPC::Open2; use IO::Handle; @@ -55,7 +54,19 @@ sub rpc_call ($$;@) { $plugin->{accum}.=$_; while ($plugin->{accum} =~ /^\s*(<\?xml\s.*?<\/(?:methodCall|methodResponse)>)\n(.*)/s) { $plugin->{accum}=$2; - my $r = RPC::XML::Parser->new->parse($1); + my $parser; + eval q{ + use RPC::XML::ParserFactory; + $parser = RPC::XML::ParserFactory->new; + }; + if ($@) { + # old interface + eval q{ + use RPC::XML::Parser; + $parser = RPC::XML::Parser->new; + }; + } + my $r=$parser->parse($1); error("XML RPC parser failure: $r") unless ref $r; if ($r->isa('RPC::XML::response')) { my $value=$r->value; @@ -72,9 +83,9 @@ sub rpc_call ($$;@) { # XML-RPC v1 does not allow for # nil/null/None/undef values to be - # transmitted, so until - # XML::RPC::Parser honours v2 - # (), external plugins send + # transmitted. The extension + # is the right fix, but for + # back-compat, let external plugins send # a hash with one key "null" pointing # to an empty string. if (exists $hash{null} && diff --git a/debian/changelog b/debian/changelog index b368618b4..b948aaf56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * img: Fix dependency code for full size images. * toggle, relativedate: Support templates that add attributes to the body tag. + * Support RPC::XML 0.69's incompatable object instantiation method. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 diff --git a/plugins/externaldemo b/plugins/externaldemo index be7aba8b9..24861dcc9 100755 --- a/plugins/externaldemo +++ b/plugins/externaldemo @@ -8,7 +8,6 @@ use strict; print STDERR "externaldemo plugin running as pid $$\n"; use RPC::XML; -use RPC::XML::Parser; use IO::Handle; # autoflush stdout @@ -31,7 +30,19 @@ sub rpc_read { $accum=$2; # the rest # Now parse the XML RPC. - my $r = RPC::XML::Parser->new->parse($1); + my $parser; + eval q{ + use RPC::XML::ParserFactory; + $parser = RPC::XML::ParserFactory->new; + }; + if ($@) { + # old interface + eval q{ + use RPC::XML::Parser; + $parser = RPC::XML::Parser->new; + }; + } + my $r=$parser->parse($1); if (! ref $r) { die "error: XML RPC parse failure $r"; } -- cgit v1.2.3 From 0c6648f02c56a867d1078832921b185c3fce310d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 2 Oct 2009 12:37:53 -0400 Subject: mirrorlist: Display nothing if list is empty. --- IkiWiki/Plugin/mirrorlist.pm | 3 ++- debian/changelog | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/mirrorlist.pm b/IkiWiki/Plugin/mirrorlist.pm index 737dcf767..d0a6107ef 100644 --- a/IkiWiki/Plugin/mirrorlist.pm +++ b/IkiWiki/Plugin/mirrorlist.pm @@ -29,7 +29,8 @@ sub pagetemplate (@) { my %params=@_; my $template=$params{template}; - if ($template->query(name => "extrafooter")) { + if ($template->query(name => "extrafooter") && + keys %{$config{mirrorlist}} > 0) { my $value=$template->param("extrafooter"); $value.=mirrorlist($params{page}); $template->param(extrafooter => $value); diff --git a/debian/changelog b/debian/changelog index b948aaf56..b6383bacb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * toggle, relativedate: Support templates that add attributes to the body tag. * Support RPC::XML 0.69's incompatable object instantiation method. + * mirrorlist: Display nothing if list is empty. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From ffa73790b5c381df6e0385995b720dd24188969b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 3 Oct 2009 14:14:30 -0400 Subject: Fix a bug that could lead to duplicate links being recorded for tags. Here I was bitten by perl's aliasing of foreach variables to the loop array contents, and match_link accidentially changed the contents of %links. In Jon's testcase, a tag added an absolute link, which was made relative by the above bug, and then the link was added again in preprocess, and turned into a duplicate. --- IkiWiki.pm | 6 +++--- debian/changelog | 2 ++ doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 974e36902..2637f6017 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2052,10 +2052,10 @@ sub match_link ($$;@) { else { return IkiWiki::SuccessReason->new("$page links to page $p matching $link") if match_glob($p, $link, %params); - $p=~s/^\///; + my ($p_rel)=$p=~/^\/?(.*)/; $link=~s/^\///; - return IkiWiki::SuccessReason->new("$page links to page $p matching $link") - if match_glob($p, $link, %params); + return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link") + if match_glob($p_rel, $link, %params); } } return IkiWiki::FailReason->new("$page does not link to $link"); diff --git a/debian/changelog b/debian/changelog index b6383bacb..ca5409af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low to the body tag. * Support RPC::XML 0.69's incompatable object instantiation method. * mirrorlist: Display nothing if list is empty. + * Fix a bug that could lead to duplicate links being recorded + for tags. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 diff --git a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn index 2091570d1..d07b2381d 100644 --- a/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn +++ b/doc/bugs/brokenlinks_accumulates_duplicate_items.mdwn @@ -20,3 +20,6 @@ ikiwiki version 3.14159265. > source and the `.ikiwiki` directory to reproduce this. --[[Joey]] >> Hi Joey, thanks for your response. I've reproduced it post rebuild and after having ran ikiwiki-transition and many refreshes (both resulting from content changes and otherwise) unfortunately, with ikiwiki 3.14159265 (different machine to above report, though). I will contact you privately to provide a git URL and a copy of my .ikiwiki. -- [[Jon]] + +>>> Found the bug that was causing duplicates to get in, and fixed it. +>>> [[done]] --[[Joey]] -- cgit v1.2.3 From 49b71d0615f3ec995e8958ede6baaae8524d1986 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 3 Oct 2009 15:38:18 -0400 Subject: update --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ca5409af7..bec1a61d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,12 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * mirrorlist: Display nothing if list is empty. * Fix a bug that could lead to duplicate links being recorded for tags. + * Added support framework for multiple types of dependencies. + * Allow declaring that a dependency does not encompass the content of a + page. (By passing content => 0 to add_depends.) + * pagecount: Use a contentless dependency, which makes this + directive much less expensive to use, since page edits will + no longer trigger an unnecessary update of the page count. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 2fbfcd16e6d5717fea7b23d7fa82961222a6e32f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Oct 2009 15:46:23 -0400 Subject: map: Use a contentless dependency unless show= is specified. This makes simple maps efficient enough that they can be used on sidebars! --- IkiWiki/Plugin/map.pm | 8 ++++---- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 54146dc46..682960777 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -68,13 +68,13 @@ sub preprocess (@) { } # Needs to update whenever a page is added or removed (or in some - # cases, when its content changes, if show=title), so register a - # dependency. - add_depends($params{page}, $params{pages}); + # cases, when its content changes, if show= is specified), so + # register a dependency. + add_depends($params{page}, $params{pages}, content => exists $params{show}); # Explicitly add all currently shown pages, to detect when pages # are removed. foreach my $item (keys %mapitems) { - add_depends($params{page}, $item); + add_depends($params{page}, $item, content => exists $params{show}); } # Create the map. diff --git a/debian/changelog b/debian/changelog index bec1a61d3..ae39d4847 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * pagecount: Use a contentless dependency, which makes this directive much less expensive to use, since page edits will no longer trigger an unnecessary update of the page count. + * map: Use a contentless dependency unless show= is specified. + This makes simple maps efficient enough that they can be used on sidebars! -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From e529c561f548fa2d277b8cb7c123c3a46a0427a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Oct 2009 16:03:01 -0400 Subject: inline: Use a contentless dependency in quick mode. --- IkiWiki/Plugin/inline.pm | 7 +++---- debian/changelog | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index ccfadfd69..5133c4ba6 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -197,7 +197,7 @@ sub preprocess_inline (@) { split ' ', $params{pagenames}; } else { - add_depends($params{page}, $params{pages}); + add_depends($params{page}, $params{pages}, content => ! $quick); @list = pagespec_match_list( [ grep { $_ ne $params{page} } keys %pagesources ], @@ -248,10 +248,9 @@ sub preprocess_inline (@) { } # Explicitly add all currently displayed pages as dependencies, so - # that if they are removed or otherwise changed, the inline will be - # sure to be updated. + # that if they are removed, the inline will be sure to be updated. foreach my $p ($#list >= $#feedlist ? @list : @feedlist) { - add_depends($params{page}, $p); + add_depends($params{page}, $p, content => ! $quick); } if ($feeds && exists $params{feedpages}) { diff --git a/debian/changelog b/debian/changelog index ae39d4847..9d03ae990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low no longer trigger an unnecessary update of the page count. * map: Use a contentless dependency unless show= is specified. This makes simple maps efficient enough that they can be used on sidebars! + * inline: Use a contentless dependency in quick mode. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From a6689f9c7a1ecad02b51962c0858df47352c4648 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Oct 2009 16:05:41 -0400 Subject: calendar: all dependencies are contentless --- IkiWiki/Plugin/calendar.pm | 21 ++++++++++++--------- debian/changelog | 6 +++--- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 5d16dff75..a5cc20882 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -104,19 +104,22 @@ sub format_month (@) { "$archivebase/$year/".sprintf("%02d", $month), linktext => " $monthname "); } - add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month)); + add_depends($params{page}, "$archivebase/$year/".sprintf("%02d", $month), + content => 0); if (exists $cache{$pagespec}{"$pyear/$pmonth"}) { $purl = htmllink($params{page}, $params{destpage}, "$archivebase/$pyear/" . sprintf("%02d", $pmonth), linktext => " $pmonthname "); } - add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth)); + add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth), + content => 0); if (exists $cache{$pagespec}{"$nyear/$nmonth"}) { $nurl = htmllink($params{page}, $params{destpage}, "$archivebase/$nyear/" . sprintf("%02d", $nmonth), linktext => " $nmonthname "); } - add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth)); + add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth), + content => 0); # Start producing the month calendar $calendar=< 0); # Explicitly add all currently linked pages as dependencies, so # that if they are removed, the calendar will be sure to be updated. foreach my $p (@list) { - add_depends($params{page}, $p); + add_depends($params{page}, $p, content => 0); } return $calendar; @@ -246,19 +249,19 @@ sub format_year (@) { "$archivebase/$year", linktext => "$year"); } - add_depends($params{page}, "$archivebase/$year"); + add_depends($params{page}, "$archivebase/$year", content => 0); if (exists $cache{$pagespec}{"$pyear"}) { $purl = htmllink($params{page}, $params{destpage}, "$archivebase/$pyear", linktext => "\←"); } - add_depends($params{page}, "$archivebase/$pyear"); + add_depends($params{page}, "$archivebase/$pyear", content => 0); if (exists $cache{$pagespec}{"$nyear"}) { $nurl = htmllink($params{page}, $params{destpage}, "$archivebase/$nyear", linktext => "\→"); } - add_depends($params{page}, "$archivebase/$nyear"); + add_depends($params{page}, "$archivebase/$nyear", content => 0); # Start producing the year calendar $calendar=<$monthabbr\n}; } - add_depends($params{page}, "$archivebase/$year/$mtag"); + add_depends($params{page}, "$archivebase/$year/$mtag", content => 0); $calendar.=qq{\t\n} if ($month % $params{months_per_row} == 0); } diff --git a/debian/changelog b/debian/changelog index 9d03ae990..1a76303b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,9 +13,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * Added support framework for multiple types of dependencies. * Allow declaring that a dependency does not encompass the content of a page. (By passing content => 0 to add_depends.) - * pagecount: Use a contentless dependency, which makes this - directive much less expensive to use, since page edits will - no longer trigger an unnecessary update of the page count. + * pagecount, calendar: Use a contentless dependency, which makes these + directives much less expensive to use, since page edits will + no longer trigger an unnecessary update. * map: Use a contentless dependency unless show= is specified. This makes simple maps efficient enough that they can be used on sidebars! * inline: Use a contentless dependency in quick mode. -- cgit v1.2.3 From 7982c3c1773feef0d7f248ff3efe09dd2cd94ad8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Oct 2009 16:16:50 -0400 Subject: postsparkline and progress: also contentless dependencies --- IkiWiki/Plugin/postsparkline.pm | 2 +- IkiWiki/Plugin/progress.pm | 4 ++-- debian/changelog | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm index d2e5c2378..694d39575 100644 --- a/IkiWiki/Plugin/postsparkline.pm +++ b/IkiWiki/Plugin/postsparkline.pm @@ -48,7 +48,7 @@ sub preprocess (@) { error gettext("unknown formula"); } - add_depends($params{page}, $params{pages}); + add_depends($params{page}, $params{pages}, content => 0); my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } pagespec_match_list( diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm index 76d994acc..3b664f4cb 100644 --- a/IkiWiki/Plugin/progress.pm +++ b/IkiWiki/Plugin/progress.pm @@ -36,8 +36,8 @@ sub preprocess (@) { $fill.="%"; } elsif (defined $params{totalpages} and defined $params{donepages}) { - add_depends($params{page}, $params{totalpages}); - add_depends($params{page}, $params{donepages}); + add_depends($params{page}, $params{totalpages}, content => 0); + add_depends($params{page}, $params{donepages}, content => 0); my @pages=keys %pagesources; my $totalcount=0; diff --git a/debian/changelog b/debian/changelog index 1a76303b1..0e9bf512b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,9 +13,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * Added support framework for multiple types of dependencies. * Allow declaring that a dependency does not encompass the content of a page. (By passing content => 0 to add_depends.) - * pagecount, calendar: Use a contentless dependency, which makes these - directives much less expensive to use, since page edits will - no longer trigger an unnecessary update. + * pagecount, calendar, postsparkline, progress: Use a contentless dependency, + which makes these directives much less expensive to use, since page + edits will no longer trigger an unnecessary update. * map: Use a contentless dependency unless show= is specified. This makes simple maps efficient enough that they can be used on sidebars! * inline: Use a contentless dependency in quick mode. -- cgit v1.2.3 From b4c8cc90726cb953898b14f378881bddd224a22c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Oct 2009 17:38:10 -0400 Subject: update --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0e9bf512b..21641434b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * map: Use a contentless dependency unless show= is specified. This makes simple maps efficient enough that they can be used on sidebars! * inline: Use a contentless dependency in quick mode. + * Transitive dependencies are now correctly supported. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From d0f116478cdd8841c7905f2629bb679f7f36a5a4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 4 Oct 2009 20:34:43 -0400 Subject: update --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 21641434b..7ca0d9e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,14 +11,14 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * Fix a bug that could lead to duplicate links being recorded for tags. * Added support framework for multiple types of dependencies. - * Allow declaring that a dependency does not encompass the content of a - page. (By passing content => 0 to add_depends.) - * pagecount, calendar, postsparkline, progress: Use a contentless dependency, + * Allow declaring that a dependency is only affected by page presence. + (By passing presence => 1 to add_depends.) + * pagecount, calendar, postsparkline, progress: Use a presence dependency, which makes these directives much less expensive to use, since page edits will no longer trigger an unnecessary update. - * map: Use a contentless dependency unless show= is specified. - This makes simple maps efficient enough that they can be used on sidebars! - * inline: Use a contentless dependency in quick mode. + * map: Use a presence dependency unless show= is specified. + This makes maps efficient enough that they can be used on sidebars! + * inline: Use a presence dependency in quick mode. * Transitive dependencies are now correctly supported. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 846026b20be2ab177eb58d3add468419625c3cc1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Oct 2009 15:08:57 -0400 Subject: update --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7ca0d9e42..0255ac5d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,14 +11,17 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * Fix a bug that could lead to duplicate links being recorded for tags. * Added support framework for multiple types of dependencies. - * Allow declaring that a dependency is only affected by page presence. - (By passing presence => 1 to add_depends.) + * Allow declaring that a dependency is only affected by page presence + or changes to its links. + (By passing presence => 1 or links => 1 to add_depends.) * pagecount, calendar, postsparkline, progress: Use a presence dependency, which makes these directives much less expensive to use, since page edits will no longer trigger an unnecessary update. * map: Use a presence dependency unless show= is specified. This makes maps efficient enough that they can be used on sidebars! * inline: Use a presence dependency in quick mode. + * brokenlinks: Use a link dependency. + This makes it much more efficient, only updating when really necessary. * Transitive dependencies are now correctly supported. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 7123178732674268a1dce09277536dcdc68825f5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Oct 2009 15:14:18 -0400 Subject: oprhans: Use a combination of precense and link dependencies. This makes it more efficient. It also fixes a longstanding bug, where if only a small set of pages were considered by orphans, changes to links on other pages failed to cause an update. --- IkiWiki/Plugin/orphans.pm | 10 +++++++--- debian/changelog | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index d981670e7..ae330b23b 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -23,9 +23,13 @@ sub preprocess (@) { my %params=@_; $params{pages}="*" unless defined $params{pages}; - # Needs to update whenever a page is changed, added, or removed, - # in order to see the link changes. - add_depends($params{page}, $params{pages}); + # Needs to update whenever a link changes, on any page + # since any page could link to one of the pages we're + # considering as orphans. + add_depends($params{page}, "*", links => 1); + # Also needs to update whenever potential orphans are added or + # removed. + add_depends($params{page}, $params{pages}, presence => 1); my @orphans; foreach my $page (pagespec_match_list( diff --git a/debian/changelog b/debian/changelog index 0255ac5d0..363bb9dbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,10 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * inline: Use a presence dependency in quick mode. * brokenlinks: Use a link dependency. This makes it much more efficient, only updating when really necessary. + * oprhans: Use a combination of precense and link dependencies. + This makes it more efficient. It also fixes a longstanding bug, + where if only a small set of pages were considered by orphans, + changes to links on other pages failed to cause an update. * Transitive dependencies are now correctly supported. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From c869398e2b5e202145ad3c14d96d520779a462e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Oct 2009 15:43:37 -0400 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 363bb9dbd..abbd87abc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * inline: Use a presence dependency in quick mode. * brokenlinks: Use a link dependency. This makes it much more efficient, only updating when really necessary. - * oprhans: Use a combination of precense and link dependencies. + * orphans: Use a combination of precense and link dependencies. This makes it more efficient. It also fixes a longstanding bug, where if only a small set of pages were considered by orphans, changes to links on other pages failed to cause an update. -- cgit v1.2.3 From c21f9e70936566daaf06fff21349f4584ee42906 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Oct 2009 15:44:26 -0400 Subject: pagestats: Use a combination of precense and link dependencies. This makes it more efficient. It also fixes the same bug that I fixed in orphans recently, that only changes to the set of displayed pages were considered (or amoung), which missed changes to links on other pages to those. Probably this bug was never noticed because pagestats is most often put on a blog type page, which gets updated anyway when posts change, and thus the tag cloud was updated. --- IkiWiki/Plugin/pagestats.pm | 11 +++++++---- debian/changelog | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm index 874ead7e6..00b919325 100644 --- a/IkiWiki/Plugin/pagestats.pm +++ b/IkiWiki/Plugin/pagestats.pm @@ -35,10 +35,13 @@ sub preprocess (@) { $params{pages}="*" unless defined $params{pages}; my $style = ($params{style} or 'cloud'); - # Needs to update whenever a page is added or removed, so - # register a dependency. - add_depends($params{page}, $params{pages}); - add_depends($params{page}, $params{among}) if exists $params{among}; + # Needs to update whenever a page is added or removed. + add_depends($params{page}, $params{pages}, exists => 1); + # Also needs to update when any page with links changes, + # in case the links point to our displayed pages. + # (Amoung limits this further.) + add_depends($params{page}, exists $params{among} ? $params{among} : "*", + links => 1); my %counts; my $max = 0; diff --git a/debian/changelog b/debian/changelog index abbd87abc..000203405 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,9 +22,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * inline: Use a presence dependency in quick mode. * brokenlinks: Use a link dependency. This makes it much more efficient, only updating when really necessary. - * orphans: Use a combination of precense and link dependencies. - This makes it more efficient. It also fixes a longstanding bug, - where if only a small set of pages were considered by orphans, + * orphans, pagestats: Use a combination of precense and link dependencies. + This makes them more efficient. It also fixes a longstanding bug, + where if only a small set of pages were considered by orphans/pagestats, changes to links on other pages failed to cause an update. * Transitive dependencies are now correctly supported. -- cgit v1.2.3 From f1864a64ee7592d54a332fcab27d451f29c7aab6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Oct 2009 16:48:15 -0400 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 000203405..ab235484d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,7 +22,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * inline: Use a presence dependency in quick mode. * brokenlinks: Use a link dependency. This makes it much more efficient, only updating when really necessary. - * orphans, pagestats: Use a combination of precense and link dependencies. + * orphans, pagestats: Use a combination of presence and link dependencies. This makes them more efficient. It also fixes a longstanding bug, where if only a small set of pages were considered by orphans/pagestats, changes to links on other pages failed to cause an update. -- cgit v1.2.3 From a4df28f42a96a2412665fc9aeeccc93a160d02f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Oct 2009 16:51:33 -0400 Subject: add rebuild handing --- debian/NEWS | 10 ++++++++++ debian/changelog | 2 ++ debian/postinst | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 808105fd5..520f38815 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,13 @@ +ikiwiki (3.14159266) UNRELEASED; urgency=low + + To take advantage of significant performance improvements, all + wikis need to be rebuilt on upgrade to this version. If you + listed your wiki in /etc/ikiwiki/wikilist this will be done + automatically when the Debian package is upgraded. Or use + ikiwiki-mass-rebuild to force a rebuild. + + -- Joey Hess Mon, 05 Oct 2009 16:48:59 -0400 + ikiwiki (3.1415926) unstable; urgency=low In order to fix a performance bug, all wikis need to be rebuilt on diff --git a/debian/changelog b/debian/changelog index ab235484d..89d377769 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low where if only a small set of pages were considered by orphans/pagestats, changes to links on other pages failed to cause an update. * Transitive dependencies are now correctly supported. + * Rebuild wikis on upgrade to this version to get improved dependency + info. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 diff --git a/debian/postinst b/debian/postinst index 2ba26e5b6..dd4be6e0e 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=3.1415926 +firstcompat=3.14159266 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then -- cgit v1.2.3 From af85f62d6fd7c3b437fa527bff3392616d3513dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Oct 2009 17:47:10 -0400 Subject: linkmap: Use a combination of presence and link dependencies. This makes the map be regenerated much less frequently, so larger maps are more practical to use now. --- IkiWiki/Plugin/linkmap.pm | 6 +++--- debian/changelog | 3 +++ doc/ikiwiki/directive/linkmap.mdwn | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm index d0671ae0e..d7ba68da9 100644 --- a/IkiWiki/Plugin/linkmap.pm +++ b/IkiWiki/Plugin/linkmap.pm @@ -28,9 +28,9 @@ sub preprocess (@) { $params{pages}="*" unless defined $params{pages}; - # Needs to update whenever a page is added, removed, or - # its links change, so register a dependency. - add_depends($params{page}, $params{pages}); + # Needs to update whenever a relevant page is added, or removed, or + # its links change. + add_depends($params{page}, $params{pages}, presence => 1, links => 1); # Can't just return the linkmap here, since the htmlscrubber # scrubs out all tags (with good reason!) diff --git a/debian/changelog b/debian/changelog index 89d377769..a006d3177 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low This makes them more efficient. It also fixes a longstanding bug, where if only a small set of pages were considered by orphans/pagestats, changes to links on other pages failed to cause an update. + * linkmap: Use a combination of presence and link dependencies. + This makes the map be regenerated much less frequently, so larger + maps are more practical to use now. * Transitive dependencies are now correctly supported. * Rebuild wikis on upgrade to this version to get improved dependency info. diff --git a/doc/ikiwiki/directive/linkmap.mdwn b/doc/ikiwiki/directive/linkmap.mdwn index db79a1491..38cf0fd11 100644 --- a/doc/ikiwiki/directive/linkmap.mdwn +++ b/doc/ikiwiki/directive/linkmap.mdwn @@ -9,9 +9,7 @@ Only links between mapped pages will be shown; links pointing to or from unmapped pages will be omitted. If the pages to include are not specified, the links between all pages (and other files) in the wiki are mapped. For best results, only a small set of pages should be mapped, since otherwise -the map can become very large, unwieldy, and complicated. Also, the map is -rebuilt whenever one of the mapped pages is changed, which can make the -wiki a bit slow. +the map can become very large, unwieldy, and complicated. Here are descriptions of all the supported parameters to the `linkmap` directive: -- cgit v1.2.3 From a5d825f28632655b608564893428ef9142dddb04 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Oct 2009 19:24:17 -0400 Subject: linkmap: does need presence deps Otherwise, removal of a page with no links will not be noticed, since no links will change. --- IkiWiki/Plugin/linkmap.pm | 5 +++-- debian/changelog | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm index b8b4cf40d..d7ba68da9 100644 --- a/IkiWiki/Plugin/linkmap.pm +++ b/IkiWiki/Plugin/linkmap.pm @@ -28,8 +28,9 @@ sub preprocess (@) { $params{pages}="*" unless defined $params{pages}; - # Needs to update whenever a relevant page's links change. - add_depends($params{page}, $params{pages}, links => 1); + # Needs to update whenever a relevant page is added, or removed, or + # its links change. + add_depends($params{page}, $params{pages}, presence => 1, links => 1); # Can't just return the linkmap here, since the htmlscrubber # scrubs out all tags (with good reason!) diff --git a/debian/changelog b/debian/changelog index a006d3177..dc6ee0a81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,8 +27,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low where if only a small set of pages were considered by orphans/pagestats, changes to links on other pages failed to cause an update. * linkmap: Use a combination of presence and link dependencies. - This makes the map be regenerated much less frequently, so larger - maps are more practical to use now. + This makes the map be regenerated much less frequently in many cases, + so larger maps are more practical to use now. * Transitive dependencies are now correctly supported. * Rebuild wikis on upgrade to this version to get improved dependency info. -- cgit v1.2.3 From 4002d7c1a4657e769b036c6e76106991ec5c3897 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Oct 2009 20:31:13 -0400 Subject: add influence info to match_* Also update docs, test suite. --- IkiWiki.pm | 24 ++++++++++++------------ IkiWiki/Plugin/meta.pm | 8 ++++---- debian/changelog | 2 ++ doc/plugins/write.mdwn | 7 +++++++ t/pagespec_match.t | 15 +++++++++++++-- 5 files changed, 38 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 73d2a9763..9c386e154 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2039,7 +2039,7 @@ use overload ( sub new { my $class = shift; my $value = shift; - return bless [$value, {@_}], $class; + return bless [$value, {map { $_ => 1 } @_}], $class; } sub influences { @@ -2099,23 +2099,23 @@ sub match_link ($$;@) { my $from=exists $params{location} ? $params{location} : ''; my $links = $IkiWiki::links{$page}; - return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links}; + return IkiWiki::FailReason->new("$page has no links", $link) unless $links && @{$links}; my $bestlink = IkiWiki::bestlink($from, $link); foreach my $p (@{$links}) { if (length $bestlink) { - return IkiWiki::SuccessReason->new("$page links to $link") + return IkiWiki::SuccessReason->new("$page links to $link", $page) if $bestlink eq IkiWiki::bestlink($page, $p); } else { - return IkiWiki::SuccessReason->new("$page links to page $p matching $link") + return IkiWiki::SuccessReason->new("$page links to page $p matching $link", $page) if match_glob($p, $link, %params); my ($p_rel)=$p=~/^\/?(.*)/; $link=~s/^\///; - return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link") + return IkiWiki::SuccessReason->new("$page links to page $p_rel matching $link", $page) if match_glob($p_rel, $link, %params); } } - return IkiWiki::FailReason->new("$page does not link to $link"); + return IkiWiki::FailReason->new("$page does not link to $link", $page); } sub match_backlink ($$;@) { @@ -2131,14 +2131,14 @@ sub match_created_before ($$;@) { if (exists $IkiWiki::pagectime{$testpage}) { if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) { - return IkiWiki::SuccessReason->new("$page created before $testpage"); + return IkiWiki::SuccessReason->new("$page created before $testpage", $testpage); } else { - return IkiWiki::FailReason->new("$page not created before $testpage"); + return IkiWiki::FailReason->new("$page not created before $testpage", $testpage); } } else { - return IkiWiki::ErrorReason->new("$testpage does not exist"); + return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage); } } @@ -2151,14 +2151,14 @@ sub match_created_after ($$;@) { if (exists $IkiWiki::pagectime{$testpage}) { if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) { - return IkiWiki::SuccessReason->new("$page created after $testpage"); + return IkiWiki::SuccessReason->new("$page created after $testpage", $testpage); } else { - return IkiWiki::FailReason->new("$page not created after $testpage"); + return IkiWiki::FailReason->new("$page not created after $testpage", $testpage); } } else { - return IkiWiki::ErrorReason->new("$testpage does not exist"); + return IkiWiki::ErrorReason->new("$testpage does not exist", $testpage); } } diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 9b041a748..a8ee5bc85 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -291,21 +291,21 @@ sub match { if (defined $val) { if ($val=~/^$re$/i) { - return IkiWiki::SuccessReason->new("$re matches $field of $page"); + return IkiWiki::SuccessReason->new("$re matches $field of $page", $page); } else { - return IkiWiki::FailReason->new("$re does not match $field of $page"); + return IkiWiki::FailReason->new("$re does not match $field of $page", $page); } } else { - return IkiWiki::FailReason->new("$page does not have a $field"); + return IkiWiki::FailReason->new("$page does not have a $field", $page); } } package IkiWiki::PageSpec; sub match_title ($$;@) { - IkiWiki::Plugin::meta::match("title", @_); + IkiWiki::Plugin::meta::match("title", @_); } sub match_author ($$;@) { diff --git a/debian/changelog b/debian/changelog index dc6ee0a81..565a0cffa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * Transitive dependencies are now correctly supported. * Rebuild wikis on upgrade to this version to get improved dependency info. + * Plugins providing PageSpec `match_*` functions should pass additional + influence information when creating result objects. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 8e8c3311e..6b47033e5 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -982,6 +982,13 @@ an IkiWiki::FailReason object if the match fails. If the match cannot be attempted at all, for any page, it can instead return an IkiWiki::ErrorReason object explaining why. +When constructing these objects, you should also include a list of any +pages whose contents or other metadata influenced the result of the match. +For example, "backlink(foo)" is influenced by the contents of page foo; +"link(foo)" and "title(bar)" are influenced by the contents of any +page they match; "created_before(foo)" is influenced by the metadata of +foo; while "glob(*)" is not influenced by the contents of any page. + ### Setup plugins The ikiwiki setup file is loaded using a pluggable mechanism. If you look diff --git a/t/pagespec_match.t b/t/pagespec_match.t index a1fcba7c8..f73bfdfe1 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 => 56; +use Test::More tests => 61; BEGIN { use_ok("IkiWiki"); } @@ -89,6 +89,17 @@ my $ret=pagespec_match("foo", "(invalid"); ok(! $ret, "syntax error"); ok($ret =~ /syntax error/, "error message"); -my $ret=pagespec_match("foo", "bar or foo"); +$ret=pagespec_match("foo", "bar or foo"); ok($ret, "simple match"); is($ret, "foo matches foo", "stringified return"); + +$ret=pagespec_match("foo", "link(bar)"); +is(join(",", $ret->influences), 'foo', "link is influenced by the page with the link"); +$ret=pagespec_match("bar", "backlink(foo)"); +is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link"); +$ret=pagespec_match("bar", "backlink(foo)"); +is(join(",", $ret->influences), 'foo', "backlink is influenced by the page with the link"); +$ret=pagespec_match("bar", "created_before(foo)"); +is(join(",", $ret->influences), 'foo', "created_before is influenced by the comparison page"); +$ret=pagespec_match("bar", "created_after(foo)"); +is(join(",", $ret->influences), 'foo', "created_after is influenced by the comparison page"); -- cgit v1.2.3 From 5e236f5d25b68f5fb4a421b24470419c6042cb1c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Oct 2009 16:49:53 -0400 Subject: add use_pagespec and deptype functions --- IkiWiki.pm | 135 +++++++++++++++++++++++++++++++++++++++++-------- debian/changelog | 4 +- doc/plugins/write.mdwn | 61 +++++++++++++++++----- t/use_pagespec.t | 30 +++++++++++ 4 files changed, 194 insertions(+), 36 deletions(-) create mode 100755 t/use_pagespec.t (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 2064c881a..c787612e1 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -17,11 +17,12 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase %forcerebuild %loaded_plugins}; use Exporter q{import}; -our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match - pagespec_match_list bestlink htmllink readfile writefile - pagetype srcfile pagename displaytime will_render gettext urlto - targetpage add_underlay pagetitle titlepage linkpage - newpagefile inject add_link +our @EXPORT = qw(hook debug error template htmlpage deptype use_pagespec + add_depends pagespec_match pagespec_match_list bestlink + htmllink readfile writefile pagetype srcfile pagename + displaytime will_render gettext urlto targetpage + add_underlay pagetitle titlepage linkpage newpagefile + inject add_link %config %links %pagestate %wikistate %renderedfiles %pagesources %destsources); our $VERSION = 3.00; # plugin interface version, next is ikiwiki version @@ -1768,18 +1769,10 @@ sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } -sub add_depends ($$;@) { +sub add_depends ($$;$) { my $page=shift; my $pagespec=shift; - - my $deptype=0; - if (@_) { - my %params=@_; - - $deptype=$deptype | $DEPEND_PRESENCE if $params{presence}; - $deptype=$deptype | $DEPEND_LINKS if $params{links}; - } - $deptype=$DEPEND_CONTENT unless $deptype; + my $deptype=shift || $DEPEND_CONTENT; # Is the pagespec a simple page name? if ($pagespec =~ /$config{wiki_file_regexp}/ && @@ -1791,18 +1784,118 @@ sub add_depends ($$;@) { # Analyse the pagespec, and match it against all pages # to get a list of influences, and add explicit dependencies # for those. + #my $sub=pagespec_translate($pagespec); + #return if $@; + #foreach my $p (keys %pagesources) { + # my $r=$sub->($p, location => $page ); + # my %i=$r->influences; + # foreach my $i (keys %i) { + # $depends_simple{$page}{lc $i} |= $i{$i}; + # } + #} + print STDERR "warning: use of add_depends; influences not tracked\n"; + + $depends{$page}{$pagespec} |= $deptype; + return 1; +} + +sub use_pagespec ($$;@) { + my $page=shift; + my $pagespec=shift; + my %params=@_; + my $sub=pagespec_translate($pagespec); - return if $@; - foreach my $p (keys %pagesources) { - my $r=$sub->($p, location => $page ); - my %i=$r->influences; + error "syntax error in pagespec \"$pagespec\"" + if $@ || ! defined $sub; + + my @candidates; + if (exists $params{limit}) { + @candidates=grep { $params{limit}->($_) } keys %pagesources; + } + else { + @candidates=keys %pagesources; + } + + if (defined $params{sort}) { + my $f; + if ($params{sort} eq 'title') { + $f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) }; + } + elsif ($params{sort} eq 'title_natural') { + eval q{use Sort::Naturally}; + if ($@) { + error(gettext("Sort::Naturally needed for title_natural sort")); + } + $f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) }; + } + elsif ($params{sort} eq 'mtime') { + $f=sub { $pagemtime{$b} <=> $pagemtime{$a} }; + } + elsif ($params{sort} eq 'age') { + $f=sub { $pagectime{$b} <=> $pagectime{$a} }; + } + else { + error sprintf(gettext("unknown sort type %s"), $params{sort}); + } + @candidates = sort { &$f } @candidates; + } + + @candidates=reverse(@candidates) if $params{reverse}; + + my @matches; + my $firstfail; + my $count=0; + foreach my $p (@candidates) { + my $r=$sub->($p, location => $page); + if ($r) { + push @matches, [$p, $r]; + last if defined $params{num} && ++$count == $params{num}; + } + elsif (! defined $firstfail) { + $firstfail=$r; + } + } + + $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT); + + my @ret; + if (@matches) { + # Add all influences from successful matches. + foreach my $m (@matches) { + push @ret, $m->[0]; + my %i=$m->[1]->influences; + foreach my $i (keys %i) { + $depends_simple{$page}{lc $i} |= $i{$i}; + } + } + } + elsif (defined $firstfail) { + # Add influences from one failure. (Which one should not + # matter; all should have the same influences.) + my %i=$firstfail->influences; foreach my $i (keys %i) { $depends_simple{$page}{lc $i} |= $i{$i}; } + error(sprintf(gettext("cannot match pages: %s"), $firstfail)); } - $depends{$page}{$pagespec} |= $deptype; - return 1; + return @ret; +} + +sub deptype (@) { + my $deptype=0; + foreach my $type (@_) { + if ($type eq 'presence') { + $deptype |= $DEPEND_PRESENCE; + } + elsif ($type eq 'links') { + $deptype |= $DEPEND_LINKS; + } + elsif ($type eq 'content') { + $deptype |= $DEPEND_CONTENT; + } + } + return $deptype; } sub file_pruned ($$) { diff --git a/debian/changelog b/debian/changelog index 565a0cffa..12ddebac9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,6 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * Added support framework for multiple types of dependencies. * Allow declaring that a dependency is only affected by page presence or changes to its links. - (By passing presence => 1 or links => 1 to add_depends.) * pagecount, calendar, postsparkline, progress: Use a presence dependency, which makes these directives much less expensive to use, since page edits will no longer trigger an unnecessary update. @@ -34,6 +33,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low info. * Plugins providing PageSpec `match_*` functions should pass additional influence information when creating result objects. + * Added `use_pagespec` function, that plugins can use to find a list + of matching pages and add dependencies and influences, all at once, + and efficiently. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 232430079..3d5650758 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -609,21 +609,52 @@ page created from it. (Ie, it appends ".html".) Use this when constructing the filename of a html file. Use `urlto` when generating a link to a page. -#### `add_depends($$;@)` +### `deptype(@)` + +Use this function to generate ikiwiki's internal representation of a +dependency type from one or more of these keywords: + +* `content` is the default. Any change to the content + of a page triggers the dependency. +* `presence` is only triggered by a change to the presence + of a page. +* `links` is only triggered by a change to the links of a page. + This includes when a link is added, removed, or changes what + it points to due to other changes. It does not include the + addition or removal of a duplicate link. + +If multiple types are specified, they are combined. + +#### `use_pagespec($$;@)` + +Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages +in the wiki that match the [[ikiwiki/PageSpec]]. + +The page will automatically be made to depend on the specified +[[ikiwiki/PageSpec]], so `add_depends` does not need to be called. This +is significantly more efficient than calling `add_depends` +followed by `pagespec_match_list`. You should use this anytime a plugin +needs to match a set of pages and generate something based on that list. + +Additional named parameters can be specified: + +* `deptype` optionally specifies the type of dependency to add. Use the + `deptype` function to generate a dependency type. +* `limit` is a reference to a function, that is called and passed a page, + and must return true for the page to be included. +* `sort` specifies a sort order for the list. See + [[ikiwiki/PageSpec/sorting]] for the avilable sort methods. +* `reverse` if true, sorts in reverse. +* `num` if nonzero, specifies the maximum number of matching pages that + will be returned. + +#### `add_depends($$;$)` Makes the specified page depend on the specified [[ikiwiki/PageSpec]]. By default, dependencies are full content dependencies, meaning that the page will be updated whenever anything matching the PageSpec is modified. -This default can be overridden by additional named parameters, which can be -used to indicate weaker types of dependencies: - -* `presence` if set to true, only the presence of a matching page triggers - the dependency. -* `links` if set to true, any change to links on a matching page - triggers the dependency. This includes when a link is added, removed, - or changes what it points to due to other changes. It does not include - the addition or removal of a duplicate link. +This can be overridden by passing a `deptype` value as the third parameter. #### `pagespec_match($$;@)` @@ -984,10 +1015,12 @@ IkiWiki::ErrorReason object explaining why. When constructing these objects, you should also include information about of any pages whose contents or other metadata influenced the result of the -match. For example, "backlink(foo)" is influenced by the contents of page foo; -"link(foo)" and "title(bar)" are influenced by the contents of any -page they match; "created_before(foo)" is influenced by the metadata of -foo; while "glob(*)" is not influenced by the contents of any page. +match. Do this by passing a list of pages, followed by `deptype` values. + +For example, "backlink(foo)" is influenced by the contents of page foo; +"link(foo)" and "title(bar)" are influenced by the contents of any page +they match; "created_before(foo)" is influenced by the metadata of foo; +while "glob(*)" is not influenced by the contents of any page. ### Setup plugins diff --git a/t/use_pagespec.t b/t/use_pagespec.t new file mode 100755 index 000000000..7b904075e --- /dev/null +++ b/t/use_pagespec.t @@ -0,0 +1,30 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Test::More tests => 64; + +BEGIN { use_ok("IkiWiki"); } + +%pagesources=( + foo => "foo.mdwn", + bar => "bar.mdwn", + "post/1" => "post/1.mdwn", + "post/2" => "post/2.mdwn", + "post/3" => "post/3.mdwn", +); + +is_deeply([use_pagespec("foo", "bar")], ["bar"]); +is_deeply([sort(use_pagespec("foo", "post/*"))], ["post/1", "post/2", "post/3"]); +is_deeply([use_pagespec("foo", "post/*", sort => "title", reverse => 1)], + ["post/3", "post/2", "post/1"]); +is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 2)], + ["post/1", "post/2"]); +is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 50)], + ["post/1", "post/2", "post/3"]); +is_deeply([use_pagespec("foo", "post/*", sort => "title", + limit => sub { $_[0] !~ /3/}) ], + ["post/1", "post/2"]); +eval { use_pagespec("foo", "beep") }; +ok($@, "fails with error when unable to match anything"); +eval { use_pagespec("foo", "this is not a legal pagespec!") }; +ok($@, "fails with error when pagespec bad"); -- cgit v1.2.3 From 3bb00d142a4d31316fc6f0eb1277aa2fafe4dbe9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Oct 2009 20:27:56 -0400 Subject: Optimize away most expensive file prune calls, when refreshing Benchmarking refresh of a a wiki with 25 thousand pages showed file_pruned() using most of the time. But, when refreshing, ikiwiki already knows about nearly all the files. So we can skip calling file_pruned() for those it knows about. While tricky to do, this sped up a refresh (that otherwise does no work) by 10-50%. --- IkiWiki.pm | 17 +++++++------ IkiWiki/Render.pm | 71 +++++++++++++++++++++++++++++-------------------------- debian/changelog | 2 ++ 3 files changed, 49 insertions(+), 41 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 97d84c9de..d667e7e10 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -32,7 +32,6 @@ our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE use Memoize; memoize("abs2rel"); memoize("pagespec_translate"); -memoize("file_pruned"); memoize("template_file"); sub getsetup () { @@ -1770,14 +1769,18 @@ sub add_depends ($$) { return 1; } -sub file_pruned ($$) { - require File::Spec; - my $file=File::Spec->canonpath(shift); - my $base=File::Spec->canonpath(shift); - $file =~ s#^\Q$base\E/+##; +sub file_pruned ($;$) { + my $file=shift; + if (@_) { + require File::Spec; + $file=File::Spec->canonpath($file); + my $base=File::Spec->canonpath(shift); + return if $file eq $base; + $file =~ s#^\Q$base\E/+##; + } my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')'; - return $file =~ m/$regexp/ && $file ne $base; + return $file =~ m/$regexp/; } sub define_gettext () { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 246c2260d..a8236b954 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -279,24 +279,26 @@ sub find_src_files () { find({ no_chdir => 1, wanted => sub { - $_=decode_utf8($_); - if (file_pruned($_, $config{srcdir})) { + my $file=decode_utf8($_); + $file=~s/^\Q$config{srcdir}\E\/?//; + my $page = pagename($file); + if (! exists $pagesources{$page} && + file_pruned($file)) { $File::Find::prune=1; + return; } - elsif (! -l $_ && ! -d _) { - my ($f)=/$config{wiki_file_regexp}/; # untaint - if (! defined $f) { - warn(sprintf(gettext("skipping bad filename %s"), $_)."\n"); - } - else { - $f=~s/^\Q$config{srcdir}\E\/?//; - push @files, $f; - my $pagename = pagename($f); - if ($pages{$pagename}) { - debug(sprintf(gettext("%s has multiple possible source pages"), $pagename)); - } - $pages{$pagename}=1; + return if -l $_ || -d _ || ! length $file; + + my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint + if (! defined $f) { + warn(sprintf(gettext("skipping bad filename %s"), $file)."\n"); + } + else { + push @files, $f; + if ($pages{$page}) { + debug(sprintf(gettext("%s has multiple possible source pages"), $page)); } + $pages{$page}=1; } }, }, $config{srcdir}); @@ -304,27 +306,28 @@ sub find_src_files () { find({ no_chdir => 1, wanted => sub { - $_=decode_utf8($_); - if (file_pruned($_, $dir)) { + my $file=decode_utf8($_); + $file=~s/^\Q$dir\E\/?//; + my $page=pagename($file); + if (! exists $pagesources{$page} && + file_pruned($file)) { $File::Find::prune=1; + return; } - elsif (! -l $_ && ! -d _) { - my ($f)=/$config{wiki_file_regexp}/; # untaint - if (! defined $f) { - warn(sprintf(gettext("skipping bad filename %s"), $_)."\n"); - } - else { - $f=~s/^\Q$dir\E\/?//; - # avoid underlaydir - # override attacks; see - # security.mdwn - if (! -l "$config{srcdir}/$f" && - ! -e _) { - my $page=pagename($f); - if (! $pages{$page}) { - push @files, $f; - $pages{$page}=1; - } + return if -l $_ || -d _ || ! length $file; + + my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint + if (! defined $f) { + warn(sprintf(gettext("skipping bad filename %s"), $file)."\n"); + } + else { + # avoid underlaydir override + # attacks; see security.mdwn + if (! -l "$config{srcdir}/$f" && + ! -e _) { + if (! $pages{$page}) { + push @files, $f; + $pages{$page}=1; } } } diff --git a/debian/changelog b/debian/changelog index ca5409af7..6c4353065 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * mirrorlist: Display nothing if list is empty. * Fix a bug that could lead to duplicate links being recorded for tags. + * Optimize away most expensive file prune calls, when refreshing, + by only checking new files. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 5e7b2dea84a35163b599b88efc02cd7ef3e0ad46 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Oct 2009 23:51:06 -0400 Subject: rename use_pagespec to pagespec_match_list To avoid breaking plugins, also support the old pagespec_match_list calling convention, with a deprecation warning. --- IkiWiki.pm | 183 ++++++++++++++++++---------------------- IkiWiki/Plugin/calendar.pm | 2 +- IkiWiki/Plugin/inline.pm | 8 +- IkiWiki/Plugin/map.pm | 3 +- IkiWiki/Plugin/orphans.pm | 2 +- IkiWiki/Plugin/pagecount.pm | 2 +- IkiWiki/Plugin/pagestats.pm | 9 +- IkiWiki/Plugin/postsparkline.pm | 2 +- debian/changelog | 6 +- doc/plugins/write.mdwn | 24 ++---- t/pagespec_match_list.t | 31 +++++++ t/use_pagespec.t | 31 ------- 12 files changed, 140 insertions(+), 163 deletions(-) create mode 100755 t/pagespec_match_list.t delete mode 100755 t/use_pagespec.t (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index daa71059b..fd7e23524 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -17,7 +17,7 @@ use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase %forcerebuild %loaded_plugins}; use Exporter q{import}; -our @EXPORT = qw(hook debug error template htmlpage deptype use_pagespec +our @EXPORT = qw(hook debug error template htmlpage deptype add_depends pagespec_match pagespec_match_list bestlink htmllink readfile writefile pagetype srcfile pagename displaytime will_render gettext urlto targetpage @@ -1798,91 +1798,6 @@ sub add_depends ($$;$) { return 1; } -sub use_pagespec ($$;@) { - my $page=shift; - my $pagespec=shift; - my %params=@_; - - my $sub=pagespec_translate($pagespec); - error "syntax error in pagespec \"$pagespec\"" - if $@ || ! defined $sub; - - my @candidates; - if (exists $params{limit}) { - @candidates=grep { $params{limit}->($_) } keys %pagesources; - } - else { - @candidates=keys %pagesources; - } - - if (defined $params{sort}) { - my $f; - if ($params{sort} eq 'title') { - $f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) }; - } - elsif ($params{sort} eq 'title_natural') { - eval q{use Sort::Naturally}; - if ($@) { - error(gettext("Sort::Naturally needed for title_natural sort")); - } - $f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) }; - } - elsif ($params{sort} eq 'mtime') { - $f=sub { $pagemtime{$b} <=> $pagemtime{$a} }; - } - elsif ($params{sort} eq 'age') { - $f=sub { $pagectime{$b} <=> $pagectime{$a} }; - } - else { - error sprintf(gettext("unknown sort type %s"), $params{sort}); - } - @candidates = sort { &$f } @candidates; - } - - @candidates=reverse(@candidates) if $params{reverse}; - - my @matches; - my $firstfail; - my $count=0; - foreach my $p (@candidates) { - my $r=$sub->($p, location => $page); - if ($r) { - push @matches, [$p, $r]; - last if defined $params{num} && ++$count == $params{num}; - } - elsif (! defined $firstfail) { - $firstfail=$r; - } - } - - $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT); - - my @ret; - if (@matches) { - # Add all influences from successful matches. - foreach my $m (@matches) { - push @ret, $m->[0]; - my %i=$m->[1]->influences; - foreach my $i (keys %i) { - $depends_simple{$page}{lc $i} |= $i{$i}; - } - } - } - elsif (defined $firstfail) { - # Add influences from one failure. (Which one should not - # matter; all should have the same influences.) - my %i=$firstfail->influences; - foreach my $i (keys %i) { - $depends_simple{$page}{lc $i} |= $i{$i}; - } - - error(sprintf(gettext("cannot match pages: %s"), $firstfail)) - if $firstfail->isa("IkiWiki::ErrorReason"); - } - - return @ret; -} - sub deptype (@) { my $deptype=0; foreach my $type (@_) { @@ -2055,27 +1970,95 @@ sub pagespec_match ($$;@) { } sub pagespec_match_list ($$;@) { - my $pages=shift; - my $spec=shift; - my @params=@_; + my $page=shift; + my $pagespec=shift; + my %params=@_; - my $sub=pagespec_translate($spec); - error "syntax error in pagespec \"$spec\"" + # Backwards compatability with old calling convention. + if (ref $page) { + print STDERR "warning: a plugin (".caller().") is using pagespec_match_list in an obsolete way, and needs to be updated\n"; + $params{list}=$page; + $page=$params{location}; # ugh! + } + + my $sub=pagespec_translate($pagespec); + error "syntax error in pagespec \"$pagespec\"" if $@ || ! defined $sub; + + my @candidates; + if (exists $params{limit}) { + @candidates=grep { $params{limit}->($_) } keys %pagesources; + } + else { + @candidates=keys %pagesources; + } + + if (defined $params{sort}) { + my $f; + if ($params{sort} eq 'title') { + $f=sub { pagetitle(basename($a)) cmp pagetitle(basename($b)) }; + } + elsif ($params{sort} eq 'title_natural') { + eval q{use Sort::Naturally}; + if ($@) { + error(gettext("Sort::Naturally needed for title_natural sort")); + } + $f=sub { Sort::Naturally::ncmp(pagetitle(basename($a)), pagetitle(basename($b))) }; + } + elsif ($params{sort} eq 'mtime') { + $f=sub { $pagemtime{$b} <=> $pagemtime{$a} }; + } + elsif ($params{sort} eq 'age') { + $f=sub { $pagectime{$b} <=> $pagectime{$a} }; + } + else { + error sprintf(gettext("unknown sort type %s"), $params{sort}); + } + @candidates = sort { &$f } @candidates; + } + + @candidates=reverse(@candidates) if $params{reverse}; - my @ret; - my $r; - foreach my $page (@$pages) { - $r=$sub->($page, @params); - push @ret, $page if $r; + my @matches; + my $firstfail; + my $count=0; + foreach my $p (@candidates) { + my $r=$sub->($p, location => $page); + if ($r) { + push @matches, [$p, $r]; + last if defined $params{num} && ++$count == $params{num}; + } + elsif (! defined $firstfail) { + $firstfail=$r; + } } + + $depends{$page}{$pagespec} |= ($params{deptype} || $DEPEND_CONTENT); - if (! @ret && defined $r && $r->isa("IkiWiki::ErrorReason")) { - error(sprintf(gettext("cannot match pages: %s"), $r)); + my @ret; + if (@matches) { + # Add all influences from successful matches. + foreach my $m (@matches) { + push @ret, $m->[0]; + my %i=$m->[1]->influences; + foreach my $i (keys %i) { + $depends_simple{$page}{lc $i} |= $i{$i}; + } + } } - else { - return @ret; + elsif (defined $firstfail) { + # Add influences from one failure. (Which one should not + # matter; all should have the same influences.) + my %i=$firstfail->influences; + foreach my $i (keys %i) { + $depends_simple{$page}{lc $i} |= $i{$i}; + } + + error(sprintf(gettext("cannot match pages: %s"), $firstfail)) + if $firstfail->isa("IkiWiki::ErrorReason"); } + + return @ret; } sub pagespec_valid ($) { diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index a89175cfb..c50d038df 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -74,7 +74,7 @@ sub format_month (@) { my $nyear = $params{nyear}; my %linkcache; - foreach my $p (use_pagespec($params{page}, $params{pagespec}, + foreach my $p (pagespec_match_list($params{page}, $params{pagespec}, # add presence dependencies to update # month calendar when pages are added/removed deptype => deptype("presence"))) { diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index c02137aed..815a37838 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -216,7 +216,7 @@ sub preprocess_inline (@) { $num+=$params{skip}; } - @list = use_pagespec($params{page}, $params{pages}, + @list = pagespec_match_list($params{page}, $params{pages}, deptype => deptype($quick ? "presence" : "content"), limit => sub { $_[0] ne $params{page} }, sort => exists $params{sort} ? $params{sort} : "age", @@ -245,9 +245,11 @@ sub preprocess_inline (@) { } if ($feeds && exists $params{feedpages}) { - @feedlist = use_pagespec($params{page}, "($params{pages}) and ($params{feedpages})", + @feedlist = pagespec_match_list( + $params{page}, "($params{pages}) and ($params{feedpages})", deptype => deptype($quick ? "presence" : "content"), - list => \@feedlist); + list => \@feedlist, + ); } my ($feedbase, $feednum); diff --git a/IkiWiki/Plugin/map.pm b/IkiWiki/Plugin/map.pm index 634b0e4d6..788b96827 100644 --- a/IkiWiki/Plugin/map.pm +++ b/IkiWiki/Plugin/map.pm @@ -36,7 +36,8 @@ sub preprocess (@) { # Get all the items to map. my %mapitems; - foreach my $page (use_pagespec($params{page}, $params{pages}, deptype => $deptype)) { + foreach my $page (pagespec_match_list($params{page}, $params{pages}, + deptype => $deptype)) { if (exists $params{show} && exists $pagestate{$page} && exists $pagestate{$page}{meta}{$params{show}}) { diff --git a/IkiWiki/Plugin/orphans.pm b/IkiWiki/Plugin/orphans.pm index 607239500..b1ebd1b9d 100644 --- a/IkiWiki/Plugin/orphans.pm +++ b/IkiWiki/Plugin/orphans.pm @@ -28,7 +28,7 @@ sub preprocess (@) { # considering as orphans. add_depends($params{page}, "*", deptype("links")); - my @orphans=use_pagespec($params{page}, $params{pages}, + my @orphans=pagespec_match_list($params{page}, $params{pages}, # update when orphans are added/removed deptype => deptype("presence"), limit => sub { diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm index 40474b2a1..8d36f057e 100644 --- a/IkiWiki/Plugin/pagecount.pm +++ b/IkiWiki/Plugin/pagecount.pm @@ -32,7 +32,7 @@ sub preprocess (@) { return scalar keys %pagesources; } - return scalar use_pagespec($params{page}, $pages, + return scalar pagespec_match_list($params{page}, $pages, deptype => deptype("presence")); } diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm index e64f7d9c3..47638210a 100644 --- a/IkiWiki/Plugin/pagestats.pm +++ b/IkiWiki/Plugin/pagestats.pm @@ -37,16 +37,17 @@ sub preprocess (@) { my %counts; my $max = 0; - foreach my $page (use_pagespec($params{page}, $params{pages}, - # update when a displayed page is added or removed - deptype => deptype("presence"))) { + foreach my $page (pagespec_match_list($params{page}, $params{pages}, + # update when a displayed page is added/removed + deptype => deptype("presence"))) { use IkiWiki::Render; my @backlinks = IkiWiki::backlink_pages($page); if (exists $params{among}) { # only consider backlinks from the amoung pages - @backlinks = use_pagespec($params{page}, $params{among}, + @backlinks = pagespec_match_list( + $params{page}, $params{among}, # update whenever links on those pages change deptype => deptype("links"), list => \@backlinks diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm index f51e309c8..1d4532366 100644 --- a/IkiWiki/Plugin/postsparkline.pm +++ b/IkiWiki/Plugin/postsparkline.pm @@ -54,7 +54,7 @@ sub preprocess (@) { } my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } - use_pagespec($params{page}, $params{pages}, + pagespec_match_list($params{page}, $params{pages}, deptype => $deptype, limit => sub { $_[0] ne $params{page} }, ); diff --git a/debian/changelog b/debian/changelog index 3a6fdf77d..49809e6cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,9 +33,9 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low info. * Plugins providing PageSpec `match_*` functions should pass additional influence information when creating result objects. - * Added `use_pagespec` function, that plugins can use to find a list - of matching pages and add dependencies and influences, all at once, - and efficiently. + * API change: `pagespec_match_list` has completly changed its interface. + The old interface will be removed soon, and a warning will be printed + if any plugins try to use it. * Optimize away most expensive file prune calls, when refreshing, by only checking new files. diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 62bebbeed..f6ea76c36 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -625,16 +625,16 @@ dependency type from one or more of these keywords: If multiple types are specified, they are combined. -#### `use_pagespec($$;@)` +#### `pagespec_match_list($$;@)` Passed a page name, and [[ikiwiki/PageSpec]], returns a list of pages in the wiki that match the [[ikiwiki/PageSpec]]. The page will automatically be made to depend on the specified [[ikiwiki/PageSpec]], so `add_depends` does not need to be called. This -is significantly more efficient than calling `add_depends` -followed by `pagespec_match_list`. You should use this anytime a plugin -needs to match a set of pages and generate something based on that list. +is significantly more efficient than calling `add_depends` and +`pagespec_match` in a loop. You should use this anytime a plugin +needs to match a set of pages and do something based on that list. Additional named parameters can be specified: @@ -650,6 +650,9 @@ Additional named parameters can be specified: * `list` makes it only match amoung the specified list of pages. Default is to match amoung all pages in the wiki. +Unlike pagespec_match, this may throw an error if there is an error in +the pagespec. + #### `add_depends($$;$)` Makes the specified page depend on the specified [[ikiwiki/PageSpec]]. @@ -672,19 +675,6 @@ The most often used is "location", which specifies the location the PageSpec should match against. If not passed, relative PageSpecs will match relative to the top of the wiki. -#### `pagespec_match_list($$;@)` - -Passed a reference to a list of page names, and [[ikiwiki/PageSpec]], -returns the set of pages that match the [[ikiwiki/PageSpec]]. - -Additional named parameters can be passed, to further limit the match. -The most often used is "location", which specifies the location the -PageSpec should match against. If not passed, relative PageSpecs will match -relative to the top of the wiki. - -Unlike pagespec_match, this may throw an error if there is an error in -the pagespec. - #### `bestlink($$)` Given a page and the text of a link on the page, determine which diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t new file mode 100755 index 000000000..85a30b542 --- /dev/null +++ b/t/pagespec_match_list.t @@ -0,0 +1,31 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Test::More tests => 10; + +BEGIN { use_ok("IkiWiki"); } + +%pagesources=( + foo => "foo.mdwn", + bar => "bar.mdwn", + "post/1" => "post/1.mdwn", + "post/2" => "post/2.mdwn", + "post/3" => "post/3.mdwn", +); + +is_deeply([pagespec_match_list("foo", "bar")], ["bar"]); +is_deeply([sort(pagespec_match_list("foo", "post/*"))], ["post/1", "post/2", "post/3"]); +is_deeply([pagespec_match_list("foo", "post/*", sort => "title", reverse => 1)], + ["post/3", "post/2", "post/1"]); +is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 2)], + ["post/1", "post/2"]); +is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50)], + ["post/1", "post/2", "post/3"]); +is_deeply([pagespec_match_list("foo", "post/*", sort => "title", + limit => sub { $_[0] !~ /3/}) ], + ["post/1", "post/2"]); +my $r=eval { pagespec_match_list("foo", "beep") }; +ok(eval { pagespec_match_list("foo", "beep") } == 0); +ok(! $@, "does not fail with error when unable to match anything"); +eval { pagespec_match_list("foo", "this is not a legal pagespec!") }; +ok($@, "fails with error when pagespec bad"); diff --git a/t/use_pagespec.t b/t/use_pagespec.t deleted file mode 100755 index 92d7977cf..000000000 --- a/t/use_pagespec.t +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/perl -use warnings; -use strict; -use Test::More tests => 10; - -BEGIN { use_ok("IkiWiki"); } - -%pagesources=( - foo => "foo.mdwn", - bar => "bar.mdwn", - "post/1" => "post/1.mdwn", - "post/2" => "post/2.mdwn", - "post/3" => "post/3.mdwn", -); - -is_deeply([use_pagespec("foo", "bar")], ["bar"]); -is_deeply([sort(use_pagespec("foo", "post/*"))], ["post/1", "post/2", "post/3"]); -is_deeply([use_pagespec("foo", "post/*", sort => "title", reverse => 1)], - ["post/3", "post/2", "post/1"]); -is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 2)], - ["post/1", "post/2"]); -is_deeply([use_pagespec("foo", "post/*", sort => "title", num => 50)], - ["post/1", "post/2", "post/3"]); -is_deeply([use_pagespec("foo", "post/*", sort => "title", - limit => sub { $_[0] !~ /3/}) ], - ["post/1", "post/2"]); -my $r=eval { use_pagespec("foo", "beep") }; -ok(eval { use_pagespec("foo", "beep") } == 0); -ok(! $@, "does not fail with error when unable to match anything"); -eval { use_pagespec("foo", "this is not a legal pagespec!") }; -ok($@, "fails with error when pagespec bad"); -- cgit v1.2.3 From c11b3af189059efc91d28cda7e8c5a893d004cb2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Oct 2009 23:55:50 -0400 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 49809e6cf..5ff8e4ac5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,7 +36,7 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * API change: `pagespec_match_list` has completly changed its interface. The old interface will be removed soon, and a warning will be printed if any plugins try to use it. - * Optimize away most expensive file prune calls, when refreshing, + * Optimize away most expensive file prune checks, when refreshing, by only checking new files. -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 -- cgit v1.2.3 From 5fd345bb1f2b97e2dd1d8b6bb27cf7f713f043ab Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 Oct 2009 20:07:32 -0400 Subject: releasing version 3.20091009 --- debian/changelog | 6 +++--- po/bg.po | 59 ++++++++++++++++++++++++++++---------------------------- po/cs.po | 59 ++++++++++++++++++++++++++++---------------------------- po/da.po | 59 ++++++++++++++++++++++++++++---------------------------- po/de.po | 59 ++++++++++++++++++++++++++++---------------------------- po/es.po | 59 ++++++++++++++++++++++++++++---------------------------- po/fr.po | 59 ++++++++++++++++++++++++++++---------------------------- po/gu.po | 59 ++++++++++++++++++++++++++++---------------------------- po/ikiwiki.pot | 57 +++++++++++++++++++++++++++--------------------------- po/it.po | 59 ++++++++++++++++++++++++++++---------------------------- po/pl.po | 59 ++++++++++++++++++++++++++++---------------------------- po/sv.po | 59 ++++++++++++++++++++++++++++---------------------------- po/vi.po | 59 ++++++++++++++++++++++++++++---------------------------- 13 files changed, 350 insertions(+), 362 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6c4353065..a79faf7fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.14159266) UNRELEASED; urgency=low +ikiwiki (3.20091009) unstable; urgency=low * parentlinks: Add has_parentlinks template parameter to allow styling the toplevel index differently etc. @@ -6,14 +6,14 @@ ikiwiki (3.14159266) UNRELEASED; urgency=low * img: Fix dependency code for full size images. * toggle, relativedate: Support templates that add attributes to the body tag. - * Support RPC::XML 0.69's incompatable object instantiation method. + * Support RPC::XML 0.69's incompatible object instantiation method. * mirrorlist: Display nothing if list is empty. * Fix a bug that could lead to duplicate links being recorded for tags. * Optimize away most expensive file prune calls, when refreshing, by only checking new files. - -- Joey Hess Sun, 27 Sep 2009 17:40:03 -0400 + -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 ikiwiki (3.14159265) unstable; urgency=low diff --git a/po/bg.po b/po/bg.po index 88d66b072..ada27177c 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Грешка" @@ -402,28 +402,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "грешка при запис на файла „%s”: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "грешка при запис на файла „%s”: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" @@ -508,11 +507,11 @@ msgstr "шаблонът „%s” не е намерен" msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Огледала" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Огледало" @@ -618,7 +617,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" @@ -1053,47 +1052,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1172,35 +1171,35 @@ msgstr "обновяване на уики..." msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 9bd80d2bb..219e2769a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Chyba" @@ -393,27 +393,26 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick není nainstalován" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "nelze číst %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "nelze číst %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" @@ -488,11 +487,11 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Zrcadla" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Zrcadlo" @@ -598,7 +597,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "sestavuji %s" @@ -1031,47 +1030,47 @@ msgstr "" "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s má několik možných zdrojových stránek" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "sestavuji %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "sestavuji %s, která závisí na %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není sestavována pomocí %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1150,33 +1149,33 @@ msgstr "znovusestavuji wiki..." msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index b15cb27ff..b7da31d34 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Fejl" @@ -404,27 +404,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "læsning af %s mislykkedes: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "læsning af %s mislykkedes: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -501,11 +500,11 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Spejle" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Spejl" @@ -614,7 +613,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "danner %s" @@ -1046,47 +1045,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1165,34 +1164,34 @@ msgstr "genopbygger wiki..." msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index fb9e3964d..756453db5 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Fehler" @@ -402,27 +402,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "Lesen von %s fehlgeschlagen: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "Lesen von %s fehlgeschlagen: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." @@ -502,11 +501,11 @@ msgstr "Umleitungsseite nicht gefunden" msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Spiegel" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Spiegel" @@ -617,7 +616,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "erzeuge %s" @@ -1055,47 +1054,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1177,36 +1176,36 @@ msgstr "erzeuge Wiki neu.." msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index f9497325e..fa9081449 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Error" @@ -407,27 +407,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "no puedo leer de %s: %s " + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "no puedo leer de %s: %s " - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" @@ -508,11 +507,11 @@ msgstr "falta la página a donde redirigir" msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Réplicas" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Réplica" @@ -621,7 +620,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" @@ -1055,49 +1054,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1178,37 +1177,37 @@ msgstr "reconstruyendo el wiki.." msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 19a6c103b..08741e2f2 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Erreur" @@ -398,27 +398,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "Échec de la lecture de %s : %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "Échec de la lecture de %s : %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" @@ -496,11 +495,11 @@ msgstr "Page de redirection introuvable" msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Miroirs" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Miroir" @@ -616,7 +615,7 @@ msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "construction de %s" @@ -1051,47 +1050,47 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1175,34 +1174,34 @@ msgstr "Reconstruction du wiki..." msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff --git a/po/gu.po b/po/gu.po index cdb613f9d..93e96d93d 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "ક્ષતિ" @@ -399,28 +399,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "%s વાંચવામાં નિષ્ફળ: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "%s વાંચવામાં નિષ્ફળ: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -498,11 +497,11 @@ msgstr "ફીડ મળ્યું નહી" msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "મિરરો" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "મિરર" @@ -608,7 +607,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" @@ -1039,47 +1038,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1158,33 +1157,33 @@ msgstr "વીકી ફરીથી બનાવે છે.." msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 1190ffd52..d073af70d 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "" @@ -390,27 +390,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 #, perl-format -msgid "wrong size format \"%s\" (should be WxH)" +msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 +#: ../IkiWiki/Plugin/img.pm:74 #, perl-format -msgid "failed to read %s: %s" +msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "" @@ -484,11 +483,11 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "" @@ -592,7 +591,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "" @@ -1013,47 +1012,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1132,33 +1131,33 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 72ebeb033..fd4798470 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -53,7 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Errore" @@ -396,27 +396,26 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "impossibile leggere %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, perl-format -msgid "failed to read %s: %s" -msgstr "impossibile leggere %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" @@ -493,11 +492,11 @@ msgstr "pagina di reindirizzamento non trovata" msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Mirror" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Mirror" @@ -609,7 +608,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, perl-format msgid "building %s" msgstr "compilazione di %s" @@ -1044,47 +1043,47 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "scansione %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1164,33 +1163,33 @@ msgstr "ricostruzione wiki..." msgid "refreshing wiki.." msgstr "aggiornamento wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index f3c752aea..cdc2d91c5 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Błąd" @@ -404,28 +404,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "awaria w trakcie odczytu %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "awaria w trakcie odczytu %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -511,11 +510,11 @@ msgstr "nieznaleziony kanał RSS" msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Kopie lustrzane" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Kopia lustrzana" @@ -621,7 +620,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" @@ -1061,47 +1060,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1180,35 +1179,35 @@ msgstr "przebudowywanie wiki..." msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 6424c6df2..11c9d60fa 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Fel" @@ -401,28 +401,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "misslyckades med att skriva %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "misslyckades med att skriva %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" @@ -504,11 +503,11 @@ msgstr "mallen %s hittades inte" msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Speglar" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Spegel" @@ -614,7 +613,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" @@ -1048,47 +1047,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1167,33 +1166,33 @@ msgstr "bygger om wiki.." msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/vi.po b/po/vi.po index 8e6edd432..0d64a11e8 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-24 18:53-0400\n" +"POT-Creation-Date: 2009-10-09 19:55-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1277 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 msgid "Error" msgstr "Lỗi" @@ -402,28 +402,27 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/img.pm:63 +#: ../IkiWiki/Plugin/img.pm:64 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, fuzzy, perl-format +msgid "failed to read %s: %s" +msgstr "lỗi ghi %s: %s" + #: ../IkiWiki/Plugin/img.pm:74 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:85 ../IkiWiki/Plugin/img.pm:89 -#: ../IkiWiki/Plugin/img.pm:135 -#, fuzzy, perl-format -msgid "failed to read %s: %s" -msgstr "lỗi ghi %s: %s" - -#: ../IkiWiki/Plugin/img.pm:100 +#: ../IkiWiki/Plugin/img.pm:120 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:152 +#: ../IkiWiki/Plugin/img.pm:140 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" @@ -505,11 +504,11 @@ msgstr "không tìm thấy mẫu %s" msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirrors" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/mirrorlist.pm:42 +#: ../IkiWiki/Plugin/mirrorlist.pm:43 msgid "Mirror" msgstr "Nhân bản" @@ -615,7 +614,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:428 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" @@ -1049,47 +1048,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:289 ../IkiWiki/Render.pm:314 +#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:296 +#: ../IkiWiki/Render.pm:299 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:382 +#: ../IkiWiki/Render.pm:385 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:423 +#: ../IkiWiki/Render.pm:426 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:450 +#: ../IkiWiki/Render.pm:453 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:497 +#: ../IkiWiki/Render.pm:500 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:533 +#: ../IkiWiki/Render.pm:536 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:545 +#: ../IkiWiki/Render.pm:548 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:569 +#: ../IkiWiki/Render.pm:572 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1168,33 +1167,33 @@ msgstr "đang xây dựng lại wiki.." msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:502 +#: ../IkiWiki.pm:501 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:548 +#: ../IkiWiki.pm:547 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:576 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1259 +#: ../IkiWiki.pm:1258 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1817 +#: ../IkiWiki.pm:1820 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1941 +#: ../IkiWiki.pm:1944 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From e1939185d29e1431861e63d6526cb3a498d6033e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 11 Oct 2009 16:42:49 -0400 Subject: ikiwiki-calendar: New command automates creation of archive pages using the calendar plugin. --- debian/changelog | 7 +++++ doc/examples/blog.mdwn | 4 +++ doc/ikiwiki-calendar.mdwn | 51 ++++++++++++++++++++++++++++++++ doc/ikiwiki/directive/calendar.mdwn | 29 ++++++++++++------ doc/plugins/calendar.mdwn | 8 ++--- ikiwiki-calendar | 59 +++++++++++++++++++++++++++++++++++++ templates/calendarmonth.tmpl | 3 ++ templates/calendaryear.tmpl | 1 + 8 files changed, 147 insertions(+), 15 deletions(-) create mode 100644 doc/ikiwiki-calendar.mdwn create mode 100755 ikiwiki-calendar create mode 100644 templates/calendarmonth.tmpl create mode 100644 templates/calendaryear.tmpl (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a79faf7fb..22935955a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20091010) UNRELEASED; urgency=low + + * ikiwiki-calendar: New command automates creation of archive pages + using the calendar plugin. + + -- Joey Hess Sun, 11 Oct 2009 15:54:45 -0400 + ikiwiki (3.20091009) unstable; urgency=low * parentlinks: Add has_parentlinks template parameter to allow styling diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 2155d7fea..f542cad0c 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -23,3 +23,7 @@ Some additional configuration you might want to do: enable comments to posts to the blog: comments_pagespec => 'blog/posts/* and !*/Discussion', + +* Enable the [[calendar|plugins/calendar]] plugin and run the + [[ikiwiki-calendar]] command from cron daily to get an interlinked + set of calendar archives. diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn new file mode 100644 index 000000000..e2cc612f3 --- /dev/null +++ b/doc/ikiwiki-calendar.mdwn @@ -0,0 +1,51 @@ +# NAME + +ikiwiki-calendar - create calendar archive pages + +# SYNOPSIS + +ikiwiki-calendar [-f] your.setup [pagespec] [year] + +# DESCRIPTION + +`ikiwiki-calendar` creates pages that use the [[ikiwiki/directive/calendar]] +directive, allowing the archives to be browsed one month +at a time, with calendar-based navigation. + +You must specify the setup file for your wiki. The pages will +be created inside its `srcdir`, beneath the `archivebase` +directory used by the calendar plugin (default "archives"). + +You will probably want to specify a [[ikiwiki/PageSpec]] +to control which pages are included on the calendars. The +default is all pages. To limit it to only posts in a blog, +use something like "posts/* and !*/Discussion". + +It defaults to creating calendar pages for the current +year, as well as the previous year, and the next year. +If you specify a year, it will create pages for that year. + +Existing pages will not be overwritten by this command by default. +Use the `-f` switch to force it to overwrite any existing pages. + +## CRONTAB + +While this command only needs to be run once a year to update +the archive pages for each new year, you are recommended to set up +a cron job to run it daily, at midnight. Then it will also update +the calendars to highlight the current day. + +An example crontab: + + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" + +# TEMPLATES + +This command uses two [[template|wikitemplates]] to generate +the pages, `calendarmonth.tmpl` and `calendaryear.tmpl`. + +# AUTHOR + +Joey Hess + +Warning: this page is automatically made into ikiwiki-calendar's man page, edit with care diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn index 8a257d6eb..b2ac75b11 100644 --- a/doc/ikiwiki/directive/calendar.mdwn +++ b/doc/ikiwiki/directive/calendar.mdwn @@ -1,5 +1,4 @@ The `calendar` directive is supplied by the [[!iki plugins/calendar desc=calendar]] plugin. -This plugin requires extra setup. See the plugin documentation for details. This directive displays a calendar, similar to the typical calendars shown on some blogs. @@ -12,16 +11,28 @@ some blogs. \[[!calendar type="year" year="2005" pages="blog/* and !*/Discussion"]] +## setup + The calendar is essentially a fancy front end to archives of previous pages, usually used for blogs. It can produce a calendar for a given month, -or a list of months for a given year. - -The month format calendar simply links to any page posted on each -day of the month. The year format calendar links to archive pages, with -names like `archives/2007` (for all of 2007) and `archives/2007/01` -(for January, 2007). For this to work, you'll need to create these archive -pages. They typically use [[inline]] to display or list pages created in -the given time frame. +or a list of months for a given year. The month format calendar simply +links to any page posted on each day of the month. The year format calendar +links to archive pages, with names like `archives/2007` (for all of 2007) +and `archives/2007/01` (for January, 2007). + +While you can insert calendar directives anywhere on your wiki, including +in the sidebar, you'll also need to create these archive pages. They +typically use this directive to display a calendar, and also use [[inline]] +to display or list pages created in the given time frame. + +The `ikiwiki-calendar` command can be used to automatically generate the +archive pages. It also refreshes the wiki, updating the calendars to +highlight the current day. This command is typically run at midnight from +cron. An example crontab: + +An example crontab: + + 0 0 * * * ikiwiki-calendar ~/ikiwiki.setup "posts/* and !*/Discussion" ## usage diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn index 8ade70004..bc1bc6c71 100644 --- a/doc/plugins/calendar.mdwn +++ b/doc/plugins/calendar.mdwn @@ -3,13 +3,9 @@ This plugin provides a [[ikiwiki/directive/calendar]] [[ikiwiki/directive]]. The directive displays a calendar, similar to the typical calendars shown on -some blogs. +some blogs. -Since ikiwiki is a wiki compiler, to keep the calendar up-to-date, -wikis that include it need to be periodically refreshed, typically by cron -at midnight. Example crontab: - - 0 0 * * * ikiwiki -setup ~/ikiwiki.setup -refresh +The [[ikiwiki-calendar]] command is used to keep the calendar up-to-date. ## CSS diff --git a/ikiwiki-calendar b/ikiwiki-calendar new file mode 100755 index 000000000..ec572cb7c --- /dev/null +++ b/ikiwiki-calendar @@ -0,0 +1,59 @@ +#!/usr/bin/perl +use warnings; +use strict; +use IkiWiki; +use IkiWiki::Setup; +use Getopt::Long; + +sub usage () { + die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n"; +} + +my $force=0; +GetOptions( + "force" => \$force, +) || usage(); +my $setup=shift || usage(); +my $pagespec=shift || "*"; +my $year=shift || 1900+(localtime(time))[5]; + +%config=IkiWiki::defaultconfig(); +IkiWiki::Setup::load($setup); +IkiWiki::loadplugins(); +IkiWiki::checkconfig(); + +my $archivebase = 'archives'; +$archivebase = $config{archivebase} if defined $config{archivebase}; + +sub writearchive ($$;$) { + my $template=template(shift); + my $year=shift; + my $month=shift; + + my $page=defined $month ? "$year/$month" : $year; + + my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext}); + $template->param(pagespec => $pagespec); + $template->param(year => $year); + $template->param(month => $month) if defined $month; + + if ($force || ! -e "$config{srcdir}/$pagefile") { + writefile($pagefile, $config{srcdir}, $template->output); + IkiWiki::rcs_add($pagefile) if $config{rcs}; + } +} + +IkiWiki::lockwiki(); + +foreach my $y ($year-1, $year, $year+1) { + writearchive("calendaryear.tmpl", $y); + foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) { + writearchive("calendarmonth.tmpl", $y, $m); + } +} + +IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef) + if $config{rcs}; +IkiWiki::unlockwiki(); + +system("ikiwiki", "-setup", $setup, "-refresh"); diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl new file mode 100644 index 000000000..37ad78c5c --- /dev/null +++ b/templates/calendarmonth.tmpl @@ -0,0 +1,3 @@ +[[!calendar type=month month= year= pages=""]] + +[[!inline pages="creation_month() and creation_year() and " show=0 feeds=no reverse=yes]] diff --git a/templates/calendaryear.tmpl b/templates/calendaryear.tmpl new file mode 100644 index 000000000..714bd6d47 --- /dev/null +++ b/templates/calendaryear.tmpl @@ -0,0 +1 @@ +[[!calendar type=year year= pages=""]] -- cgit v1.2.3 From dd80be66ee7d9a28e788efcc1b3eb62bbe8611dd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 11 Oct 2009 21:06:10 -0400 Subject: calendar: Fix midnight rebuild trigger of calendars with explicit month/year. It was just broken for calendars with an explicit month or year, not triggering at all. Now it will update those at appropriate times. --- IkiWiki/Plugin/calendar.pm | 42 +++++++++++++++++++++++++++++++++--------- debian/changelog | 2 ++ 2 files changed, 35 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index fe7ee0361..9cbfd769d 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -318,24 +318,48 @@ EOF sub preprocess (@) { my %params=@_; + + my $thisyear=1900 + $now[5]; + my $thismonth=1 + $now[4]; + $params{pages} = "*" unless defined $params{pages}; $params{type} = "month" unless defined $params{type}; - $params{month} = sprintf("%02d", $params{month}) if defined $params{month}; $params{week_start_day} = 0 unless defined $params{week_start_day}; $params{months_per_row} = 3 unless defined $params{months_per_row}; - - if (! defined $params{year} || ! defined $params{month}) { - # Record that the calendar next changes at midnight. + $params{year} = $thisyear unless defined $params{year}; + $params{month} = $thismonth unless defined $params{month}; + + $params{month} = sprintf("%02d", $params{month}); + + if ($params{type} eq 'month' && $params{year} == $thisyear + && $params{month} == $thismonth) { + # calendar for current month, updates next midnight $pagestate{$params{destpage}}{calendar}{nextchange}=($time + (60 - $now[0]) # seconds + (59 - $now[1]) * 60 # minutes + (23 - $now[2]) * 60 * 60 # hours ); - - $params{year} = 1900 + $now[5] unless defined $params{year}; - $params{month} = 1 + $now[4] unless defined $params{month}; + } + elsif ($params{type} eq 'month' && + (($params{year} == $thisyear && $params{month} > $thismonth) || + $params{year} > $thisyear)) { + # calendar for upcoming month, updates 1st of that month + $pagestate{$params{destpage}}{calendar}{nextchange}= + timelocal(0, 0, 0, 1, $params{month}-1, $params{year}); + } + elsif ($params{type} eq 'year' && $params{year} == $thisyear) { + # calendar for current year, updates 1st of next month + $pagestate{$params{destpage}}{calendar}{nextchange}= + timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}); + } + elsif ($params{type} eq 'year' && $params{year} > $thisyear) { + # calendar for upcoming year, updates 1st of that year + $pagestate{$params{destpage}}{calendar}{nextchange}= + timelocal(0, 0, 0, 1, 1-1, $params{year}); } else { + # calendar for past month or year, does not need + # to update any more delete $pagestate{$params{destpage}}{calendar}; } @@ -356,10 +380,10 @@ sub preprocess (@) { } my $calendar=""; - if ($params{type} =~ /month/i) { + if ($params{type} eq 'month') { $calendar=format_month(%params); } - elsif ($params{type} =~ /year/i) { + elsif ($params{type} eq 'year') { $calendar=format_year(%params); } diff --git a/debian/changelog b/debian/changelog index 0e288dd08..c64758a77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low * Transitive dependencies are now correctly supported. * ikiwiki-calendar: New command automates creation of archive pages using the calendar plugin. + * calendar: Fix midnight rebuild trigger of calendars with explicit + month/year. -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 -- cgit v1.2.3 From f3342773d3a6c9da11c248c4cc385dca284add06 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 11 Oct 2009 21:42:59 -0400 Subject: calendar: Fix bug in next/previous year/month links, which sometimes linked to an archive page from the wrong year. --- IkiWiki/Plugin/calendar.pm | 63 ++++++++++++++++++++++++---------------------- debian/changelog | 2 ++ 2 files changed, 35 insertions(+), 30 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 9cbfd769d..5b4bfac89 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -81,6 +81,21 @@ sub format_month (@) { # Only one posting per day is being linked to. $linkcache{"$year/$mtag/$mday"} = "$src"; } + + my $pmonth = $params{month} - 1; + my $nmonth = $params{month} + 1; + my $pyear = $params{year}; + my $nyear = $params{year}; + + # Adjust for January and December + if ($params{month} == 1) { + $pmonth = 12; + $pyear--; + } + if ($params{month} == 12) { + $nmonth = 1; + $nyear++; + } my @list; my $calendar="\n"; @@ -97,8 +112,8 @@ sub format_month (@) { # Find out month names for this, next, and previous months my $monthname=POSIX::strftime("%B", @monthstart); - my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{pmonth}-1,$params{pyear}-1900))); - my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$params{nmonth}-1,$params{nyear}-1900))); + my $pmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$pmonth-1,$pyear-1900))); + my $nmonthname=POSIX::strftime("%B", localtime(timelocal(0,0,0,1,$nmonth-1,$nyear-1900))); my $archivebase = 'archives'; $archivebase = $config{archivebase} if defined $config{archivebase}; @@ -113,19 +128,19 @@ sub format_month (@) { } add_depends($params{page}, "$archivebase/$params{year}/".sprintf("%02d", $params{month}), deptype("presence")); - if (exists $pagesources{"$archivebase/$params{pyear}/$params{pmonth}"}) { + if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) { $purl = htmllink($params{page}, $params{destpage}, - "$archivebase/$params{pyear}/" . sprintf("%02d", $params{pmonth}), + "$archivebase/$pyear/" . sprintf("%02d", $pmonth), linktext => " $pmonthname "); } - add_depends($params{page}, "$archivebase/$params{pyear}/".sprintf("%02d", $params{pmonth}), + add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth), deptype("presence")); - if (exists $pagesources{"$archivebase/$params{nyear}/$params{nmonth}"}) { + if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) { $nurl = htmllink($params{page}, $params{destpage}, - "$archivebase/$params{nyear}/" . sprintf("%02d", $params{nmonth}), + "$archivebase/$nyear/" . sprintf("%02d", $nmonth), linktext => " $nmonthname "); } - add_depends($params{page}, "$archivebase/$params{nyear}/".sprintf("%02d", $params{nmonth}), + add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth), deptype("presence")); # Start producing the month calendar @@ -222,8 +237,11 @@ EOF sub format_year (@) { my %params=@_; - + my $calendar="\n"; + + my $pyear = $params{year} - 1; + my $nyear = $params{year} + 1; my $future_month = 0; $future_month = $now[4]+1 if ($params{year} == $now[5]+1900); @@ -240,18 +258,18 @@ sub format_year (@) { linktext => "$params{year}"); } add_depends($params{page}, "$archivebase/$params{year}", deptype("presence")); - if (exists $pagesources{"$archivebase/$params{pyear}"}) { + if (exists $pagesources{"$archivebase/$pyear"}) { $purl = htmllink($params{page}, $params{destpage}, - "$archivebase/$params{pyear}", + "$archivebase/$pyear", linktext => "\←"); } - add_depends($params{page}, "$archivebase/$params{pyear}", deptype("presence")); - if (exists $pagesources{"$archivebase/$params{nyear}"}) { + add_depends($params{page}, "$archivebase/$pyear", deptype("presence")); + if (exists $pagesources{"$archivebase/$nyear"}) { $nurl = htmllink($params{page}, $params{destpage}, - "$archivebase/$params{nyear}", + "$archivebase/$nyear", linktext => "\→"); } - add_depends($params{page}, "$archivebase/$params{nyear}", deptype("presence")); + add_depends($params{page}, "$archivebase/$nyear", deptype("presence")); # Start producing the year calendar $calendar=< Fri, 09 Oct 2009 19:53:50 -0400 -- cgit v1.2.3 From 23a21850faf1cbb4bd8547b11563c5806617cf7e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 11 Oct 2009 21:52:50 -0400 Subject: fix next/prev month padding bug --- IkiWiki/Plugin/calendar.pm | 21 ++++++++++++--------- debian/changelog | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 0266612ae..cf133e8dc 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -96,6 +96,10 @@ sub format_month (@) { $nyear++; } + # Add padding. + $pmonth=sprintf("%02d", $pmonth); + $nmonth=sprintf("%02d", $nmonth); + my $calendar="\n"; # When did this month start? @@ -121,24 +125,24 @@ sub format_month (@) { my ($url, $purl, $nurl)=("$monthname",'',''); if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) { $url = htmllink($params{page}, $params{destpage}, - "$archivebase/$params{year}/".sprintf("%02d", $params{month}), + "$archivebase/$params{year}/".$params{month}, linktext => " $monthname "); } - add_depends($params{page}, "$archivebase/$params{year}/".sprintf("%02d", $params{month}), + add_depends($params{page}, "$archivebase/$params{year}/$params{month}", deptype("presence")); if (exists $pagesources{"$archivebase/$pyear/$pmonth"}) { $purl = htmllink($params{page}, $params{destpage}, - "$archivebase/$pyear/" . sprintf("%02d", $pmonth), + "$archivebase/$pyear/$pmonth", linktext => " $pmonthname "); } - add_depends($params{page}, "$archivebase/$pyear/".sprintf("%02d", $pmonth), + add_depends($params{page}, "$archivebase/$pyear/$pmonth", deptype("presence")); if (exists $pagesources{"$archivebase/$nyear/$nmonth"}) { $nurl = htmllink($params{page}, $params{destpage}, - "$archivebase/$nyear/" . sprintf("%02d", $nmonth), + "$archivebase/$nyear/$nmonth", linktext => " $nmonthname "); } - add_depends($params{page}, "$archivebase/$nyear/".sprintf("%02d", $nmonth), + add_depends($params{page}, "$archivebase/$nyear/$nmonth", deptype("presence")); # Start producing the month calendar @@ -192,8 +196,7 @@ EOF } my $tag; - my $mtag = sprintf("%02d", $params{month}); - if (defined $linkcache{"$params{year}/$mtag/$day"}) { + if (defined $linkcache{"$params{year}/$params{month}/$day"}) { if ($day == $today) { $tag='month-calendar-day-this-day'; } @@ -202,7 +205,7 @@ EOF } $calendar.=qq{\t\t}; $calendar.=htmllink($params{page}, $params{destpage}, - $linkcache{"$params{year}/$mtag/$day"}, + $linkcache{"$params{year}/$params{month}/$day"}, "linktext" => "$day"); $calendar.=qq{\n}; } diff --git a/debian/changelog b/debian/changelog index 8881c48aa..5c47b2524 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,7 +31,7 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low * calendar: Fix midnight rebuild trigger of calendars with explicit month/year. * calendar: Fix bug in next/previous year/month links, which sometimes - linked to an archive page from the wrong year. + linked to an archive page from the wrong year, or were missing. -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 -- cgit v1.2.3 From 33f42db2ea0422551223c255d85d9f4e45ee404b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 11 Oct 2009 22:38:42 -0400 Subject: git: --getctime will now follow renames back to the original creation of a file. This will be a bit more expensive, but --getctime does not need to be fast. And getting the real creation time a very useful when untangling blog histories that involve renames. --- IkiWiki/Plugin/git.pm | 8 +++++--- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index ad58231e0..e10283f59 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -613,9 +613,11 @@ sub rcs_getctime ($) { # Remove srcdir prefix $file =~ s/^\Q$config{srcdir}\E\/?//; - my @sha1s = run_or_non('git', 'rev-list', 'HEAD', '--', $file); - my $ci = git_commit_info($sha1s[$#sha1s], 1); - my $ctime = $ci->{'author_epoch'}; + my @raw_lines = run_or_die('git', 'log', '--reverse', '--follow', + '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c', + '-r', '--', $file); + my $first = parse_diff_tree("", \@raw_lines); + my $ctime = $first->{'author_epoch'}; debug("ctime for '$file': ". localtime($ctime)); return $ctime; diff --git a/debian/changelog b/debian/changelog index 22935955a..76094e7a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20091010) UNRELEASED; urgency=low * ikiwiki-calendar: New command automates creation of archive pages using the calendar plugin. + * git: --getctime will now follow renames back to the original creation + of a file. -- Joey Hess Sun, 11 Oct 2009 15:54:45 -0400 -- cgit v1.2.3 From 11e6d650eae4377485cb83f61a0ce9519ceb4c57 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Oct 2009 12:19:42 -0400 Subject: calendar: Fix CSS for year calendar to match the plugin documentation. The names in the documentation were completly different, but also seemed better chosen than the names in the code. --- IkiWiki/Plugin/calendar.pm | 13 ++++--------- debian/changelog | 1 + 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index e3c5e2f2d..71c671d67 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -300,21 +300,16 @@ EOF my $tag; my $mtag=sprintf("%02d", $month); if ($month == $params{month}) { - if ($pagesources{"$archivebase/$params{year}/$mtag"}) { - $tag = 'this_month_link'; - } - else { - $tag = 'this_month_nolink'; - } + $tag = 'year-calendar-this-month'; } elsif ($pagesources{"$archivebase/$params{year}/$mtag"}) { - $tag = 'month_link'; + $tag = 'year-calendar-month-link'; } elsif ($future_month && $month >= $future_month) { - $tag = 'month_future'; + $tag = 'year-calendar-month-future'; } else { - $tag = 'month_nolink'; + $tag = 'year-calendar-month-nolink'; } if ($pagesources{"$archivebase/$params{year}/$mtag"}) { diff --git a/debian/changelog b/debian/changelog index e9f09a8c6..b9d1923cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -34,6 +34,7 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low linked to an archive page from the wrong year, or were missing. * git: --getctime will now follow renames back to the original creation of a file. + * calendar: Fix CSS for year calendar to match the plugin documentation. -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 -- cgit v1.2.3 From 6678ab8fb3c956ea52d08e546cea7c8e3204aefb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Oct 2009 12:21:46 -0400 Subject: Added minimal default CSS for calendar plugin, just highlighting the current day. --- debian/changelog | 2 ++ doc/style.css | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b9d1923cd..ef92e48fc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low * git: --getctime will now follow renames back to the original creation of a file. * calendar: Fix CSS for year calendar to match the plugin documentation. + * Added minimal default CSS for calendar plugin, just highlighting the + current day. -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 diff --git a/doc/style.css b/doc/style.css index 4770fc942..be86a0818 100644 --- a/doc/style.css +++ b/doc/style.css @@ -403,7 +403,6 @@ span.color { } /* Used by the highlight plugin. */ - pre.hl { color:#000000; background-color:#ffffff; } .hl.num { color:#2928ff; } .hl.esc { color:#ff00ff; } @@ -419,3 +418,7 @@ pre.hl { color:#000000; background-color:#ffffff; } .hl.kwb { color:#830000; } .hl.kwc { color:#000000; font-weight:bold; } .hl.kwd { color:#010181; } + +/* For the calendar plugin. */ +.month-calendar-day-this-day { background-color: #eee; } +.year-calendar-this-month { background-color: #eee; } -- cgit v1.2.3 From d0213917ad143c57f34a96c94ceaaf40122b11cf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Oct 2009 16:25:43 -0400 Subject: inline: Optimize generation of archives, etc Don't generate inlined page content if the template does not use it. --- IkiWiki/Plugin/inline.pm | 3 ++- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 0fe0bd2e1..553fd350c 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -337,7 +337,8 @@ sub preprocess_inline (@) { my $file = $pagesources{$page}; my $type = pagetype($file); if (! $raw || ($raw && ! defined $type)) { - unless ($archive && $quick) { + if (!($archive && $quick) && + $template->query(name => 'content')) { # Get the content before populating the # template, since getting the content uses # the same template if inlines are nested. diff --git a/debian/changelog b/debian/changelog index ef92e48fc..eab725d92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,8 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low * calendar: Fix CSS for year calendar to match the plugin documentation. * Added minimal default CSS for calendar plugin, just highlighting the current day. + * inline: Optimize generation of archives, etc by not getting inlined page + content if the template does not use it. -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 -- cgit v1.2.3 From 1d094d82a3ebdc277680c88ae47bbb78dab62328 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Oct 2009 20:52:18 -0400 Subject: releasing version 3.20091017 --- debian/NEWS | 2 +- debian/changelog | 4 +- po/bg.po | 130 ++++++++++++++++++++++++++--------------------------- po/cs.po | 130 ++++++++++++++++++++++++++--------------------------- po/da.po | 130 ++++++++++++++++++++++++++--------------------------- po/de.po | 130 ++++++++++++++++++++++++++--------------------------- po/es.po | 134 +++++++++++++++++++++++++++---------------------------- po/fr.po | 130 ++++++++++++++++++++++++++--------------------------- po/gu.po | 130 ++++++++++++++++++++++++++--------------------------- po/ikiwiki.pot | 126 +++++++++++++++++++++++++-------------------------- po/it.po | 130 ++++++++++++++++++++++++++--------------------------- po/pl.po | 130 ++++++++++++++++++++++++++--------------------------- po/sv.po | 130 ++++++++++++++++++++++++++--------------------------- po/vi.po | 130 ++++++++++++++++++++++++++--------------------------- 14 files changed, 783 insertions(+), 783 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 7c88ca733..50332670f 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.2009XXXX) UNRELEASED; urgency=low +ikiwiki (3.20091017) unstable; urgency=low To take advantage of significant performance improvements, all wikis need to be rebuilt on upgrade to this version. If you diff --git a/debian/changelog b/debian/changelog index eab725d92..7da20a3f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.2009XXXX) UNRELEASED; urgency=low +ikiwiki (3.20091017) unstable; urgency=low * Added support framework for multiple types of dependencies, including dependncies that are only affected by page precence or link changes. @@ -40,7 +40,7 @@ ikiwiki (3.2009XXXX) UNRELEASED; urgency=low * inline: Optimize generation of archives, etc by not getting inlined page content if the template does not use it. - -- Joey Hess Fri, 09 Oct 2009 19:53:50 -0400 + -- Joey Hess Sat, 17 Oct 2009 15:37:04 -0400 ikiwiki (3.20091009) unstable; urgency=low diff --git a/po/bg.po b/po/bg.po index ada27177c..79ea53624 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Грешка" @@ -188,12 +188,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" @@ -348,18 +348,18 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "" @@ -448,29 +448,20 @@ msgstr "липсващ параметър „id” на шаблона" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "непознат вид сортиране „%s”" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 #, fuzzy msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" @@ -531,7 +522,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Получаване на OpenID номер" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." @@ -617,77 +608,77 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, fuzzy, perl-format msgid "failed to read %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -708,11 +699,11 @@ msgstr "не е инсталиран polygen" msgid "command failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "" @@ -785,7 +776,7 @@ msgstr "" msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -1045,54 +1036,54 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "сканиране на „%s”" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "сканиране на „%s”" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" +msgstr "премахване на „%s” понеже не се генерира от „%s”" + +#: ../IkiWiki/Render.pm:603 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:548 -#, fuzzy, perl-format -msgid "removing %s, no longer built by %s" -msgstr "премахване на „%s” понеже не се генерира от „%s”" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1171,35 +1162,44 @@ msgstr "обновяване на уики..." msgid "refreshing wiki.." msgstr "осъвременяване на уики..." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "непознат вид сортиране „%s”" + +#: ../IkiWiki.pm:2036 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 219e2769a..b3c25c8a8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Chyba" @@ -186,12 +186,12 @@ msgstr "" "Je mi líto, ale podle blogspam to " "vypadá jako spam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "%s z %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" @@ -341,18 +341,18 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" @@ -434,29 +434,20 @@ msgstr "chybí parametr pages" msgid "the %s and %s parameters cannot be used together" msgstr "parametry %s a %s nelze použít zároveň" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "neznámý typ řazení %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "nepodařilo se spustit dot" @@ -511,7 +502,7 @@ msgstr "Přihlásit pomocí" msgid "Get an OpenID" msgstr "Získat OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." @@ -597,16 +588,16 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -614,7 +605,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -622,55 +613,55 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, perl-format msgid "failed to read %s" msgstr "nepodařilo se přečíst %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " @@ -692,11 +683,11 @@ msgstr "polygen není nainstalován" msgid "command failed" msgstr "příkaz selhal" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "chybí vzorec" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "neznámý vzorec" @@ -769,7 +760,7 @@ msgstr "%A o poledni" msgid "illegal percent value %s" msgstr "neplatná procentuální hodnota %s" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" @@ -1021,7 +1012,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" msgid "bad file name %s" msgstr "chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "prohledávám %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1030,47 +1026,42 @@ msgstr "" "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s má několik možných zdrojových stránek" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "prohledávám %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, perl-format msgid "building %s, which links to %s" msgstr "sestavuji %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "odstraňuji %s, již není sestavována pomocí %s" + +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which depends on %s" msgstr "sestavuji %s, která závisí na %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, perl-format msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:548 -#, perl-format -msgid "removing %s, no longer built by %s" -msgstr "odstraňuji %s, již není sestavována pomocí %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1149,33 +1140,42 @@ msgstr "znovusestavuji wiki..." msgid "refreshing wiki.." msgstr "obnovuji wiki..." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 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:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "neznámý typ řazení %s" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index b7da31d34..b68e663a7 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Fejl" @@ -193,12 +193,12 @@ msgstr "" "Beklager, men det ligner spam til blogspam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "%s fra %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" @@ -349,18 +349,18 @@ msgstr "kan ikke få sider til at passe sammen: %s" msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" @@ -445,29 +445,20 @@ msgstr "mangler pages-parametren" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "Sort::Naturally krævet for title_natural sortering" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "ukendt sorteringsform %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" @@ -524,7 +515,7 @@ msgstr "Log på med" msgid "Get an OpenID" msgstr "Skaf en OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 msgid "All pages have other pages linking to them." msgstr "Alle sider har henvisninger fra andre sider." @@ -613,16 +604,16 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -630,7 +621,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -638,55 +629,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, perl-format msgid "failed to read %s" msgstr "læsning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -707,11 +698,11 @@ msgstr "polygen ikke installeret" msgid "command failed" msgstr "kommando fejlede" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "manglende formular" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "ukendt formular" @@ -784,7 +775,7 @@ msgstr "midt på dagen %A" msgid "illegal percent value %s" msgstr "ugyldig procentværdi %s" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" @@ -1036,7 +1027,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "gennemlæser %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1045,47 +1041,42 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "gennemlæser %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "fjerner %s, ikke længere dannet af %s" + +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:548 -#, perl-format -msgid "removing %s, no longer built by %s" -msgstr "fjerner %s, ikke længere dannet af %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1164,34 +1155,43 @@ msgstr "genopbygger wiki..." msgid "refreshing wiki.." msgstr "genopfrisker wiki..." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 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:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Sort::Naturally krævet for title_natural sortering" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "ukendt sorteringsform %s" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index 756453db5..4f3be838f 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Fehler" @@ -190,12 +190,12 @@ msgstr "" "Entschuldigung, aber blogspam stuft das " "als Spam ein: " -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "%s von %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" @@ -347,18 +347,18 @@ msgstr "Kann die Seiten nicht zuordnen: %s" msgid "%s is an attachment, not a page." msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" @@ -445,29 +445,20 @@ msgstr "fehlender Seitenparameter" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "Sort::Naturally wird benötigt für title_natural sort" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "Unbekannter Sortierungstyp %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" @@ -525,7 +516,7 @@ msgstr "Anmelden mit" msgid "Get an OpenID" msgstr "Eine OpenID anfordern" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." @@ -616,16 +607,16 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -633,7 +624,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -641,55 +632,55 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, perl-format msgid "failed to read %s" msgstr "lesen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -711,11 +702,11 @@ msgstr "polygen ist nicht installiert" msgid "command failed" msgstr "Befehl fehlgeschlagen" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "fehlende Formel" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "unbekannte Formel" @@ -788,7 +779,7 @@ msgstr "am Nachmittag des %A" msgid "illegal percent value %s" msgstr "unzulässiger Prozentwert %s" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " @@ -1045,7 +1036,12 @@ msgstr "" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "durchsuche %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1054,47 +1050,42 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "durchsuche %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "entferne %s, wird nicht länger von %s erzeugt" + +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:548 -#, perl-format -msgid "removing %s, no longer built by %s" -msgstr "entferne %s, wird nicht länger von %s erzeugt" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1176,36 +1167,45 @@ msgstr "erzeuge Wiki neu.." msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Sort::Naturally wird benötigt für title_natural sort" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "Unbekannter Sortierungstyp %s" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index fa9081449..ddaf20d85 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Error" @@ -195,12 +195,12 @@ msgstr "" "Lo siento, pero el analizador blogspam " "dice que el texto puede ser spam." -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "%s desde la página %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" @@ -351,18 +351,18 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" @@ -450,31 +450,20 @@ msgstr "falta el parámetro pages" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" -"Se necesita el módulo Sort::Naturally para el tipo de ordenación " -"title_natural" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "no conozco este tipo de ordenación %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" @@ -531,7 +520,7 @@ msgstr "Identificarse mediante " msgid "Get an OpenID" msgstr "Consiga un identificador OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Todas las páginas están referenciadas entre sí." @@ -620,77 +609,77 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, fuzzy, perl-format msgid "failed to read %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -710,11 +699,11 @@ msgstr "El complemento polygen no ha sido instalado" msgid "command failed" msgstr "la ejecución del programa ha fallado" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "falta la fórmula" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "fórmula desconocida " @@ -787,7 +776,7 @@ msgstr "el %A a media tarde" msgid "illegal percent value %s" msgstr "%s es un valor erróneo para un porcentaje" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" @@ -1045,7 +1034,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "explorando %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1054,49 +1048,44 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "explorando %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" +msgstr "eliminando la página %s puesto que ya no se deriva de %s" + +#: ../IkiWiki/Render.pm:603 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:548 -#, fuzzy, perl-format -msgid "removing %s, no longer built by %s" -msgstr "eliminando la página %s puesto que ya no se deriva de %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1177,37 +1166,48 @@ msgstr "reconstruyendo el wiki.." msgid "refreshing wiki.." msgstr "actualizando el wiki.." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 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:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" +"Se necesita el módulo Sort::Naturally para el tipo de ordenación " +"title_natural" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "no conozco este tipo de ordenación %s" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 08741e2f2..1d402468c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Erreur" @@ -188,12 +188,12 @@ msgstr "" "Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "%s sur %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Aucun lien cassé !" @@ -343,18 +343,18 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" @@ -441,29 +441,20 @@ msgstr "Paramètre « pages » manquant" msgid "the %s and %s parameters cannot be used together" msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "Type de tri %s inconnu" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "Échec du lancement de dot" @@ -519,7 +510,7 @@ msgstr "S'identifier en tant que" msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -615,16 +606,16 @@ msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -632,7 +623,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -640,55 +631,55 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, perl-format msgid "failed to read %s" msgstr "Impossible de lire %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " @@ -710,11 +701,11 @@ msgstr "polygen n'est pas installé" msgid "command failed" msgstr "Échec de la commande" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "formule manquante" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "formule inconnue" @@ -787,7 +778,7 @@ msgstr "%A, à midi" msgid "illegal percent value %s" msgstr "pourcentage %s illégal" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire." @@ -1041,7 +1032,12 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "Examen de %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1050,47 +1046,42 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "Examen de %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "Suppression de %s, qui n'est plus rendu par %s" + +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:548 -#, perl-format -msgid "removing %s, no longer built by %s" -msgstr "Suppression de %s, qui n'est plus rendu par %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1174,34 +1165,43 @@ msgstr "Reconstruction du wiki..." msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "Type de tri %s inconnu" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff --git a/po/gu.po b/po/gu.po index 93e96d93d..2f7c5859e 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "ક્ષતિ" @@ -186,12 +186,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" @@ -346,18 +346,18 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "" @@ -443,29 +443,20 @@ msgstr "ખોવાયેલ %s વિકલ્પ" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" @@ -521,7 +512,7 @@ msgstr "" msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." @@ -607,77 +598,77 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, fuzzy, perl-format msgid "failed to read %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -698,11 +689,11 @@ msgstr "પોલિગોન સ્થાપિત નથી" msgid "command failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "ખોવાયેલ સૂત્ર" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "અજાણ્યું સૂત્ર" @@ -776,7 +767,7 @@ msgstr "બપોરે %A પર" msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -1031,54 +1022,54 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "%s શોધે છે" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "%s શોધે છે" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" +msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" + +#: ../IkiWiki/Render.pm:603 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:548 -#, fuzzy, perl-format -msgid "removing %s, no longer built by %s" -msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1157,33 +1148,42 @@ msgstr "વીકી ફરીથી બનાવે છે.." msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" + +#: ../IkiWiki.pm:2036 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d073af70d..5bae38012 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "" @@ -183,12 +183,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "" @@ -338,18 +338,18 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "" @@ -431,29 +431,20 @@ msgstr "" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "" @@ -507,7 +498,7 @@ msgstr "" msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 msgid "All pages have other pages linking to them." msgstr "" @@ -591,76 +582,76 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, perl-format msgid "failed to read %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -680,11 +671,11 @@ msgstr "" msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "" @@ -757,7 +748,7 @@ msgstr "" msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -1005,54 +996,54 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:471 #, perl-format -msgid "scanning %s" +msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:480 #, perl-format -msgid "building %s, which links to %s" +msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:548 -#, perl-format -msgid "removing %s, no longer built by %s" -msgstr "" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1131,33 +1122,42 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index fd4798470..6fa47cd24 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -53,7 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Errore" @@ -185,12 +185,12 @@ msgstr "" "È stato riconosciuto come spam da blogspam: " -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "%s da %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." @@ -340,18 +340,18 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" @@ -438,29 +438,20 @@ msgstr "parametro pagine mancante" msgid "the %s and %s parameters cannot be used together" msgstr "i parametri %s e %s non possono essere usati insieme" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "ordinamento %s sconosciuto" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 msgid "failed to run dot" msgstr "impossibile eseguire dot" @@ -516,7 +507,7 @@ msgstr "Accedi tramite" msgid "Get an OpenID" msgstr "Ottieni un OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 msgid "All pages have other pages linking to them." msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." @@ -608,16 +599,16 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -625,7 +616,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -633,55 +624,55 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, perl-format msgid "failed to read %s" msgstr "impossibile leggere %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " @@ -703,11 +694,11 @@ msgstr "polygen non è installato" msgid "command failed" msgstr "errore nel comando" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "formula mancante" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "formula sconosciuta" @@ -780,7 +771,7 @@ msgstr "%A a mezzogiorno" msgid "illegal percent value %s" msgstr "valore percentuale %s non ammesso" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " @@ -1034,7 +1025,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s" msgid "bad file name %s" msgstr "nome file %s scorretto" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "scansione %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1043,47 +1039,42 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "scansione %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "rimozione di %s, non più richiesto da %s" + +#: ../IkiWiki/Render.pm:603 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:548 -#, perl-format -msgid "removing %s, no longer built by %s" -msgstr "rimozione di %s, non più richiesto da %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1163,33 +1154,42 @@ msgstr "ricostruzione wiki..." msgid "refreshing wiki.." msgstr "aggiornamento wiki..." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "ordinamento %s sconosciuto" + +#: ../IkiWiki.pm:2036 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index cdc2d91c5..47a0fb6fa 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Błąd" @@ -190,12 +190,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" @@ -350,18 +350,18 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "" @@ -450,29 +450,20 @@ msgstr "brakujący parametr %s" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "nieznany sposób sortowania %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 #, fuzzy msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" @@ -534,7 +525,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Pobierz OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" @@ -620,77 +611,77 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, fuzzy, perl-format msgid "failed to read %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -711,11 +702,11 @@ msgstr "wtyczka polygen nie jest zainstalowana" msgid "command failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "brakująca reguła" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "nieznana reguła" @@ -789,7 +780,7 @@ msgstr "w południe w %A" msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -1053,54 +1044,54 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "skanowanie %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "skanowanie %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" +msgstr "usuwanie %s nie tworzonego już przez %s" + +#: ../IkiWiki/Render.pm:603 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:548 -#, fuzzy, perl-format -msgid "removing %s, no longer built by %s" -msgstr "usuwanie %s nie tworzonego już przez %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1179,35 +1170,44 @@ msgstr "przebudowywanie wiki..." msgid "refreshing wiki.." msgstr "odświeżanie wiki..." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 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:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "nieznany sposób sortowania %s" + +#: ../IkiWiki.pm:2036 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 11c9d60fa..ad723dfc0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Fel" @@ -187,12 +187,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" @@ -347,18 +347,18 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "" @@ -445,29 +445,20 @@ msgstr "mall saknar id-parameter" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "okänd sorteringstyp %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 #, fuzzy msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" @@ -527,7 +518,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Skaffa ett OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." @@ -613,77 +604,77 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, fuzzy, perl-format msgid "failed to read %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -704,11 +695,11 @@ msgstr "polygen inte installerad" msgid "command failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "" @@ -781,7 +772,7 @@ msgstr "" msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -1040,54 +1031,54 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "söker av %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "söker av %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" +msgstr "tar bort %s, som inte längre ritas upp av %s" + +#: ../IkiWiki/Render.pm:603 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:548 -#, fuzzy, perl-format -msgid "removing %s, no longer built by %s" -msgstr "tar bort %s, som inte längre ritas upp av %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1166,33 +1157,42 @@ msgstr "bygger om wiki.." msgid "refreshing wiki.." msgstr "uppdaterar wiki.." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 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:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "okänd sorteringstyp %s" + +#: ../IkiWiki.pm:2036 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/vi.po b/po/vi.po index 0d64a11e8..ad970a85f 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-09 19:55-0400\n" +"POT-Creation-Date: 2009-10-17 20:47-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1276 +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 msgid "Error" msgstr "Lỗi" @@ -188,12 +188,12 @@ msgid "" "\">blogspam: " msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:42 +#: ../IkiWiki/Plugin/brokenlinks.pm:38 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:50 +#: ../IkiWiki/Plugin/brokenlinks.pm:46 msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." @@ -348,18 +348,18 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:645 ../IkiWiki/Plugin/git.pm:663 +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:685 +#: ../IkiWiki/Plugin/git.pm:691 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:689 +#: ../IkiWiki/Plugin/git.pm:695 msgid "you are not allowed to change file modes" msgstr "" @@ -448,29 +448,20 @@ msgstr "mẫu thiếu tham số id" msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:212 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" - -#: ../IkiWiki/Plugin/inline.pm:223 -#, perl-format -msgid "unknown sort type %s" -msgstr "kiểu sắp xếp không rõ %s" - -#: ../IkiWiki/Plugin/inline.pm:318 +#: ../IkiWiki/Plugin/inline.pm:312 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:338 +#: ../IkiWiki/Plugin/inline.pm:332 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:603 +#: ../IkiWiki/Plugin/inline.pm:598 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" -#: ../IkiWiki/Plugin/linkmap.pm:106 +#: ../IkiWiki/Plugin/linkmap.pm:101 #, fuzzy msgid "failed to run dot" msgstr "linkmap không chạy dot được" @@ -528,7 +519,7 @@ msgstr "" msgid "Get an OpenID" msgstr "Lấy OpenID" -#: ../IkiWiki/Plugin/orphans.pm:45 +#: ../IkiWiki/Plugin/orphans.pm:55 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." @@ -614,77 +605,77 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:426 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:450 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:470 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:869 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:883 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:892 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:934 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:947 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1031 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1108 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1111 +#: ../IkiWiki/Plugin/po.pm:1113 #, fuzzy, perl-format msgid "failed to read %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1160 +#: ../IkiWiki/Plugin/po.pm:1162 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -705,11 +696,11 @@ msgstr "chưa cài đặt polygen" msgid "command failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/postsparkline.pm:41 +#: ../IkiWiki/Plugin/postsparkline.pm:46 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:48 +#: ../IkiWiki/Plugin/postsparkline.pm:53 msgid "unknown formula" msgstr "" @@ -782,7 +773,7 @@ msgstr "" msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:59 +#: ../IkiWiki/Plugin/progress.pm:55 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -1041,54 +1032,54 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:266 +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "đang quét %s" + +#: ../IkiWiki/Render.pm:271 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:294 ../IkiWiki/Render.pm:321 +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:299 +#: ../IkiWiki/Render.pm:305 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:385 +#: ../IkiWiki/Render.pm:395 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:426 -#, perl-format -msgid "scanning %s" -msgstr "đang quét %s" - -#: ../IkiWiki/Render.pm:453 +#: ../IkiWiki/Render.pm:471 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:500 +#: ../IkiWiki/Render.pm:480 +#, fuzzy, perl-format +msgid "removing %s, no longer built by %s" +msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" + +#: ../IkiWiki/Render.pm:603 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:536 +#: ../IkiWiki/Render.pm:616 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:548 -#, fuzzy, perl-format -msgid "removing %s, no longer built by %s" -msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" - -#: ../IkiWiki/Render.pm:572 +#: ../IkiWiki/Render.pm:679 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1167,33 +1158,42 @@ msgstr "đang xây dựng lại wiki.." msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:232 +#: ../IkiWiki.pm:238 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:501 +#: ../IkiWiki.pm:507 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:547 +#: ../IkiWiki.pm:553 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:582 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1258 +#: ../IkiWiki.pm:1264 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1820 +#: ../IkiWiki.pm:1863 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1944 +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "kiểu sắp xếp không rõ %s" + +#: ../IkiWiki.pm:2036 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From d1a88c892ea1786e3f8451d0ef9069be9358e332 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Oct 2009 13:47:30 -0400 Subject: edittemplate: Allow template page name to be specified using anything legal for a wikilink (including eg, leading slashes). Before, the htmllink would display the link to the template as if it were a wikilink, but what was stored was not, which could lead to confusing situations. --- IkiWiki/Plugin/edittemplate.pm | 3 ++- debian/changelog | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index 7d2eba194..e8e7b1e04 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -55,7 +55,8 @@ sub preprocess (@) { } my $link=linkpage($params{template}); - $pagestate{$params{page}}{edittemplate}{$params{match}}=$link; + my $bestlink=bestlink($params{page}, $link); + $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink; return "" if ($params{silent} && IkiWiki::yesno($params{silent})); add_depends($params{page}, $link, deptype("presence")); diff --git a/debian/changelog b/debian/changelog index 7da20a3f7..81935f998 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20091018) UNRELEASED; urgency=low + + * edittemplate: Allow template page name to be specified using anything + legal for a wikilink (including eg, leading slashes). + + -- Joey Hess Sun, 18 Oct 2009 13:44:09 -0400 + ikiwiki (3.20091017) unstable; urgency=low * Added support framework for multiple types of dependencies, including -- cgit v1.2.3 From 2d60ea7fa8c34f5904e5bc40d2d2c60fd938232d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Oct 2009 13:56:35 -0400 Subject: edittemplate: Work around bug #551499 in CGI::FormBuilder. --- IkiWiki/Plugin/edittemplate.pm | 7 +++++-- debian/changelog | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm index e8e7b1e04..a163b0d84 100644 --- a/IkiWiki/Plugin/edittemplate.pm +++ b/IkiWiki/Plugin/edittemplate.pm @@ -83,10 +83,13 @@ sub formbuilder (@) { foreach my $field ($form->field) { if ($field eq 'page') { @page_locs=$field->def_value; - push @page_locs, $field->options; + + # FormBuilder is on the bad crack. See #551499 + my @options=map { ref $_ ? @$_ : $_ } $field->options; + + push @page_locs, @options; } } - foreach my $p (@page_locs) { foreach my $registering_page (keys %pagestate) { if (exists $pagestate{$registering_page}{edittemplate}) { diff --git a/debian/changelog b/debian/changelog index 81935f998..95dc8c6b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * edittemplate: Allow template page name to be specified using anything legal for a wikilink (including eg, leading slashes). + * edittemplate: Work around bug #551499 in CGI::FormBuilder. -- Joey Hess Sun, 18 Oct 2009 13:44:09 -0400 -- cgit v1.2.3 From 587e0c3d21dfbde052e0fd71a7ed0e33e09e757f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Oct 2009 13:50:49 -0400 Subject: Fix a bug introduced in the last version that caused ikiwiki to skip all files if a sourcedir of "./" was specified. --- IkiWiki/Render.pm | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0fe20c64f..0889fed62 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -287,13 +287,13 @@ sub find_src_files () { wanted => sub { my $file=decode_utf8($_); $file=~s/^\Q$config{srcdir}\E\/?//; + return if -l $_ || -d _ || ! length $file; my $page = pagename($file); if (! exists $pagesources{$page} && file_pruned($file)) { $File::Find::prune=1; return; } - return if -l $_ || -d _ || ! length $file; my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint if (! defined $f) { @@ -314,13 +314,13 @@ sub find_src_files () { wanted => sub { my $file=decode_utf8($_); $file=~s/^\Q$dir\E\/?//; + return if -l $_ || -d _ || ! length $file; my $page=pagename($file); if (! exists $pagesources{$page} && file_pruned($file)) { $File::Find::prune=1; return; } - return if -l $_ || -d _ || ! length $file; my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint if (! defined $f) { diff --git a/debian/changelog b/debian/changelog index 95dc8c6b2..f6739952e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * edittemplate: Allow template page name to be specified using anything legal for a wikilink (including eg, leading slashes). * edittemplate: Work around bug #551499 in CGI::FormBuilder. + * Fix a bug introduced in the last version that caused ikiwiki + to skip all files if a sourcedir of "./" was specified. -- Joey Hess Sun, 18 Oct 2009 13:44:09 -0400 -- cgit v1.2.3 From b6f6f126d0e3fa23687f2d8c537de207e2c7b5d3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Oct 2009 16:27:44 -0400 Subject: avoid -O default for CFLAGS, and document --- IkiWiki/Wrapper.pm | 6 +++--- debian/changelog | 1 + doc/usage.mdwn | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 7a1529119..5427a5c80 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -142,9 +142,9 @@ $pre_exec } EOF - my $cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc'; - my $cflags=exists $ENV{CFLAGS} ? possibly_foolish_untaint($ENV{CFLAGS}) : '-O'; - if (system($cc, $cflags, "$wrapper.c", "-o", "$wrapper.new") != 0) { + my @cc=exists $ENV{CC} ? possibly_foolish_untaint($ENV{CC}) : 'cc'; + push @cc, possibly_foolish_untaint($ENV{CFLAGS}) if exists $ENV{CFLAGS}; + if (system(@cc, "$wrapper.c", "-o", "$wrapper.new") != 0) { #translators: The parameter is a C filename. error(sprintf(gettext("failed to compile %s"), "$wrapper.c")); } diff --git a/debian/changelog b/debian/changelog index f6739952e..0ff7a0d13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * edittemplate: Work around bug #551499 in CGI::FormBuilder. * Fix a bug introduced in the last version that caused ikiwiki to skip all files if a sourcedir of "./" was specified. + * Support CFLAGS when building wrapper. -- Joey Hess Sun, 18 Oct 2009 13:44:09 -0400 diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 0c618de5c..4ee935f73 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -345,6 +345,10 @@ also be configured using a setup file. This controls what C compiler is used to build wrappers. Default is 'cc'. +* CFLAGS + + This can be used to pass options to the C compiler when building wrappers. + # SEE ALSO * [[ikiwiki-mass-rebuild]](8) -- cgit v1.2.3 From b9071082717cd7fd56e66963b47a6d589848e062 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Oct 2009 16:42:25 -0400 Subject: meta: Gather permalink info on scan pass so it is available to inline when using a template that does not include page content. --- IkiWiki/Plugin/meta.pm | 7 +++++-- debian/changelog | 2 ++ doc/bugs/inline_breaks_PERMALINK_variable.mdwn | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 8dcd73a1a..6fe9cda34 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -121,6 +121,10 @@ sub preprocess (@) { $pagestate{$page}{meta}{authorurl}=$value if safeurl($value); # fallthrough } + elsif ($key eq 'permalink') { + $pagestate{$page}{meta}{permalink}=$value if safeurl($value); + # fallthrough + } elsif ($key eq 'date') { eval q{use Date::Parse}; if (! $@) { @@ -141,10 +145,9 @@ sub preprocess (@) { return; } - # Metadata collection that happens only during preprocessing pass. + # Metadata handling that happens only during preprocessing pass. if ($key eq 'permalink') { if (safeurl($value)) { - $pagestate{$page}{meta}{permalink}=$value; push @{$metaheaders{$page}}, scrub('', $destpage); } } diff --git a/debian/changelog b/debian/changelog index 0ff7a0d13..be30b498c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * Fix a bug introduced in the last version that caused ikiwiki to skip all files if a sourcedir of "./" was specified. * Support CFLAGS when building wrapper. + * meta: Gather permalink info on scan pass so it is available + to inline when using a template that does not include page content. -- Joey Hess Sun, 18 Oct 2009 13:44:09 -0400 diff --git a/doc/bugs/inline_breaks_PERMALINK_variable.mdwn b/doc/bugs/inline_breaks_PERMALINK_variable.mdwn index 8a50b1262..fc891bb25 100644 --- a/doc/bugs/inline_breaks_PERMALINK_variable.mdwn +++ b/doc/bugs/inline_breaks_PERMALINK_variable.mdwn @@ -7,3 +7,19 @@ with sometemplate being > `

    ()

    ` produced output that links nowhere (``) while the other variables do fine. This problem does not occur in 3.1415926. + +> This must be caused by an optimisation that avoids reading the page +> content when using a template that does not use CONTENT. +> +> I guess that it needs to instead check all the variables the template +> uses, and read content if PERMALINK, or probably any other unknown +> variable is used. Unfortunatly, that will lose the optimisation +> for the archivepage template as well -- it also uses PERMALINK. +> +> So, revert the optimisation? Or, make meta gather the permalink +> data on scan? That seems doable, but is not a general fix for +> other stuff that might be a) used in a template and b) gathered +> at preprocess time. +> +> For now, I am going with the special case fix of fixing meta. I may need +> to go for a more general fix later. --[[Joey]] [[!tag done]] -- cgit v1.2.3 From fe2ff822a525f4faef4740c8e2f18d71ec5a8cf3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Oct 2009 20:34:25 -0400 Subject: releasing version 3.20091022 --- debian/changelog | 4 ++-- po/ikiwiki.pot | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index be30b498c..9b0cd5f52 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20091018) UNRELEASED; urgency=low +ikiwiki (3.20091022) unstable; urgency=low * edittemplate: Allow template page name to be specified using anything legal for a wikilink (including eg, leading slashes). @@ -9,7 +9,7 @@ ikiwiki (3.20091018) UNRELEASED; urgency=low * meta: Gather permalink info on scan pass so it is available to inline when using a template that does not include page content. - -- Joey Hess Sun, 18 Oct 2009 13:44:09 -0400 + -- Joey Hess Thu, 22 Oct 2009 20:25:15 -0400 ikiwiki (3.20091017) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 5bae38012..30179103d 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-22 20:27-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -303,12 +303,12 @@ msgstr "" msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "" @@ -462,15 +462,15 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "" @@ -1087,13 +1087,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "" -- cgit v1.2.3 From 789e0bfd6b43c20697bad7f69633e1f49a01cc5a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Oct 2009 12:38:30 -0400 Subject: inline: Fix raw mode. Closes: #552114 --- IkiWiki/Plugin/inline.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index a836c18f4..942df6f89 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -332,7 +332,7 @@ sub preprocess_inline (@) { error sprintf(gettext("nonexistant template %s"), $params{template}); } my $template=HTML::Template->new(@params) unless $raw; - my $needcontent=!($archive && $quick) && $template->query(name => 'content'); + my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content')); foreach my $page (@list) { my $file = $pagesources{$page}; diff --git a/debian/changelog b/debian/changelog index 9b0cd5f52..278ea01bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20091023) UNRELEASED; urgency=low + + * inline: Fix raw mode. Closes: #552114 + + -- Joey Hess Fri, 23 Oct 2009 12:37:51 -0400 + ikiwiki (3.20091022) unstable; urgency=low * edittemplate: Allow template page name to be specified using anything -- cgit v1.2.3 From ff0e203c477b4d280035c168f19988c6285545ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Oct 2009 12:43:35 -0400 Subject: releasing version 3.20091023 --- debian/changelog | 4 ++-- po/ikiwiki.pot | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 278ea01bc..c73aa53d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -ikiwiki (3.20091023) UNRELEASED; urgency=low +ikiwiki (3.20091023) unstable; urgency=low * inline: Fix raw mode. Closes: #552114 - -- Joey Hess Fri, 23 Oct 2009 12:37:51 -0400 + -- Joey Hess Fri, 23 Oct 2009 12:38:50 -0400 ikiwiki (3.20091022) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 30179103d..d52e3bd99 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-22 20:27-0400\n" +"POT-Creation-Date: 2009-10-23 12:40-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From f756d7e6de847277708249b601696f42e5882e58 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Oct 2009 11:53:55 -0400 Subject: po: Fix breakage caused by changes to render code. --- IkiWiki/Plugin/po.pm | 3 +-- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index d9aa9bfda..02fc4a89e 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -386,8 +386,7 @@ sub change (@) { resetalreadyfiltered(); require IkiWiki::Render; foreach my $file (@rendered) { - debug(sprintf(gettext("building %s"), $file)); - IkiWiki::render($file); + IkiWiki::render($file, sprintf(gettext("building %s"), $file)); } } diff --git a/debian/changelog b/debian/changelog index c73aa53d7..3d910e3ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20091024) UNRELEASED; urgency=low + + * po: Fix breakage caused by changes to render code. + + -- Joey Hess Mon, 26 Oct 2009 11:53:32 -0400 + ikiwiki (3.20091023) unstable; urgency=low * inline: Fix raw mode. Closes: #552114 -- cgit v1.2.3 From a2979b2b52eee47cc6d08274b5c6947aeaf9bfdc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Oct 2009 11:56:42 -0400 Subject: mdwn: Avoid trying to use multimarkdown if it is not installed. --- IkiWiki/Plugin/mdwn.pm | 6 ++++-- debian/changelog | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index c62780cb8..3de59ef3d 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -43,8 +43,10 @@ sub htmlize (@) { if ($@) { debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed")); } - $markdown_sub=sub { - Text::MultiMarkdown::markdown(shift, {use_metadata => 0}); + else { + $markdown_sub=sub { + Text::MultiMarkdown::markdown(shift, {use_metadata => 0}); + } } } if (! defined $markdown_sub) { diff --git a/debian/changelog b/debian/changelog index 3d910e3ba..336924317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low * po: Fix breakage caused by changes to render code. + * mdwn: Avoid trying to use multimarkdown if it is not installed. -- Joey Hess Mon, 26 Oct 2009 11:53:32 -0400 -- cgit v1.2.3 From 8dfd5289a970e2a77499a2178c493c2c233ba27e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Oct 2009 13:24:27 -0400 Subject: moderatedcomments: New plugin to allow comment moderation w/o relying on blogspam.net. --- IkiWiki/Plugin/moderatedcomments.pm | 44 +++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ doc/plugins/comments.mdwn | 3 ++- doc/plugins/moderatedcomments.mdwn | 10 +++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 IkiWiki/Plugin/moderatedcomments.pm create mode 100644 doc/plugins/moderatedcomments.mdwn (limited to 'debian') diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm new file mode 100644 index 000000000..2555927b7 --- /dev/null +++ b/IkiWiki/Plugin/moderatedcomments.pm @@ -0,0 +1,44 @@ +#!/usr/bin/perl +package IkiWiki::Plugin::moderatedcomments; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "moderatedcomments", call => \&getsetup); + hook(type => "checkcontent", id => "moderatedcomments", call => \&checkcontent); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 0, + }, + moderate_users => { + type => 'boolean', + example => 1, + description => 'Moderate comments of logged-in users?', + safe => 1, + rebuild => 0, + }, +} + +sub checkcontent (@) { + my %params=@_; + + # only handle comments + return undef unless pagespec_match($params{page}, "postcomment(*)", + location => $params{page}); + + # admins and maybe users can comment w/o moderation + my $session=$params{session}; + my $user=$session->param("name") if $session; + return undef if defined $user && (IkiWiki::is_admin($user) || + (exists $config{moderate_users} && ! $config{moderate_users})); + + return gettext("comment needs moderation"); +} + +1 diff --git a/debian/changelog b/debian/changelog index 336924317..f517111b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low * po: Fix breakage caused by changes to render code. * mdwn: Avoid trying to use multimarkdown if it is not installed. + * moderatedcomments: New plugin to allow comment moderation w/o relying + on blogspam.net. -- Joey Hess Mon, 26 Oct 2009 11:53:32 -0400 diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn index 7e2232411..b6d4d252b 100644 --- a/doc/plugins/comments.mdwn +++ b/doc/plugins/comments.mdwn @@ -45,7 +45,8 @@ There are some global options for the setup file: ## comment moderation If you enable the [[blogspam]] plugin, comments that appear spammy will be -held for moderation. Wiki admins can access the comment moderation queue +held for moderation. (Or with the [[moderatedcomments]] plugin, all +comments will be held.) Wiki admins can access the comment moderation queue via a button on their Preferences page. The comments are stored in `.ikiwiki/comments_pending/`, and can be diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn new file mode 100644 index 000000000..97924d742 --- /dev/null +++ b/doc/plugins/moderatedcomments.mdwn @@ -0,0 +1,10 @@ +[[!template id=plugin name=moderatedcomments author="[[Joey]]"]] +[[!tag type/auth]] + +This plugin causes [[comments]] to be held for manual moderation. +Admins can access the comment moderation queue via their preferences page. + +By default, all comments made by anyone who is not an admin will be held +for moderation. The `moderate_users` setting can be set to false to avoid +moderating comments of logged-in users, while still moderating anonymous +comments. -- cgit v1.2.3 From ce785c87022842a53eda6a25088eb4299907f938 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 Oct 2009 10:17:30 -0400 Subject: fix url encoding in redir When redirecting to a page, ie, after editing, ensure that the url is uri-encoded. Most browsers other than MSIE don't care, but it's the right thing to do. The known failure case involved editing a page that had utf-8 in the name using MSIE. --- IkiWiki/CGI.pm | 3 ++- debian/changelog | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 52cafade0..9277223f0 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -40,7 +40,8 @@ sub showform ($$$$;@) { sub redirect ($$) { my $q=shift; - my $url=shift; + eval q{use URI}; + my $url=URI->new(shift); if (! $config{w3mmode}) { print $q->redirect($url); } diff --git a/debian/changelog b/debian/changelog index f517111b3..11fdc993f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low * mdwn: Avoid trying to use multimarkdown if it is not installed. * moderatedcomments: New plugin to allow comment moderation w/o relying on blogspam.net. + * When redirecting to a page, ie, after editing, ensure that the + url is uri-encoded. Most browsers other than MSIE don't care, but it's + the right thing to do. -- Joey Hess Mon, 26 Oct 2009 11:53:32 -0400 -- cgit v1.2.3 From f4c4b3b45f70764f56a7c29c4d29928f4280a5df Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 Oct 2009 11:38:08 -0400 Subject: add spec file Modify makefile to update spec file version number. --- Makefile.PL | 1 + debian/changelog | 1 + ikiwiki.spec | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 272 insertions(+) create mode 100644 ikiwiki.spec (limited to 'debian') diff --git a/Makefile.PL b/Makefile.PL index a58b64c0d..474098814 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -44,6 +44,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man $(MAKE) -C po + sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/' Mon, 26 Oct 2009 11:53:32 -0400 diff --git a/ikiwiki.spec b/ikiwiki.spec new file mode 100644 index 000000000..9294586df --- /dev/null +++ b/ikiwiki.spec @@ -0,0 +1,270 @@ +Name: ikiwiki +Version: 3.20091024 +Release: 1%{?dist} +Summary: A wiki compiler + +Group: Applications/Internet +License: GPLv2+ +URL: http://ikiwiki.info/ +Source0: http://ftp.debian.org/debian/pool/main/i/%{name}/%{name}_%{version}.tar.gz +Patch0: ikiwiki-3.00-libexecdir.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +BuildRequires: perl(Text::Markdown) +BuildRequires: perl(Mail::Sendmail) +BuildRequires: perl(HTML::Scrubber) +BuildRequires: perl(XML::Simple) +BuildRequires: perl(Date::Parse) +BuildRequires: perl(Date::Format) +BuildRequires: perl(HTML::Template) +BuildRequires: perl(CGI::FormBuilder) +BuildRequires: perl(CGI::Session) +BuildRequires: perl(File::MimeInfo) +BuildRequires: gettext +BuildRequires: po4a + +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +Requires: perl(Text::Markdown) +Requires: perl(Mail::Sendmail) +Requires: perl(HTML::Scrubber) +Requires: perl(XML::Simple) +Requires: perl(CGI::FormBuilder) +Requires: perl(CGI::Session) +Requires: perl(Digest::SHA1) + +Requires: python-docutils + +%define cgi_bin %{_libexecdir}/w3m/cgi-bin + + +%description +Ikiwiki is a wiki compiler. It converts wiki pages into HTML pages +suitable for publishing on a website. Ikiwiki stores pages and history +in a revision control system such as Subversion or Git. There are many +other features, including support for blogging, as well as a large +array of plugins. + + +%prep +%setup0 -q -n %{name} +%patch0 -p1 -b .libexecdir + +# Filter unwanted Provides: +%{__cat} << \EOF > %{name}-prov +#!/bin/sh +%{__perl_provides} $* |\ + %{__sed} -e '/perl(IkiWiki.*)/d' +EOF + +%define __perl_provides %{_builddir}/%{name}/%{name}-prov +%{__chmod} +x %{__perl_provides} + +# Filter Requires, all used by plugins +# - Monotone: see bz 450267 +%{__cat} << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ + %{__sed} -e '/perl(IkiWiki.*)/d' \ + -e '/perl(Monotone)/d' +EOF + +%define __perl_requires %{_builddir}/%{name}/%{name}-req +%{__chmod} +x %{__perl_requires} + +# goes into the -w3m subpackage +%{__cat} << \EOF > README.fedora +See http://ikiwiki.info/w3mmode/ for more information. +EOF + + +%build +%{__perl} Makefile.PL INSTALLDIRS=vendor PREFIX=%{_prefix} +# parallel builds currently don't work +%{__make} + + +%install +%{__rm} -rf %{buildroot} +%{__make} pure_install DESTDIR=%{buildroot} W3M_CGI_BIN=%{cgi_bin} +%find_lang %{name} + +# move external plugins +%{__mkdir_p} %{buildroot}%{_libexecdir}/ikiwiki/plugins +%{__mv} %{buildroot}%{_prefix}/lib/ikiwiki/plugins/* \ + %{buildroot}%{_libexecdir}/ikiwiki/plugins + +# remove shebang +%{__sed} -e '1{/^#!/d}' -i \ + %{buildroot}%{_sysconfdir}/ikiwiki/auto.setup \ + %{buildroot}%{_sysconfdir}/ikiwiki/auto-blog.setup \ + %{buildroot}%{_libexecdir}/ikiwiki/plugins/proxy.py + + +%clean +%{__rm} -rf %{buildroot} + + +%files -f %{name}.lang +%defattr(-,root,root,-) +%{_bindir}/ikiwiki* +%{_sbindir}/ikiwiki* +%{_mandir}/man1/ikiwiki* +%{_mandir}/man8/ikiwiki* +%{_datadir}/ikiwiki +%dir %{_sysconfdir}/ikiwiki +%config(noreplace) %{_sysconfdir}/ikiwiki/* +# contains a packlist only +%exclude %{perl_vendorarch} +%{perl_vendorlib}/IkiWiki* +%exclude %{perl_vendorlib}/IkiWiki*/Plugin/skeleton.pm.example +%{_libexecdir}/ikiwiki +%doc README debian/changelog debian/NEWS html +%doc IkiWiki/Plugin/skeleton.pm.example + + +%package w3m +Summary: Ikiwiki w3m cgi meta-wrapper +Group: Applications/Internet +Requires: w3m +Requires: %{name} = %{version}-%{release} + +%description w3m +Enable usage of all of ikiwiki's web features (page editing, etc) in +the w3m web browser without a web server. w3m supports local CGI +scripts, and ikiwiki can be set up to run that way using the +meta-wrapper in this package. + + +%files w3m +%defattr(-,root,root,-) +%doc README.fedora +%{cgi_bin}/ikiwiki-w3m.cgi + + +%changelog +* Thu Oct 8 2009 Thomas Moschny - 3.14159265-1 +- Update to 3.14159265. + +* Tue Sep 1 2009 Thomas Moschny - 3.1415926-1 +- Update to 3.1415926 (fixes CVE-2009-2944, see bz 520543). + +* Wed Aug 12 2009 Thomas Moschny - 3.141592-1 +- Update to 3.141592. +- po4a is needed now. + +* Fri Jul 24 2009 Fedora Release Engineering - 3.1415-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Jul 17 2009 Thomas Moschny - 3.1415-1 +- Update to 3.1415. + +* Thu Jun 11 2009 Thomas Moschny - 3.14-1 +- Update to 3.14. + +* Fri May 15 2009 Thomas Moschny - 3.12-1 +- Update to 3.12. + +* Tue May 5 2009 Thomas Moschny - 3.11-1 +- Update to 3.11. + +* Sat Apr 25 2009 Thomas Moschny - 3.10-1 +- Update to 3.10. + +* Tue Apr 7 2009 Thomas Moschny - 3.09-1 +- Update to 3.09. + +* Fri Mar 27 2009 Thomas Moschny - 3.08-1 +- Update to 3.08. + +* Mon Mar 9 2009 Thomas Moschny - 3.07-1 +- Update to 3.07. + +* Thu Mar 5 2009 Thomas Moschny - 3.06-1 +- Update to 3.06. + +* Tue Feb 24 2009 Fedora Release Engineering - 3.04-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 Thomas Moschny - 3.04-1 +- Update to 3.04. + +* Mon Feb 9 2009 Thomas Moschny - 3.03-1 +- Update to 3.03. + +* Sat Jan 10 2009 Thomas Moschny - 3.01-1 +- Update to 3.01. + +* Fri Jan 2 2009 Thomas Moschny - 3.00-1 +- Update to 3.00. + +* Fri Jan 2 2009 Thomas Moschny - 2.72-1 +- Update to 2.72. +- Patch for mtn plugin has been applied upstream. +- Encoding of ikiwiki.vim has been changed to utf-8 upstream. +- Use new W3M_CGI_BIN option in %%install. + +* Tue Dec 16 2008 Thomas Moschny - 2.70-3 +- Patch for monotone plugin: Prevent broken pipe message. +- Cosmetic changes to satisfy rpmlint. + +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 2.70-2 +- Rebuild for Python 2.6 + +* Thu Nov 20 2008 Thomas Moschny - 2.70-1 +- Update to 2.70. +- Install and enable the external rst plugin. +- Stop filtering perl(RPC::XML*) requires. + +* Fri Oct 10 2008 Thomas Moschny - 2.66-1 +- Update to 2.66. + +* Fri Sep 19 2008 Thomas Moschny - 2.64-1 +- Update to 2.64. + +* Thu Sep 11 2008 Thomas Moschny - 2.63-1 +- Update to 2.63. + +* Sat Aug 30 2008 Thomas Moschny - 2.62.1-1 +- Update to 2.62.1. Add /etc/ikiwiki. + +* Thu Aug 7 2008 Thomas Moschny - 2.56-1 +- Update to 2.56. +- Stop filtering perl(Net::Amazon::S3), has been approved (bz436481). + +* Thu Jul 31 2008 Thomas Moschny - 2.55-1 +- Update to 2.55. + +* Thu Jul 24 2008 Thomas Moschny - 2.54-1 +- Update to 2.54. +- Move example plugin file to doc. + +* Sat Jul 12 2008 Thomas Moschny - 2.53-1 +- Update to 2.53. + +* Thu Jul 10 2008 Thomas Moschny - 2.52-1 +- Update to 2.52. + +* Sun Jul 6 2008 Thomas Moschny - 2.51-1 +- Update to 2.51. +- Save iconv output to a temporary file. + +* Sun Jun 15 2008 Thomas Moschny - 2.50-1 +- Update to 2.50. +- Move ikiwiki-w3m.cgi into a subpackage. +- Add ikiwiki's own documentation. +- Remove duplicate requirement perl(File::MimeInfo). +- Minor cleanups. + +* Mon Jun 2 2008 Thomas Moschny - 2.48-1 +- Update to 2.48. + +* Wed May 28 2008 Thomas Moschny - 2.47-1 +- Update to 2.47. + +* Tue May 13 2008 Thomas Moschny - 2.46-1 +- Update to 2.46. + +* Sat May 10 2008 Thomas Moschny - 2.45-1 +- New package. -- cgit v1.2.3 From c29957e0177c3c654a1ea1feffdba00307449560 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 Oct 2009 18:05:58 -0400 Subject: google: Pass the whole wiki url to google, not just the domain, so that search works correctly for wikis that are located in subdirectories of domains. --- IkiWiki/Plugin/google.pm | 9 +-------- debian/changelog | 3 +++ doc/plugins/google/discussion.mdwn | 2 ++ templates/googleform.tmpl | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/google.pm b/IkiWiki/Plugin/google.pm index 1683220e7..483fa1707 100644 --- a/IkiWiki/Plugin/google.pm +++ b/IkiWiki/Plugin/google.pm @@ -6,8 +6,6 @@ use strict; use IkiWiki 3.00; use URI; -my $host; - sub import { hook(type => "getsetup", id => "google", call => \&getsetup); hook(type => "checkconfig", id => "google", call => \&checkconfig); @@ -26,11 +24,6 @@ sub checkconfig () { if (! length $config{url}) { error(sprintf(gettext("Must specify %s when using the %s plugin"), "url", 'google')); } - my $uri=URI->new($config{url}); - if (! $uri || ! defined $uri->host) { - error(gettext("Failed to parse url, cannot determine domain name")); - } - $host=$uri->host; } my $form; @@ -43,7 +36,7 @@ sub pagetemplate (@) { if ($template->query(name => "searchform")) { if (! defined $form) { my $searchform = template("googleform.tmpl", blind_cache => 1); - $searchform->param(sitefqdn => $host); + $searchform->param(url => $config{url}); $form=$searchform->output; } diff --git a/debian/changelog b/debian/changelog index 4c8c4d6fc..f19b4eae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low url is uri-encoded. Most browsers other than MSIE don't care, but it's the right thing to do. * Add a spec file to allow building rpm from the source package. + * google: Pass the whole wiki url to google, not just the domain, + so that search works correctly for wikis that are located in + subdirectories of domains. -- Joey Hess Mon, 26 Oct 2009 11:53:32 -0400 diff --git a/doc/plugins/google/discussion.mdwn b/doc/plugins/google/discussion.mdwn index 39403f9f9..94fc36a35 100644 --- a/doc/plugins/google/discussion.mdwn +++ b/doc/plugins/google/discussion.mdwn @@ -9,3 +9,5 @@ It works to pass the whole wiki baseurl to Google, not just the domain, and appears to be legal. I've got a wiki that'd benefit (it's a few directories down from the root). Can the plugin be tweaked to do this? --[[schmonz]] + +> Done. --[[Joey]] diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl index e2d4a1f43..bcf1004a4 100644 --- a/templates/googleform.tmpl +++ b/templates/googleform.tmpl @@ -1,6 +1,6 @@
    - +
    -- cgit v1.2.3 From 405343153a6c495a99c497cc6e9b58b7b92c43b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 31 Oct 2009 18:35:49 -0400 Subject: releasing version 3.20091031 --- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/bg.po | 78 +++++++++++++++++++++++++------------------------- po/cs.po | 82 ++++++++++++++++++++++++++++------------------------- po/da.po | 82 ++++++++++++++++++++++++++++------------------------- po/de.po | 83 +++++++++++++++++++++++++++++------------------------- po/es.po | 84 ++++++++++++++++++++++++++++-------------------------- po/fr.po | 82 ++++++++++++++++++++++++++++------------------------- po/gu.po | 78 +++++++++++++++++++++++++------------------------- po/ikiwiki.pot | 64 ++++++++++++++++++++--------------------- po/it.po | 86 +++++++++++++++++++++++++++++--------------------------- po/pl.po | 78 +++++++++++++++++++++++++------------------------- po/sv.po | 78 +++++++++++++++++++++++++------------------------- po/vi.po | 78 +++++++++++++++++++++++++------------------------- 14 files changed, 492 insertions(+), 467 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f19b4eae4..c13cbf3b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20091024) UNRELEASED; urgency=low +ikiwiki (3.20091031) unstable; urgency=low * po: Fix breakage caused by changes to render code. * mdwn: Avoid trying to use multimarkdown if it is not installed. @@ -12,7 +12,7 @@ ikiwiki (3.20091024) UNRELEASED; urgency=low so that search works correctly for wikis that are located in subdirectories of domains. - -- Joey Hess Mon, 26 Oct 2009 11:53:32 -0400 + -- Joey Hess Sat, 31 Oct 2009 18:29:38 -0400 ikiwiki (3.20091023) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index c50ef404f..f7f96a0d0 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20091024 +Version: 3.20091031 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 79ea53624..8f62d4652 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -16,46 +16,46 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Първо трябва да влезете." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 #, fuzzy msgid "Preferences" msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Грешка" @@ -310,12 +310,12 @@ msgstr "шаблонът „%s” не е намерен" msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process" msgstr "грешка при обработване на шаблона" @@ -363,16 +363,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -476,24 +472,24 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" @@ -506,6 +502,10 @@ msgstr "Огледала" msgid "Mirror" msgstr "Огледало" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "" @@ -613,72 +613,72 @@ msgstr "" msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, fuzzy, perl-format msgid "failed to read %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1127,13 +1127,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" diff --git a/po/cs.po b/po/cs.po index b3c25c8a8..37374be28 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Nejprve se musíte přihlásit." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -27,35 +27,35 @@ msgstr "" "pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale " "Ezkoušíte se přihlásit přes http a ne přes https" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 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:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "Vaše sezení expirovalo." -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "Přihlášení" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Předvolby" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Správce" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Chyba" @@ -306,12 +306,12 @@ msgstr "nebyl zadán parametr template" msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "nepodařilo se zpracovat" @@ -356,16 +356,12 @@ msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno." - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" @@ -460,21 +456,21 @@ msgstr "Stránka %s je zamknutá a nelze ji měnit" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format 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:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" @@ -486,6 +482,11 @@ msgstr "Zrcadla" msgid "Mirror" msgstr "Zrcadlo" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#, fuzzy +msgid "comment needs moderation" +msgstr "schvalování komentářů" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "více" @@ -593,11 +594,11 @@ msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -605,7 +606,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -613,55 +614,55 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "nepodařilo se přečíst %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " @@ -1105,13 +1106,13 @@ msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1200,6 +1201,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "Failed to parse url, cannot determine domain name" +#~ msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno." + #~ msgid "discussion" #~ msgstr "diskuse" diff --git a/po/da.po b/po/da.po index b68e663a7..9801ca011 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -19,11 +19,11 @@ msgstr "" "X-Poedit-Country: DENMARK\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Du skal først logge på." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -31,35 +31,35 @@ msgstr "" "mulig opsætningsfejl: sslcookie er sat, men du forsøger at logge på via " "http, ikke https" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "Din kørsel (login session) er udløbet" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "Pålogning" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Indstillinger" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Admin" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Indstillinger gemt" -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Fejl" @@ -313,12 +313,12 @@ msgstr "skabelon %s ikke angivet" msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "dannelsen mislykkedes" @@ -364,16 +364,12 @@ msgstr "du kan ikke påvirke en fil med modus %s" msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" @@ -472,22 +468,22 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" @@ -499,6 +495,11 @@ msgstr "Spejle" msgid "Mirror" msgstr "Spejl" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#, fuzzy +msgid "comment needs moderation" +msgstr "kommentarkoderering" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "mere" @@ -609,11 +610,11 @@ msgstr "gendanner alle sider for at korrigere meta titler" msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -621,7 +622,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -629,55 +630,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "læsning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -1120,13 +1121,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1216,6 +1217,9 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" +#~ msgid "Failed to parse url, cannot determine domain name" +#~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" + #~ msgid "code includes disallowed latex commands" #~ msgstr "kode indeholder ikke-tilladte latec-kommandoer" diff --git a/po/de.po b/po/de.po index 4f3be838f..e4b5ed9c4 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Sie müssen sich zuerst anmelden." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -27,36 +27,36 @@ msgstr "" "vermutliche Fehlkonfiguration: sslcookie ist gesetzt, aber Sie versuchen " "sich via http anzumelden, nicht https" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "Ihre Anmeldezeit ist abgelaufen." -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "Anmelden" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Einstellungen" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Administrator" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Einstellungen gespeichert." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Fehler" @@ -311,12 +311,12 @@ msgstr "Vorlage nicht angegeben" msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "Ablauf fehlgeschlagen" @@ -362,16 +362,12 @@ msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" @@ -473,22 +469,22 @@ msgstr "" "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht " "installiert" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" @@ -500,6 +496,11 @@ msgstr "Spiegel" msgid "Mirror" msgstr "Spiegel" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#, fuzzy +msgid "comment needs moderation" +msgstr "Kommentar-Moderation" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "mehr" @@ -612,11 +613,11 @@ msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -624,7 +625,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -632,55 +633,55 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "lesen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -1132,13 +1133,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1230,6 +1231,10 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#~ msgid "Failed to parse url, cannot determine domain name" +#~ msgstr "" +#~ "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" + #~ msgid "code includes disallowed latex commands" #~ msgstr "Code enthält verbotene LaTeX-Befehle" diff --git a/po/es.po b/po/es.po index ddaf20d85..ca26b0bf6 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Antes es necesario identificarse." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -31,36 +31,36 @@ msgstr "" "activa, pero está intentando registrarse en el sistema vía el protocolo " "'http' y no 'https'" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 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:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "Su registro en el sistema ha expirado." -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "Identificación" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Preferencias" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Administración" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Error" @@ -315,12 +315,12 @@ msgstr "falta indicar la plantilla (template)" msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "fallo en el proceso" @@ -366,17 +366,12 @@ msgstr "no puede actuar sobre un archivo con permisos %s" msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" -"Error en el análisis del URL, no puedo determinar el nombre del dominio" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " @@ -477,22 +472,22 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" 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:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" @@ -504,6 +499,11 @@ msgstr "Réplicas" msgid "Mirror" msgstr "Réplica" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#, fuzzy +msgid "comment needs moderation" +msgstr "aprobación de comentarios" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "ver más" @@ -614,72 +614,72 @@ msgstr "" msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, fuzzy, perl-format msgid "failed to read %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1131,13 +1131,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, 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:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1235,6 +1235,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#~ msgid "Failed to parse url, cannot determine domain name" +#~ msgstr "" +#~ "Error en el análisis del URL, no puedo determinar el nombre del dominio" + #~ msgid "code includes disallowed latex commands" #~ msgstr "el código incluye órdenes latex anuladas" diff --git a/po/fr.po b/po/fr.po index 1d402468c..fbfb49a88 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -17,11 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Vous devez d'abord vous identifier." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -29,35 +29,35 @@ msgstr "" "Erreur de configuration probable : sslcookie est positionné mais vous tentez " "de vous connecter avec http au lieu de https" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Échec de l'identification, vous devez autoriser les cookies." -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "Session d'authentification expirée." -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Erreur" @@ -308,12 +308,12 @@ msgstr "modèle (« template ») non indiqué" msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "Échec du traitement" @@ -358,16 +358,12 @@ msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "Impossible d'analyser l'URL, pas de nom de domaine" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" @@ -467,22 +463,22 @@ msgstr "%s est verrouillé et ne peut être modifié" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" @@ -494,6 +490,11 @@ msgstr "Miroirs" msgid "Mirror" msgstr "Miroir" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#, fuzzy +msgid "comment needs moderation" +msgstr "modération du commentaire" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "lire la suite" @@ -611,11 +612,11 @@ msgstr "" msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -623,7 +624,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -631,55 +632,55 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "Impossible de lire %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " @@ -1130,13 +1131,13 @@ msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1226,6 +1227,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "Failed to parse url, cannot determine domain name" +#~ msgstr "Impossible d'analyser l'URL, pas de nom de domaine" + #~ msgid "code includes disallowed latex commands" #~ msgstr "Le code comporte des commandes LaTeX non permises" diff --git a/po/gu.po b/po/gu.po index 2f7c5859e..96e9ad184 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -15,46 +15,46 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 #, fuzzy msgid "Preferences" msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "ક્ષતિ" @@ -308,12 +308,12 @@ msgstr "ટેમ્પલેટ %s મળ્યું નહી" msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" @@ -361,16 +361,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" @@ -469,21 +465,21 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format 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:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" @@ -496,6 +492,10 @@ msgstr "મિરરો" msgid "Mirror" msgstr "મિરર" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "વધુ" @@ -603,72 +603,72 @@ msgstr "" msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, fuzzy, perl-format msgid "failed to read %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1113,13 +1113,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d52e3bd99..45dd49d01 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-23 12:40-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,45 +16,45 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "" -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "" @@ -353,16 +353,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "" @@ -457,7 +453,7 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -482,6 +478,10 @@ msgstr "" msgid "Mirror" msgstr "" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "" @@ -587,71 +587,71 @@ msgstr "" msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" diff --git a/po/it.po b/po/it.po index 6fa47cd24..7e0d3dd90 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -13,11 +13,11 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Occorre prima effettuare l'accesso." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -25,35 +25,35 @@ msgstr "" "possibile errore di configurazione: sslcookie è impostato, ma si sta " "tentando un accesso via http, non https" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "La sessione è scaduta." -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "Entra" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Preferenze" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Amministrazione" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Preferenze salvate." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Errore" @@ -305,12 +305,12 @@ msgstr "modello non specificato" msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 msgid "failed to process" msgstr "errore nell'elaborazione" @@ -355,18 +355,12 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" -"Errore nell'interpretazione dell'URL, impossibile determinare il nome del " -"dominio" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "errore nell'eseguire graphviz" @@ -465,21 +459,21 @@ msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" @@ -491,6 +485,11 @@ msgstr "Mirror" msgid "Mirror" msgstr "Mirror" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#, fuzzy +msgid "comment needs moderation" +msgstr "moderazione commento" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "altro" @@ -604,11 +603,11 @@ msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -616,7 +615,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -624,55 +623,55 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "impossibile leggere %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " @@ -1119,13 +1118,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1214,5 +1213,10 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#~ msgid "Failed to parse url, cannot determine domain name" +#~ msgstr "" +#~ "Errore nell'interpretazione dell'URL, impossibile determinare il nome del " +#~ "dominio" + #~ msgid "code includes disallowed latex commands" #~ msgstr "nel codice sono presenti comandi latex non permessi" diff --git a/po/pl.po b/po/pl.po index 47a0fb6fa..81addd8d9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -16,48 +16,48 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Proszę najpierw zalogować się." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 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:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 #, fuzzy msgid "Preferences" msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Błąd" @@ -312,12 +312,12 @@ msgstr "nieznaleziony szablon %s" msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process" msgstr "awaria w trakcie przetwarzania:" @@ -365,16 +365,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -479,24 +475,24 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" @@ -509,6 +505,10 @@ msgstr "Kopie lustrzane" msgid "Mirror" msgstr "Kopia lustrzana" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "więcej" @@ -616,72 +616,72 @@ msgstr "" msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, fuzzy, perl-format msgid "failed to read %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1135,13 +1135,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" diff --git a/po/sv.po b/po/sv.po index ad723dfc0..21a65ae5d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -15,46 +15,46 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Du måste logga in först." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 #, fuzzy msgid "Preferences" msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Fel" @@ -309,12 +309,12 @@ msgstr "mallen %s hittades inte" msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process" msgstr "misslyckades med att behandla mall:" @@ -362,16 +362,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -472,24 +468,24 @@ msgstr "%s är låst av %s och kan inte redigeras" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:158 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" @@ -502,6 +498,10 @@ msgstr "Speglar" msgid "Mirror" msgstr "Spegel" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "" @@ -609,72 +609,72 @@ msgstr "" msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, fuzzy, perl-format msgid "failed to read %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1122,13 +1122,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" diff --git a/po/vi.po b/po/vi.po index ad970a85f..03ff3bf76 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-17 20:47-0400\n" +"POT-Creation-Date: 2009-10-31 18:31-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,46 +16,46 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6fc1\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Trước tiên bạn cần phải đăng nhập." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 #, fuzzy msgid "Preferences" msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 msgid "Error" msgstr "Lỗi" @@ -310,12 +310,12 @@ msgstr "không tìm thấy mẫu %s" msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:62 +#: ../IkiWiki/Plugin/edittemplate.pm:63 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:133 +#: ../IkiWiki/Plugin/edittemplate.pm:137 #, fuzzy msgid "failed to process" msgstr "mẫu không xử lý được:" @@ -363,16 +363,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 #, fuzzy msgid "failed to run graphviz" @@ -475,22 +471,22 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format 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:158 +#: ../IkiWiki/Plugin/meta.pm:161 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:196 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:210 +#: ../IkiWiki/Plugin/meta.pm:213 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" @@ -503,6 +499,10 @@ msgstr "Nhân bản" msgid "Mirror" msgstr "Nhân bản" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "" @@ -610,72 +610,72 @@ msgstr "" msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, fuzzy, perl-format msgid "failed to read %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1123,13 +1123,13 @@ msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:148 +#: ../IkiWiki/Wrapper.pm:149 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:168 +#: ../IkiWiki/Wrapper.pm:169 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" -- cgit v1.2.3 From 70ee70e2765b1c405b158282d6ceaa54b8b7cf91 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 6 Nov 2009 12:06:46 -0500 Subject: underlay: Fix example values put in setup file to be array references. --- IkiWiki/Plugin/underlay.pm | 4 ++-- debian/changelog | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm index c59935672..51b769333 100644 --- a/IkiWiki/Plugin/underlay.pm +++ b/IkiWiki/Plugin/underlay.pm @@ -21,7 +21,7 @@ sub getsetup () { }, add_underlays => { type => "string", - default => [], + example => ["$ENV{HOME}/wiki.underlay"], description => "extra underlay directories to add", advanced => 1, safe => 0, @@ -29,7 +29,7 @@ sub getsetup () { }, add_templates => { type => "string", - default => [], + example => ["$ENV{HOME}/.ikiwiki/templates"], description => "extra template directories to add", advanced => 1, safe => 0, diff --git a/debian/changelog b/debian/changelog index c13cbf3b3..f4132cb46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20091032) UNRELEASED; urgency=low + + * underlay: Fix example values put in setup file to be array + references. + + -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 + ikiwiki (3.20091031) unstable; urgency=low * po: Fix breakage caused by changes to render code. -- cgit v1.2.3 From 910cbae922ff7805947ea8b01527be1e5a27890b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 7 Nov 2009 12:36:13 -0500 Subject: underlay: Avoid crashing if lists of underlays (or template directories) are not configured. --- IkiWiki/Plugin/underlay.pm | 10 +++++++--- debian/changelog | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/underlay.pm b/IkiWiki/Plugin/underlay.pm index 51b769333..116fe7324 100644 --- a/IkiWiki/Plugin/underlay.pm +++ b/IkiWiki/Plugin/underlay.pm @@ -38,10 +38,14 @@ sub getsetup () { } sub checkconfig () { - foreach my $dir (@{$config{add_underlays}}) { - add_underlay($dir); + if ($config{add_underlays}) { + foreach my $dir (@{$config{add_underlays}}) { + add_underlay($dir); + } + } + if ($config{add_templates}) { + push @{$config{templatedirs}}, @{$config{add_templates}}; } - push @{$config{templatedirs}}, @{$config{add_templates}}; } 1; diff --git a/debian/changelog b/debian/changelog index f4132cb46..0026d9ddc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low * underlay: Fix example values put in setup file to be array references. + * underlay: Avoid crashing if lists of underlays (or template + directories) are not configured. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 -- cgit v1.2.3 From 66b46576ec097b9f10b45d4b1de18bb214cd5bd5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 8 Nov 2009 13:48:07 -0500 Subject: Moved the postscan hook to run on the raw html of a page, before the template is filled out. This improves the search plugin's indexing, since it will not include navigational elements from the page template or sidebar. --- IkiWiki/Render.pm | 8 ++++---- debian/changelog | 4 ++++ ...y_includes_text_from_navigational_elements.mdwn | 13 +++++++++++++ doc/plugins/write.mdwn | 22 +++++++++++----------- 4 files changed, 32 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 0889fed62..ab3a71671 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -61,6 +61,10 @@ sub backlinks ($) { sub genpage ($$) { my $page=shift; my $content=shift; + + run_hooks(postscan => sub { + shift->(page => $page, content => $content); + }); my $templatefile; run_hooks(templatefile => sub { @@ -130,10 +134,6 @@ sub genpage ($$) { $content=$template->output; - run_hooks(postscan => sub { - shift->(page => $page, content => $content); - }); - run_hooks(format => sub { $content=shift->( page => $page, diff --git a/debian/changelog b/debian/changelog index 0026d9ddc..6a5ae30ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low references. * underlay: Avoid crashing if lists of underlays (or template directories) are not configured. + * Moved the postscan hook to run on the raw html of a page, before + the template is filled out. This improves the search plugin's indexing, + since it will not include navigational elements from the page template + or sidebar. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 diff --git a/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn b/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn index 874b9ffeb..b774c4531 100644 --- a/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn +++ b/doc/bugs/Search_summary_includes_text_from_navigational_elements.mdwn @@ -7,3 +7,16 @@ A way to name some CSS ids that should be removed in search results within the i http://leaf.dragonflybsd.org/mailarchive/users/2009-11/msg00077.html (bin attachment on that page is actually a .diff.) + +> So I was looking at this and I relized that while the search plugin used +> to use the format hook, and so there was no way to avoid it seeing all +> the gunk around the page body, it was changed a while ago for different +> reasons to use its own hook, postscan. So there's really no reason not +> to move postscan so it runs before said gunk is added to the page. +> (Aside from a small risk of breaking other third-party plugins that +> somehow use postscan.) +> +> I've implemented that in git, and it drops the navigation elements nicely. +> It's perhaps less general than allowing specific divs to be skipped from +> search, but it seems good enough. Please thank the dragonfly guys for their +> work on this. [[done]] --[[Joey]] diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index c72418c3c..2f179d46f 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -201,6 +201,17 @@ like `Makefile` that have no extension. If `hook` is passed an optional "longname" parameter, this value is used when prompting a user to choose a page type on the edit page form. +### postscan + + hook(type => "postscan", id => "foo", call => \&postscan); + +This hook is called once the page has been converted to html (but before +the generated html is put in a template). The most common use is to +update search indexes. Added in ikiwiki 2.54. + +The function is passed named parameters "page" and "content". Its return +value is ignored. + ### pagetemplate hook(type => "pagetemplate", id => "foo", call => \&pagetemplate); @@ -237,17 +248,6 @@ modify the body of a page after it has been fully converted to html. The function is passed named parameters: "page", "destpage", and "content", and should return the sanitized content. -### postscan - - hook(type => "postscan", id => "foo", call => \&postscan); - -This hook is called once the full page body is available (but before the -format hook). The most common use is to update search indexes. Added in -ikiwiki 2.54. - -The function is passed named parameters "page" and "content". Its return -value is ignored. - ### format hook(type => "format", id => "foo", call => \&format); -- cgit v1.2.3 From 9f0931ce21e5f58e2e9de0ef302beca08b8f9177 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Nov 2009 13:32:08 -0500 Subject: localstyle: New plugin, allows overrding the toplevel local.css with one that is closer to a page. I chose not to have it override style.css, because style.css is not really intended to be edited; the one from the underlay is intended to be used as a base that local.css overrides. I chose to use a plugin rather than changing the default behavior, both because I didn't want to have to worry about possibly breaking backwards compatability (though this seems unlikely), and because it seemed cleaner to not include style template parameters in the main page template code. I suppose someone might want a way to not override the toplevel local.css, but instead include it as well as foo/local.css. Probably the best way to do that would be to have foo/local.css @import ../local.css (modulo browser compatability issues). Alternatively, edit page.tmpl to always include the toplevel local.css, or swap out this plugin for another one. --- IkiWiki/Plugin/localstyle.pm | 35 +++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ doc/css.mdwn | 3 +++ doc/plugins/localstyle.mdwn | 12 ++++++++++++ templates/page.tmpl | 5 +++++ 5 files changed, 57 insertions(+) create mode 100644 IkiWiki/Plugin/localstyle.pm create mode 100644 doc/plugins/localstyle.mdwn (limited to 'debian') diff --git a/IkiWiki/Plugin/localstyle.pm b/IkiWiki/Plugin/localstyle.pm new file mode 100644 index 000000000..111f4dc30 --- /dev/null +++ b/IkiWiki/Plugin/localstyle.pm @@ -0,0 +1,35 @@ +#!/usr/bin/perl + +package IkiWiki::Plugin::localstyle; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "localstyle", call => \&getsetup); + hook(type => "pagetemplate", id => "localstyle", call => \&pagetemplate); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 1, + }, +} + +sub pagetemplate (@) { + my %params=@_; + + my $template=$params{template}; + + if ($template->query(name => "local_css")) { + my $best=bestlink($params{page}, 'local.css'); + if ($best) { + $template->param(local_css => $best); + } + } +} + +1 diff --git a/debian/changelog b/debian/changelog index 6a5ae30ab..4ab63f175 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low the template is filled out. This improves the search plugin's indexing, since it will not include navigational elements from the page template or sidebar. + * localstyle: New plugin, allows overrding the toplevel local.css + with one that is closer to a page. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 diff --git a/doc/css.mdwn b/doc/css.mdwn index 20790b3d1..29a335596 100644 --- a/doc/css.mdwn +++ b/doc/css.mdwn @@ -16,3 +16,6 @@ files. The [[plugins/meta]] plugin can be used to add additional style sheets to a page. + +The [[plugins/localstyle]] plugin can be used to override the toplevel +[[local.css]] for a whole section of the wiki. diff --git a/doc/plugins/localstyle.mdwn b/doc/plugins/localstyle.mdwn new file mode 100644 index 000000000..70a909d68 --- /dev/null +++ b/doc/plugins/localstyle.mdwn @@ -0,0 +1,12 @@ +[[!template id=plugin name=localstyle author="[[Joey]]"]] +[[!tag type/chrome]] + +This plugin allows styling different sections of a wiki using different +versions of the local.css [[CSS]] file. Normally this file is read from the +top level of the wiki, but with this plugin enabled, standard +[[ikiwiki/subpage/LinkingRules]] are used to find the closest local.css +file to each page. + +So, for example, to use different styling for page `foo`, as well as all +of its [[SubPages|ikiwiki/subpage]], such as `foo/bar`, create a +`foo/local.css`. diff --git a/templates/page.tmpl b/templates/page.tmpl index e71ba316d..0e73463ec 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -7,8 +7,13 @@ + + + + + -- cgit v1.2.3 From 92a6f2e5e88b513ceaa1b9083ddbf6e928122893 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Nov 2009 00:50:59 -0500 Subject: httpauth: Add cgiauthurl setting that can be used to do http basic auth only when ikiwiki needs authentication, rather than for any access to the cgi/wiki. --- IkiWiki/Plugin/httpauth.pm | 11 +++++++++++ debian/changelog | 3 +++ doc/plugins/httpauth.mdwn | 24 ++++++++++++++++++++---- 3 files changed, 34 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index 1816c9d74..bbfff859a 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -17,6 +17,13 @@ sub getsetup () { safe => 1, rebuild => 0, }, + cgiauthurl => { + type => "string", + example => "ttp://example.com/wiki/auth/ikiwiki.cgi", + description => "url to redirect to when authentication is needed", + safe => 1, + rebuild => 0, + }, } sub auth ($$) { @@ -26,6 +33,10 @@ sub auth ($$) { if (defined $cgi->remote_user()) { $session->param("name", $cgi->remote_user()); } + elsif (defined $config{cgiauthurl}) { + IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string()); + exit; + } } 1 diff --git a/debian/changelog b/debian/changelog index 4ab63f175..1a703b11f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low or sidebar. * localstyle: New plugin, allows overrding the toplevel local.css with one that is closer to a page. + * httpauth: Add cgiauthurl setting that can be used to do http basic auth + only when ikiwiki needs authentication, rather than for any access to + the cgi/wiki. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn index 11ed223e7..77796a3d7 100644 --- a/doc/plugins/httpauth.mdwn +++ b/doc/plugins/httpauth.mdwn @@ -2,8 +2,24 @@ [[!tag type/auth]] This plugin allows HTTP basic authentication to be used to log into the -wiki. To use the plugin, your web server should be set up to perform HTTP -basic authentiation for at least the directory containing `ikiwiki.cgi`. -The authenticated user will be automatically signed into the wiki. +wiki. -This plugin is included in ikiwiki, but is not enabled by default. +## fully authenticated wiki + +One way to use the plugin is to configure your web server to require +HTTP basic authentication for any access to the directory containing the +wiki (and `ikiwiki.cgi`). The authenticated user will be automatically +signed into the wiki. This method is suitable only for private wikis. + +## separate cgiauthurl + +To use httpauth for a wiki where the content is public, and where +the `ikiwiki.cgi` needs to be usable without authentication (for searching +and so on), you can configure a separate url that is used for +authentication, via the `cgiauthurl` option in the setup file. This +url will then be redirected to whenever authentication is needed. + +A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` +into it. Then configure the web server to require authentication only for +access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this +symlink. -- cgit v1.2.3 From 5ccf68f11329779f9e173355fe76bff85203a851 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Nov 2009 14:56:24 -0500 Subject: inline: Do not generated feeds for nested inlines. My experience is that when inlines are nested, the old behavior of generating feeds for the nested inlines was never really desired. Since the feeds were numbered sequentially, the numbers could easily change, and it did not make sense to subscribe to or use those feeds. And generating those nested feeds often meant a lot of unnecessary calculation, and data being written. So, I dropped them. Looking back, nested feeds originally were a free side effect of properly handing multiple feeds on one page. Of course, that is still supported. --- IkiWiki/Plugin/inline.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 942df6f89..001d2ed1a 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -159,7 +159,7 @@ sub preprocess_inline (@) { my $rss=(($config{rss} || $config{allowrss}) && exists $params{rss}) ? yesno($params{rss}) : $config{rss}; my $atom=(($config{atom} || $config{allowatom}) && exists $params{atom}) ? yesno($params{atom}) : $config{atom}; my $quick=exists $params{quick} ? yesno($params{quick}) : 0; - my $feeds=exists $params{feeds} ? yesno($params{feeds}) : !$quick; + my $feeds=! $nested && (exists $params{feeds} ? yesno($params{feeds}) : !$quick); my $emptyfeeds=exists $params{emptyfeeds} ? yesno($params{emptyfeeds}) : 1; my $feedonly=yesno($params{feedonly}); if (! exists $params{show} && ! $archive) { diff --git a/debian/changelog b/debian/changelog index 1a703b11f..5a2d94e23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low * httpauth: Add cgiauthurl setting that can be used to do http basic auth only when ikiwiki needs authentication, rather than for any access to the cgi/wiki. + * inline: Do not generated feeds for nested inlines. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 -- cgit v1.2.3 From ad303e878e65c72bf31eb676ced866be56bbee91 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Nov 2009 15:10:58 -0500 Subject: inline: Allow direct inclusion of non-page files in raw mode. --- IkiWiki/Plugin/inline.pm | 6 +++++- debian/changelog | 1 + doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 001d2ed1a..8e7fa9958 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -337,7 +337,7 @@ sub preprocess_inline (@) { foreach my $page (@list) { my $file = $pagesources{$page}; my $type = pagetype($file); - if (! $raw || ($raw && ! defined $type)) { + if (! $raw) { if ($needcontent) { # Get the content before populating the # template, since getting the content uses @@ -391,6 +391,10 @@ sub preprocess_inline (@) { filter($page, $params{destpage}, readfile(srcfile($file))))); } + else { + $ret.="\n". + readfile(srcfile($file)); + } } } } diff --git a/debian/changelog b/debian/changelog index 5a2d94e23..b25651f42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low only when ikiwiki needs authentication, rather than for any access to the cgi/wiki. * inline: Do not generated feeds for nested inlines. + * inline: Allow direct inclusion of non-page files in raw mode. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 diff --git a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn index 814074e08..e43540c65 100644 --- a/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn +++ b/doc/bugs/inline_raw_broken_on_unknown_pagetype.mdwn @@ -17,3 +17,11 @@ this situation. If we explicitely don't want to allow raw inlining of unknown page types, ikiwiki should output a better error message. + +> I have made it just do a direct include if the page type is not known, in +> raw mode. That seems useful if you want to include some other file right +> into a page. You could probably even wrap it in a format directive. +> +> It does allow including binary files right into a page, but nothing is +> stopping you pasting binary data right into the edit form either, so +> while annoying I don't think that will be a security problem. --[[Joey]] -- cgit v1.2.3 From d8cfd8d431bd3ec44152944f0b8418bbab6b7920 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Nov 2009 20:50:27 -0500 Subject: inline: Fix display of all pages when archive=yes or show=0 are used. --- IkiWiki/Plugin/inline.pm | 4 ++-- debian/changelog | 1 + doc/bugs/inline_skip_causes_empty_inline.mdwn | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 8e7fa9958..f89209a1b 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -212,7 +212,7 @@ sub preprocess_inline (@) { if ($params{feedshow} && $num < $params{feedshow}) { $num=$params{feedshow}; } - if ($params{skip}) { + if ($params{skip} && $num) { $num+=$params{skip}; } @@ -221,7 +221,7 @@ sub preprocess_inline (@) { filter => sub { $_[0] eq $params{page} }, sort => exists $params{sort} ? $params{sort} : "age", reverse => yesno($params{reverse}), - num => $num, + ($num ? (num => $num) : ()), ); } diff --git a/debian/changelog b/debian/changelog index b25651f42..c96919252 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low the cgi/wiki. * inline: Do not generated feeds for nested inlines. * inline: Allow direct inclusion of non-page files in raw mode. + * inline: Fix display of all pages when archive=yes or show=0 are used. -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 diff --git a/doc/bugs/inline_skip_causes_empty_inline.mdwn b/doc/bugs/inline_skip_causes_empty_inline.mdwn index 6ee1e601b..e1cbc5470 100644 --- a/doc/bugs/inline_skip_causes_empty_inline.mdwn +++ b/doc/bugs/inline_skip_causes_empty_inline.mdwn @@ -7,4 +7,4 @@ but not in 3.20091031. >> The bug occurs only together with archive="yes" as I Just found out: -[[!inline pages="news/*" archive="yes" feeds="no" skip=3]] +>>> Thanks, [[fixed|done]] in git. --[[Joey]] -- cgit v1.2.3 From 6edd00e9a47116babe2a3addd81d1afb24c3c4d5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Nov 2009 22:11:42 -0500 Subject: releasing version 3.20091113 --- debian/changelog | 4 ++-- doc/quotes/sold.mdwn | 3 +++ ikiwiki.spec | 2 +- po/ikiwiki.pot | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 doc/quotes/sold.mdwn (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c96919252..ad80d37b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20091032) UNRELEASED; urgency=low +ikiwiki (3.20091113) unstable; urgency=low * underlay: Fix example values put in setup file to be array references. @@ -17,7 +17,7 @@ ikiwiki (3.20091032) UNRELEASED; urgency=low * inline: Allow direct inclusion of non-page files in raw mode. * inline: Fix display of all pages when archive=yes or show=0 are used. - -- Joey Hess Fri, 06 Nov 2009 12:04:29 -0500 + -- Joey Hess Fri, 13 Nov 2009 20:51:57 -0500 ikiwiki (3.20091031) unstable; urgency=low diff --git a/doc/quotes/sold.mdwn b/doc/quotes/sold.mdwn new file mode 100644 index 000000000..4bd021f74 --- /dev/null +++ b/doc/quotes/sold.mdwn @@ -0,0 +1,3 @@ +I'm totally sold on ikiwiki now. + +-- Anna Hess diff --git a/ikiwiki.spec b/ikiwiki.spec index f7f96a0d0..491c69a8d 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20091031 +Version: 3.20091113 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 45dd49d01..65ee22fb1 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2009-11-13 20:53-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -436,7 +436,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:602 msgid "RPC::XML::Client not found, not pinging" msgstr "" -- cgit v1.2.3 From 4fa17df57de29e2b91c552c1b012f3f198dfaa2f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Nov 2009 15:51:00 -0500 Subject: meta: Generate meta description tags even when the html scrubber is enabled. Unlike generic meta foo tags, meta description is known to be safe, so can be special cased to be allowed despite the html scrubber. This makes meta description much more useful, since it is otherwise limited to being used by other plugins like map. --- IkiWiki/Plugin/meta.pm | 4 ++++ debian/changelog | 7 +++++++ doc/ikiwiki/directive/meta.mdwn | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 6bdb6f39c..45d073e28 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -239,6 +239,10 @@ sub preprocess (@) { push @{$metaheaders{$page}}, ''; } + elsif ($key eq 'description') { + push @{$metaheaders{$page}}, ''; + } else { push @{$metaheaders{$page}}, scrub('', $destpage); diff --git a/debian/changelog b/debian/changelog index ad80d37b7..9bddf0733 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20091114) UNRELEASED; urgency=low + + * meta: Generate meta description tags even when the html scrubber is + enabled. + + -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 + ikiwiki (3.20091113) unstable; urgency=low * underlay: Fix example values put in setup file to be array diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index 000f461c9..557441c0b 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -43,8 +43,8 @@ Supported fields: * description - Specifies a "description" of the page. You could use this to provide - a summary, for example, to be picked up by the [[map]] directive. + Specifies a short description for the page. This will be put in + the html header, and can also be displayed by eg, the [[map]] directive. * permalink -- cgit v1.2.3 From 43a1640345e5af8f173a9d3669a4c9e0dfb0a512 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Nov 2009 15:54:11 -0500 Subject: meta: Allow use of DESCRIPTION in templates to get at the meta description value. (Thanks, NicolasLimare) --- IkiWiki/Plugin/meta.pm | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 45d073e28..55c9ddbd1 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -267,7 +267,7 @@ sub pagetemplate (@) { $template->param(title_overridden => 1); } - foreach my $field (qw{author authorurl permalink}) { + foreach my $field (qw{author authorurl description permalink}) { $template->param($field => $pagestate{$page}{meta}{$field}) if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field); } diff --git a/debian/changelog b/debian/changelog index 9bddf0733..1abd4de4d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low * meta: Generate meta description tags even when the html scrubber is enabled. + * meta: Allow use of DESCRIPTION in templates to get at the meta description + value. (Thanks, NicolasLimare) -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 -- cgit v1.2.3 From da92e91769945648500819508374e2b15b79fdc8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Nov 2009 01:29:28 -0500 Subject: inline: Use caching of inlined pages to speed up builds of inlines that include feeds. Speedup of about 25% for small inlines; could be much larger for inlines of many, or complex pages. Not bloating memory with excessive memoization data was the key to this. The method chosen does not squeeze out every erg of speed possible when inlines are nested, but that's rare. It uses less memory than other optimisation hacks (I'm looking at you, f937c1fb8074a512d8bb788fa275f5e90595cd47 !) already used in inline.pm. --- IkiWiki/Plugin/inline.pm | 27 +++++++++++++++++++++++---- debian/changelog | 3 +++ 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index f89209a1b..29729a414 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -423,6 +423,8 @@ sub preprocess_inline (@) { } } + clear_inline_content_cache(); + return $ret if $raw || $nested; push @inline, $ret; return "
    \n\n"; @@ -437,25 +439,42 @@ sub pagetemplate_inline (@) { if exists $feedlinks{$page} && $template->query(name => "feedlinks"); } +{ +my %inline_content; +my $cached_destpage=""; + sub get_inline_content ($$) { my $page=shift; my $destpage=shift; + if (exists $inline_content{$page} && $cached_destpage eq $destpage) { + return $inline_content{$page}; + } + my $file=$pagesources{$page}; my $type=pagetype($file); + my $ret=""; if (defined $type) { $nested++; - my $ret=htmlize($page, $destpage, $type, + $ret=htmlize($page, $destpage, $type, linkify($page, $destpage, preprocess($page, $destpage, filter($page, $destpage, readfile(srcfile($file)))))); $nested--; - return $ret; } - else { - return ""; + + if ($cached_destpage ne $destpage) { + clear_inline_content_cache(); + $cached_destpage=$destpage; } + return $inline_content{$page}=$ret; +} + +sub clear_inline_content_cache () { + %inline_content=(); +} + } sub date_822 ($) { diff --git a/debian/changelog b/debian/changelog index 1abd4de4d..31c28941a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low enabled. * meta: Allow use of DESCRIPTION in templates to get at the meta description value. (Thanks, NicolasLimare) + * inline: Use caching of inlined pages to speed up builds of inlines that + include feeds. Speedup of about 25% for small inlines; could be much + larger for inlines of many, or complex pages. -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 -- cgit v1.2.3 From 6dd5f2e9c0722f502bed83b32c849a13283c26f9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Nov 2009 16:12:08 -0500 Subject: Added (incomplete) Turkish po file. Closes: #556744 Thanks, Recai Oktaş MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 + po/tr.po | 1180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1182 insertions(+) create mode 100644 po/tr.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 31c28941a..15d56a693 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low * inline: Use caching of inlined pages to speed up builds of inlines that include feeds. Speedup of about 25% for small inlines; could be much larger for inlines of many, or complex pages. + * Added (incomplete) Turkish po file. Closes: #556744 + Thanks, Recai Oktaş -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 diff --git a/po/tr.po b/po/tr.po new file mode 100644 index 000000000..de8fe21db --- /dev/null +++ b/po/tr.po @@ -0,0 +1,1180 @@ +# Turkish translation for ikiwiki. +# This file is distributed under the same license as the ikiwiki package. +# Recai Oktaş , 2009. +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki 3.20091031\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-23 12:40-0400\n" +"PO-Revision-Date: 2009-11-08 03:04+0200\n" +"Last-Translator: Recai Oktaş \n" +"Language-Team: Turkish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../IkiWiki/CGI.pm:113 +msgid "You need to log in first." +msgstr "Önce sisteme giriş yapmanız gerekiyor." + +#: ../IkiWiki/CGI.pm:146 +msgid "" +"probable misconfiguration: sslcookie is set, but you are attempting to login " +"via http, not https" +msgstr "" + +#: ../IkiWiki/CGI.pm:149 +msgid "login failed, perhaps you need to turn on cookies?" +msgstr "" + +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +msgid "Your login session has expired." +msgstr "" + +#: ../IkiWiki/CGI.pm:189 +msgid "Login" +msgstr "Giriş" + +#: ../IkiWiki/CGI.pm:190 +msgid "Preferences" +msgstr "Tercihler" + +#: ../IkiWiki/CGI.pm:191 +msgid "Admin" +msgstr "Yönet" + +#: ../IkiWiki/CGI.pm:231 +msgid "Preferences saved." +msgstr "Tercihler kaydedildi." + +#: ../IkiWiki/CGI.pm:277 +msgid "You are banned." +msgstr "" + +#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +msgid "Error" +msgstr "Hata" + +#: ../IkiWiki/Plugin/aggregate.pm:84 +msgid "Aggregation triggered via web." +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:93 +msgid "Nothing to do right now, all feeds are up-to-date!" +msgstr "" + +#: ../IkiWiki/Plugin/aggregate.pm:220 +#, perl-format +msgid "missing %s parameter" +msgstr "%s parametresi eksik" + +#: ../IkiWiki/Plugin/aggregate.pm:255 +msgid "new feed" +msgstr "yeni özet akışı" + +#: ../IkiWiki/Plugin/aggregate.pm:269 +msgid "posts" +msgstr "gönderi" + +#: ../IkiWiki/Plugin/aggregate.pm:271 +msgid "new" +msgstr "yeni" + +#: ../IkiWiki/Plugin/aggregate.pm:441 +#, perl-format +msgid "expiring %s (%s days old)" +msgstr "%s için zaman aşımı (%s gün eski)" + +#: ../IkiWiki/Plugin/aggregate.pm:448 +#, perl-format +msgid "expiring %s" +msgstr "%s için zaman aşımı" + +#: ../IkiWiki/Plugin/aggregate.pm:475 +#, perl-format +msgid "last checked %s" +msgstr "son güncelleme: %s" + +#: ../IkiWiki/Plugin/aggregate.pm:479 +#, perl-format +msgid "checking feed %s ..." +msgstr "%s özet akışı denetleniyor ..." + +#: ../IkiWiki/Plugin/aggregate.pm:484 +#, perl-format +msgid "could not find feed at %s" +msgstr "%s özet akışı bulunamadı" + +#: ../IkiWiki/Plugin/aggregate.pm:503 +msgid "feed not found" +msgstr "özet akışı bulunamadı" + +#: ../IkiWiki/Plugin/aggregate.pm:514 +#, perl-format +msgid "(invalid UTF-8 stripped from feed)" +msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)" + +#: ../IkiWiki/Plugin/aggregate.pm:522 +#, perl-format +msgid "(feed entities escaped)" +msgstr "(özet akışı girdileri işlendi)" + +#: ../IkiWiki/Plugin/aggregate.pm:530 +msgid "feed crashed XML::Feed!" +msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" + +#: ../IkiWiki/Plugin/aggregate.pm:616 +#, perl-format +msgid "creating new page %s" +msgstr "%s için yeni sayfa oluşturuluyor" + +#: ../IkiWiki/Plugin/amazon_s3.pm:31 +msgid "deleting bucket.." +msgstr "" + +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +msgid "done" +msgstr "" + +#: ../IkiWiki/Plugin/amazon_s3.pm:97 +#, perl-format +msgid "Must specify %s" +msgstr "" + +#: ../IkiWiki/Plugin/amazon_s3.pm:136 +msgid "Failed to create S3 bucket: " +msgstr "" + +#: ../IkiWiki/Plugin/amazon_s3.pm:221 +msgid "Failed to save file to S3: " +msgstr "" + +#: ../IkiWiki/Plugin/amazon_s3.pm:243 +msgid "Failed to delete file from S3: " +msgstr "" + +#: ../IkiWiki/Plugin/attachment.pm:49 +#, perl-format +msgid "there is already a page named %s" +msgstr "" + +#: ../IkiWiki/Plugin/attachment.pm:65 +msgid "prohibited by allowed_attachments" +msgstr "" + +#: ../IkiWiki/Plugin/attachment.pm:140 +msgid "bad attachment filename" +msgstr "" + +#: ../IkiWiki/Plugin/attachment.pm:182 +msgid "attachment upload" +msgstr "" + +#: ../IkiWiki/Plugin/autoindex.pm:105 +msgid "automatic index generation" +msgstr "" + +#: ../IkiWiki/Plugin/blogspam.pm:108 +msgid "" +"Sorry, but that looks like spam to
    blogspam: " +msgstr "" + +#: ../IkiWiki/Plugin/brokenlinks.pm:38 +#, perl-format +msgid "%s from %s" +msgstr "" + +#: ../IkiWiki/Plugin/brokenlinks.pm:46 +msgid "There are no broken links!" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#, perl-format +msgid "unsupported page format %s" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:129 +msgid "comment must have content" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:185 +msgid "Anonymous" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +msgid "bad page name" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:345 +#, perl-format +msgid "commenting on %s" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:363 +#, perl-format +msgid "page '%s' doesn't exist, so you can't comment" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:370 +#, perl-format +msgid "comments on page '%s' are closed" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:464 +msgid "comment stored for moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:466 +msgid "Your comment will be posted after moderator review" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:479 +msgid "Added a comment" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:483 +#, perl-format +msgid "Added a comment: %s" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +msgid "you are not logged in as an admin" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:576 +msgid "Comment moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:615 +msgid "comment moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:766 +msgid "Comments" +msgstr "" + +#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 +#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/testpagespec.pm:26 +#, perl-format +msgid "%s parameter is required" +msgstr "" + +#: ../IkiWiki/Plugin/cutpaste.pm:66 +msgid "no text was copied in this page" +msgstr "" + +#: ../IkiWiki/Plugin/cutpaste.pm:69 +#, perl-format +msgid "no text was copied in this page with id %s" +msgstr "" + +#: ../IkiWiki/Plugin/editpage.pm:40 +#, perl-format +msgid "removing old preview %s" +msgstr "" + +#: ../IkiWiki/Plugin/editpage.pm:113 +#, perl-format +msgid "%s is not an editable page" +msgstr "" + +#: ../IkiWiki/Plugin/editpage.pm:292 +#, perl-format +msgid "creating %s" +msgstr "" + +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:422 +#, perl-format +msgid "editing %s" +msgstr "" + +#: ../IkiWiki/Plugin/edittemplate.pm:51 +msgid "template not specified" +msgstr "" + +#: ../IkiWiki/Plugin/edittemplate.pm:54 +msgid "match not specified" +msgstr "" + +#: ../IkiWiki/Plugin/edittemplate.pm:63 +#, perl-format +msgid "edittemplate %s registered for %s" +msgstr "" + +#: ../IkiWiki/Plugin/edittemplate.pm:137 +msgid "failed to process" +msgstr "" + +#: ../IkiWiki/Plugin/format.pm:20 +msgid "must specify format and text" +msgstr "" + +#: ../IkiWiki/Plugin/fortune.pm:27 +msgid "fortune failed" +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +msgid "missing page" +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#, perl-format +msgid "The page %s does not exist." +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:73 +msgid "not a page" +msgstr "" + +#: ../IkiWiki/Plugin/getsource.pm:75 +#, perl-format +msgid "%s is an attachment, not a page." +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Receive.pm:130 +#, perl-format +msgid "you are not allowed to change %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:691 +#, perl-format +msgid "you cannot act on a file with mode %s" +msgstr "" + +#: ../IkiWiki/Plugin/git.pm:695 +msgid "you are not allowed to change file modes" +msgstr "" + +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/search.pm:36 +#, perl-format +msgid "Must specify %s when using the %s plugin" +msgstr "" + +#: ../IkiWiki/Plugin/google.pm:31 +msgid "Failed to parse url, cannot determine domain name" +msgstr "" + +#: ../IkiWiki/Plugin/graphviz.pm:67 +msgid "failed to run graphviz" +msgstr "" + +#: ../IkiWiki/Plugin/graphviz.pm:94 +msgid "prog not a valid graphviz program" +msgstr "" + +#: ../IkiWiki/Plugin/highlight.pm:47 +#, perl-format +msgid "tohighlight contains unknown file type '%s'" +msgstr "" + +#: ../IkiWiki/Plugin/highlight.pm:58 +#, perl-format +msgid "Source code: %s" +msgstr "" + +#: ../IkiWiki/Plugin/highlight.pm:123 +msgid "" +"warning: highlight perl module not available; falling back to pass through" +msgstr "" + +#: ../IkiWiki/Plugin/htmltidy.pm:50 +msgid "htmltidy failed to parse this html" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:64 +msgid "Image::Magick is not installed" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#, perl-format +msgid "failed to read %s: %s" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:74 +#, perl-format +msgid "wrong size format \"%s\" (should be WxH)" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:120 +#, perl-format +msgid "failed to resize: %s" +msgstr "" + +#: ../IkiWiki/Plugin/img.pm:140 +#, perl-format +msgid "failed to determine size of image %s" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:92 +msgid "Must specify url to wiki with --url when using --rss or --atom" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:138 +msgid "page editing not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:155 +msgid "missing pages parameter" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:191 +#, perl-format +msgid "the %s and %s parameters cannot be used together" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:312 +msgid "Add a new post titled:" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:332 +#, perl-format +msgid "nonexistant template %s" +msgstr "" + +#: ../IkiWiki/Plugin/inline.pm:598 +msgid "RPC::XML::Client not found, not pinging" +msgstr "" + +#: ../IkiWiki/Plugin/linkmap.pm:101 +msgid "failed to run dot" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:47 +#, perl-format +msgid "%s is locked and cannot be edited" +msgstr "" + +#: ../IkiWiki/Plugin/mdwn.pm:44 +msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" +msgstr "" + +#: ../IkiWiki/Plugin/mdwn.pm:67 +#, perl-format +msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" +msgstr "" + +#: ../IkiWiki/Plugin/meta.pm:161 +msgid "stylesheet not found" +msgstr "" + +#: ../IkiWiki/Plugin/meta.pm:199 +msgid "redir page not found" +msgstr "" + +#: ../IkiWiki/Plugin/meta.pm:213 +msgid "redir cycle is not allowed" +msgstr "" + +#: ../IkiWiki/Plugin/mirrorlist.pm:43 +msgid "Mirrors" +msgstr "" + +#: ../IkiWiki/Plugin/mirrorlist.pm:43 +msgid "Mirror" +msgstr "" + +#: ../IkiWiki/Plugin/more.pm:8 +msgid "more" +msgstr "" + +#: ../IkiWiki/Plugin/norcs.pm:65 +msgid "getctime not implemented" +msgstr "" + +#: ../IkiWiki/Plugin/openid.pm:61 +msgid "Log in with" +msgstr "" + +#: ../IkiWiki/Plugin/openid.pm:64 +msgid "Get an OpenID" +msgstr "" + +#: ../IkiWiki/Plugin/orphans.pm:55 +msgid "All pages have other pages linking to them." +msgstr "" + +#: ../IkiWiki/Plugin/pagetemplate.pm:30 +msgid "bad or missing template" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:248 +msgid "Account creation successful. Now you can Login." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:251 +msgid "Error creating account." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:258 +msgid "No email address, so cannot email password reset instructions." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:292 +msgid "Failed to send mail" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:294 +msgid "You have been mailed password reset instructions." +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:329 +msgid "incorrect password reset url" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:332 +msgid "password reset denied" +msgstr "" + +#: ../IkiWiki/Plugin/pingee.pm:30 +msgid "Ping received." +msgstr "" + +#: ../IkiWiki/Plugin/pinger.pm:53 +msgid "requires 'from' and 'to' parameters" +msgstr "" + +#: ../IkiWiki/Plugin/pinger.pm:58 +#, perl-format +msgid "Will ping %s" +msgstr "" + +#: ../IkiWiki/Plugin/pinger.pm:61 +#, perl-format +msgid "Ignoring ping directive for wiki %s (this wiki is %s)" +msgstr "" + +#: ../IkiWiki/Plugin/pinger.pm:77 +msgid "LWP not found, not pinging" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:15 +msgid "warning: Old po4a detected! Recommend upgrade to 0.35." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:138 +#, perl-format +msgid "%s is not a valid language code" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:150 +#, perl-format +msgid "" +"%s is not a valid value for po_link_to, falling back to po_link_to=default" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:155 +msgid "" +"po_link_to=negotiated requires usedirs to be enabled, falling back to " +"po_link_to=default" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:385 +#, perl-format +msgid "rebuilding all pages to fix meta titles" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#, perl-format +msgid "building %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:428 +msgid "updated PO files" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:452 +msgid "" +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:472 +msgid "" +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:871 +#, perl-format +msgid "POT file (%s) does not exist" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:885 +#, perl-format +msgid "failed to copy underlay PO file to %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:894 +#, perl-format +msgid "failed to update %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:900 +#, perl-format +msgid "failed to copy the POT file to %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:936 +msgid "N/A" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:949 +#, perl-format +msgid "failed to translate %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:1033 +msgid "removed obsolete PO files" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 +#: ../IkiWiki/Plugin/po.pm:1150 +#, perl-format +msgid "failed to write %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:1108 +msgid "failed to translate" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:1113 +#, perl-format +msgid "failed to read %s" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:1162 +msgid "invalid gettext data, go back to previous page to continue edit" +msgstr "" + +#: ../IkiWiki/Plugin/poll.pm:69 +msgid "vote" +msgstr "" + +#: ../IkiWiki/Plugin/poll.pm:77 +msgid "Total votes:" +msgstr "" + +#: ../IkiWiki/Plugin/polygen.pm:41 +msgid "polygen not installed" +msgstr "" + +#: ../IkiWiki/Plugin/polygen.pm:60 +msgid "command failed" +msgstr "" + +#: ../IkiWiki/Plugin/postsparkline.pm:46 +msgid "missing formula" +msgstr "" + +#: ../IkiWiki/Plugin/postsparkline.pm:53 +msgid "unknown formula" +msgstr "" + +#. translators: These descriptions of times of day are used +#. translators: in messages like "last edited ". +#. translators: %A is the name of the day of the week, while +#. translators: %A- is the name of the previous day. +#: ../IkiWiki/Plugin/prettydate.pm:15 +msgid "late %A- night" +msgstr "%A- gecesi geç saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:17 +msgid "in the wee hours of %A- night" +msgstr "%A- gecesi erken saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:20 +msgid "terribly early %A morning" +msgstr "%A sabahı çok erken saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:22 +msgid "early %A morning" +msgstr "%A sabahı erken saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:25 +msgid "mid-morning %A" +msgstr "%A sabahı" + +#: ../IkiWiki/Plugin/prettydate.pm:26 +msgid "late %A morning" +msgstr "%A sabahı ilerleyen saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:27 +msgid "at lunch time on %A" +msgstr "%A öğle arası" + +#: ../IkiWiki/Plugin/prettydate.pm:29 +msgid "%A afternoon" +msgstr "%A öğleden sonra" + +#: ../IkiWiki/Plugin/prettydate.pm:32 +msgid "late %A afternoon" +msgstr "%A öğleden sonra ilerleyen saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:33 +msgid "%A evening" +msgstr "%A akşamı" + +#: ../IkiWiki/Plugin/prettydate.pm:35 +msgid "late %A evening" +msgstr "%A akşamı ilerleyen saatlerde" + +#: ../IkiWiki/Plugin/prettydate.pm:37 +msgid "%A night" +msgstr "%A gecesi" + +#: ../IkiWiki/Plugin/prettydate.pm:101 +msgid "at teatime on %A" +msgstr "%A ikindi saatlerinde" + +#: ../IkiWiki/Plugin/prettydate.pm:105 +msgid "at midnight" +msgstr "geceyarısında" + +#: ../IkiWiki/Plugin/prettydate.pm:108 +msgid "at noon on %A" +msgstr "%A öğleyin" + +#: ../IkiWiki/Plugin/progress.pm:34 +#, perl-format +msgid "illegal percent value %s" +msgstr "" + +#: ../IkiWiki/Plugin/progress.pm:55 +msgid "need either `percent` or `totalpages` and `donepages` parameters" +msgstr "" + +#: ../IkiWiki/Plugin/recentchangesdiff.pm:37 +msgid "(Diff truncated)" +msgstr "" + +#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#, perl-format +msgid "%s does not exist" +msgstr "" + +#: ../IkiWiki/Plugin/remove.pm:38 +#, perl-format +msgid "%s is not in the srcdir, so it cannot be deleted" +msgstr "" + +#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#, perl-format +msgid "%s is not a file" +msgstr "" + +#: ../IkiWiki/Plugin/remove.pm:134 +#, perl-format +msgid "confirm removal of %s" +msgstr "" + +#: ../IkiWiki/Plugin/remove.pm:171 +msgid "Please select the attachments to remove." +msgstr "" + +#: ../IkiWiki/Plugin/remove.pm:211 +msgid "removed" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:42 +#, perl-format +msgid "%s is not in the srcdir, so it cannot be renamed" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:62 +msgid "no change to the file name was specified" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:68 +#, perl-format +msgid "illegal name" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:73 +#, perl-format +msgid "%s already exists" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:79 +#, perl-format +msgid "%s already exists on disk" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:122 +#, perl-format +msgid "rename %s" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:161 +msgid "Also rename SubPages and attachments" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:247 +msgid "Only one attachment can be renamed at a time." +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:250 +msgid "Please select the attachment to rename." +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:347 +#, perl-format +msgid "rename %s to %s" +msgstr "" + +#: ../IkiWiki/Plugin/rename.pm:571 +#, perl-format +msgid "update for rename of %s to %s" +msgstr "" + +#: ../IkiWiki/Plugin/rsync.pm:37 +#, perl-format +msgid "failed to execute rsync_command: %s" +msgstr "" + +#: ../IkiWiki/Plugin/rsync.pm:40 +#, perl-format +msgid "rsync_command exited %d" +msgstr "" + +#: ../IkiWiki/Plugin/search.pm:182 +#, perl-format +msgid "need Digest::SHA1 to index %s" +msgstr "" + +#: ../IkiWiki/Plugin/search.pm:217 +msgid "search" +msgstr "" + +#: ../IkiWiki/Plugin/shortcut.pm:31 +#, perl-format +msgid "shortcut plugin will not work without %s" +msgstr "" + +#: ../IkiWiki/Plugin/shortcut.pm:44 +msgid "missing name or url parameter" +msgstr "" + +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:54 +#, perl-format +msgid "shortcut %s points to %s" +msgstr "" + +#: ../IkiWiki/Plugin/smiley.pm:43 +msgid "failed to parse any smileys" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:72 +msgid "parse error" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:78 +msgid "invalid featurepoint diameter" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:88 +msgid "invalid featurepoint location" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:99 +msgid "missing values" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:104 +msgid "invalid height value" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:111 +msgid "missing width parameter" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:115 +msgid "invalid width value" +msgstr "" + +#: ../IkiWiki/Plugin/sparkline.pm:153 +msgid "failed to run php" +msgstr "" + +#: ../IkiWiki/Plugin/table.pm:31 +msgid "cannot find file" +msgstr "" + +#: ../IkiWiki/Plugin/table.pm:87 +msgid "unknown data format" +msgstr "" + +#: ../IkiWiki/Plugin/table.pm:95 +msgid "empty data" +msgstr "" + +#: ../IkiWiki/Plugin/table.pm:114 +msgid "Direct data download" +msgstr "" + +#: ../IkiWiki/Plugin/table.pm:148 +#, perl-format +msgid "parse fail at line %d: %s" +msgstr "" + +#: ../IkiWiki/Plugin/template.pm:29 +msgid "missing id parameter" +msgstr "" + +#: ../IkiWiki/Plugin/template.pm:36 +#, perl-format +msgid "template %s not found" +msgstr "" + +#: ../IkiWiki/Plugin/template.pm:55 +msgid "failed to process:" +msgstr "" + +#: ../IkiWiki/Plugin/teximg.pm:70 +msgid "missing tex code" +msgstr "" + +#: ../IkiWiki/Plugin/teximg.pm:122 +msgid "failed to generate image from code" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:89 +msgid "plugin" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:108 +#, perl-format +msgid "enable %s?" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:240 +msgid "setup file for this wiki is not known" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:256 +msgid "main" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:257 +msgid "plugins" +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:395 +msgid "" +"The configuration changes shown below require a wiki rebuild to take effect." +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:399 +msgid "" +"For the configuration changes shown below to fully take effect, you may need " +"to rebuild the wiki." +msgstr "" + +#: ../IkiWiki/Plugin/websetup.pm:436 +#, perl-format +msgid "Error: %s exited nonzero (%s). Discarding setup changes." +msgstr "" + +#: ../IkiWiki/Receive.pm:34 +#, perl-format +msgid "cannot determine id of untrusted committer %s" +msgstr "" + +#: ../IkiWiki/Receive.pm:86 +#, perl-format +msgid "bad file name %s" +msgstr "" + +#: ../IkiWiki/Render.pm:150 +#, perl-format +msgid "scanning %s" +msgstr "" + +#: ../IkiWiki/Render.pm:271 +#, perl-format +msgid "" +"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " +"allow this" +msgstr "" + +#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#, perl-format +msgid "skipping bad filename %s" +msgstr "" + +#: ../IkiWiki/Render.pm:305 +#, perl-format +msgid "%s has multiple possible source pages" +msgstr "" + +#: ../IkiWiki/Render.pm:395 +#, perl-format +msgid "removing old page %s" +msgstr "" + +#: ../IkiWiki/Render.pm:471 +#, perl-format +msgid "building %s, which links to %s" +msgstr "" + +#: ../IkiWiki/Render.pm:480 +#, perl-format +msgid "removing %s, no longer built by %s" +msgstr "" + +#: ../IkiWiki/Render.pm:603 +#, perl-format +msgid "building %s, which depends on %s" +msgstr "" + +#: ../IkiWiki/Render.pm:616 +#, perl-format +msgid "building %s, to update its backlinks" +msgstr "" + +#: ../IkiWiki/Render.pm:679 +#, perl-format +msgid "ikiwiki: cannot build %s" +msgstr "" + +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:19 +#, perl-format +msgid "cannot read %s: %s" +msgstr "" + +#: ../IkiWiki/Setup/Automator.pm:33 +msgid "you must enter a wikiname (that contains alphanumerics)" +msgstr "" + +#: ../IkiWiki/Setup/Automator.pm:76 +#, perl-format +msgid "unsupported revision control system %s" +msgstr "" + +#: ../IkiWiki/Setup/Automator.pm:102 +msgid "failed to set up the repository with ikiwiki-makerepo" +msgstr "" + +#: ../IkiWiki/Setup/Automator.pm:120 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + +#: ../IkiWiki/Wrapper.pm:16 +#, perl-format +msgid "%s doesn't seem to be executable" +msgstr "" + +#: ../IkiWiki/Wrapper.pm:20 +msgid "cannot create a wrapper that uses a setup file" +msgstr "" + +#: ../IkiWiki/Wrapper.pm:24 +msgid "wrapper filename not specified" +msgstr "" + +#. translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:149 +#, perl-format +msgid "failed to compile %s" +msgstr "" + +#. translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:169 +#, perl-format +msgid "successfully generated %s" +msgstr "" + +#: ../ikiwiki.in:13 +msgid "usage: ikiwiki [options] source dest" +msgstr "" + +#: ../ikiwiki.in:14 +msgid " ikiwiki --setup configfile" +msgstr "" + +#: ../ikiwiki.in:91 +msgid "usage: --set var=value" +msgstr "" + +#: ../ikiwiki.in:140 +msgid "generating wrappers.." +msgstr "" + +#: ../ikiwiki.in:195 +msgid "rebuilding wiki.." +msgstr "" + +#: ../ikiwiki.in:198 +msgid "refreshing wiki.." +msgstr "" + +#: ../IkiWiki.pm:238 +msgid "Discussion" +msgstr "" + +#: ../IkiWiki.pm:507 +msgid "Must specify url to wiki with --url when using --cgi" +msgstr "" + +#: ../IkiWiki.pm:553 +msgid "cannot use multiple rcs plugins" +msgstr "" + +#: ../IkiWiki.pm:582 +#, perl-format +msgid "failed to load external plugin needed for %s plugin: %s" +msgstr "" + +#: ../IkiWiki.pm:1264 +#, perl-format +msgid "preprocessing loop detected on %s at depth %i" +msgstr "" + +#: ../IkiWiki.pm:1863 +msgid "yes" +msgstr "" + +#: ../IkiWiki.pm:2006 +msgid "Sort::Naturally needed for title_natural sort" +msgstr "" + +#: ../IkiWiki.pm:2017 +#, perl-format +msgid "unknown sort type %s" +msgstr "" + +#: ../IkiWiki.pm:2036 +#, perl-format +msgid "cannot match pages: %s" +msgstr "" + +#: ../auto.setup:16 +msgid "What will the wiki be named?" +msgstr "" + +#: ../auto.setup:16 +msgid "wiki" +msgstr "" + +#: ../auto.setup:19 +msgid "What revision control system to use?" +msgstr "" + +#: ../auto.setup:21 +msgid "Which user (wiki account or openid) will be admin?" +msgstr "" + +#: ../auto.setup:24 +msgid "What is the domain name of the web server?" +msgstr "" -- cgit v1.2.3 From df75c5b93a1067461b649e48cc62d4c7f4d18ec7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 25 Nov 2009 01:18:43 -0500 Subject: date: New plugin that allows inserting date directives that expand to pretty-printed dates, using the same formatting as used for page modification date display, etc. --- IkiWiki/Plugin/date.pm | 33 +++++++++++++++++++++++++++++++++ debian/changelog | 3 +++ doc/ikiwiki/directive/date.mdwn | 14 ++++++++++++++ doc/plugins/date.mdwn | 6 ++++++ 4 files changed, 56 insertions(+) create mode 100644 IkiWiki/Plugin/date.pm create mode 100644 doc/ikiwiki/directive/date.mdwn create mode 100644 doc/plugins/date.mdwn (limited to 'debian') diff --git a/IkiWiki/Plugin/date.pm b/IkiWiki/Plugin/date.pm new file mode 100644 index 000000000..8f2aa73d6 --- /dev/null +++ b/IkiWiki/Plugin/date.pm @@ -0,0 +1,33 @@ +#!/usr/bin/perl +package IkiWiki::Plugin::date; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "meta", call => \&getsetup); + hook(type => "preprocess", id => "meta", call => \&preprocess); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, +} + +sub preprocess (@) { + my $str=shift; + + eval q{use Date::Parse}; + error $@ if $@; + my $time = str2time($str); + if (! defined $time) { + error("unable to parse $str"); + } + return displaytime($time); +} + +1 diff --git a/debian/changelog b/debian/changelog index 15d56a693..10fcebbec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,9 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low larger for inlines of many, or complex pages. * Added (incomplete) Turkish po file. Closes: #556744 Thanks, Recai Oktaş + * date: New plugin that allows inserting date directives that expand to + pretty-printed dates, using the same formatting as used for page + modification date display, etc. -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 diff --git a/doc/ikiwiki/directive/date.mdwn b/doc/ikiwiki/directive/date.mdwn new file mode 100644 index 000000000..df45fa840 --- /dev/null +++ b/doc/ikiwiki/directive/date.mdwn @@ -0,0 +1,14 @@ +The `date` directive is supplied by the [[!iki plugins/date desc=date]] plugin. + +This directive can be used to display a date on a page, using the same +display method that is used to display the modification date in the page +footer, and other dates in the wiki. This can be useful for consistency +of display, or if you want to embed parseable dates into the page source. + +Like the dates used by the [[meta]] directive, the date can be entered in +nearly any format, since it's parsed by [[!cpan TimeDate]]. + +For example, an update to a page with an embedded date stamp could look +like: + + Updated \[[!date "Wed, 25 Nov 2009 01:11:55 -0500"]]: mumble mumble diff --git a/doc/plugins/date.mdwn b/doc/plugins/date.mdwn new file mode 100644 index 000000000..b8dbdfee5 --- /dev/null +++ b/doc/plugins/date.mdwn @@ -0,0 +1,6 @@ +[[!template id=plugin name=date author="[[Joey]]"]] +[[!tag type/meta]] + +This plugin provides the [[ikiwiki/directive/date]] +[[ikiwiki/directive]], which provides a way to display an arbitrary date +in a page. -- cgit v1.2.3 From 268a2dd54cd47d6ec39c22d61baa5f6f9d40b7f5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Nov 2009 14:10:21 -0500 Subject: htmllink: allow a title attribute to be specified --- IkiWiki.pm | 9 ++++----- debian/changelog | 1 + doc/plugins/write.mdwn | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 1e9d1ca2a..611ba6f65 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1081,11 +1081,10 @@ sub htmllink ($$$;@) { } my @attrs; - if (defined $opts{rel}) { - push @attrs, ' rel="'.$opts{rel}.'"'; - } - if (defined $opts{class}) { - push @attrs, ' class="'.$opts{class}.'"'; + foreach my $attr (qw{rel class title}) { + if (defined $opts{$attr}) { + push @attrs, " $attr=\"".$opts{attr}.'"'; + } } return "$linktext"; diff --git a/debian/changelog b/debian/changelog index 10fcebbec..e31928223 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low * date: New plugin that allows inserting date directives that expand to pretty-printed dates, using the same formatting as used for page modification date display, etc. + * htmllink: Allow a title attribute to be specified. -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 2f179d46f..45f083b42 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -712,6 +712,7 @@ control some options. These are: * anchor - set to make the link include an anchor * rel - set to add a rel attribute to the link * class - set to add a css class to the link +* title - set to add a title attribute to the link #### `readfile($;$)` -- cgit v1.2.3 From 2255a6a0bba10eece24304f64ec8329068e8bf07 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 26 Nov 2009 14:57:52 -0500 Subject: calendar: Add title attributes for all links in the calendars. --- IkiWiki.pm | 2 +- IkiWiki/Plugin/calendar.pm | 33 +++++++++++++++++++++------------ debian/changelog | 1 + 3 files changed, 23 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 611ba6f65..99d5724eb 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1083,7 +1083,7 @@ sub htmllink ($$$;@) { my @attrs; foreach my $attr (qw{rel class title}) { if (defined $opts{$attr}) { - push @attrs, " $attr=\"".$opts{attr}.'"'; + push @attrs, " $attr=\"$opts{$attr}\""; } } diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index c9bdf4a17..cbbb57e98 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -128,7 +128,8 @@ sub format_month (@) { $url = htmllink($params{page}, $params{destpage}, "$archivebase/$params{year}/".$params{month}, noimageinline => 1, - linktext => " $monthname "); + linktext => $monthname, + title => $monthname); } add_depends($params{page}, "$archivebase/$params{year}/$params{month}", deptype("presence")); @@ -136,7 +137,8 @@ sub format_month (@) { $purl = htmllink($params{page}, $params{destpage}, "$archivebase/$pyear/$pmonth", noimageinline => 1, - linktext => "\&larr"); + linktext => "\&larr", + title => $pmonthname); } add_depends($params{page}, "$archivebase/$pyear/$pmonth", deptype("presence")); @@ -144,7 +146,8 @@ sub format_month (@) { $nurl = htmllink($params{page}, $params{destpage}, "$archivebase/$nyear/$nmonth", noimageinline => 1, - linktext => "\&rarr"); + linktext => "\&rarr", + title => $nmonthname); } add_depends($params{page}, "$archivebase/$nyear/$nmonth", deptype("presence")); @@ -173,7 +176,7 @@ EOF my $dowabbr = POSIX::strftime("%a", @day); $downame{$dow % 7}=$downame; $dowabbr{$dow % 7}=$dowabbr; - $calendar.= qq{\t\t$dowabbr\n}; + $calendar.= qq{\t\t$dowabbr\n}; } $calendar.=< $params{year}, month => $params{month}); $day++, $wday++, $wday %= 7) { - # At tihs point, on a week_start_day, we close out a row, + # At this point, on a week_start_day, we close out a row, # and start a new one -- unless it is week_start_day on the # first, where we do not close a row -- since none was started. if ($wday == $week_start_day) { @@ -200,7 +203,8 @@ EOF } my $tag; - if (defined $linkcache{"$params{year}/$params{month}/$day"}) { + my $key="$params{year}/$params{month}/$day"; + if (defined $linkcache{$key}) { if ($day == $today) { $tag='month-calendar-day-this-day'; } @@ -209,9 +213,10 @@ EOF } $calendar.=qq{\t\t}; $calendar.=htmllink($params{page}, $params{destpage}, - $linkcache{"$params{year}/$params{month}/$day"}, + $linkcache{$key}, noimageinline => 1, - "linktext" => "$day"); + linktext => $day, + title => pagetitle(IkiWiki::basename($linkcache{$key}))); $calendar.=qq{\n}; } else { @@ -276,21 +281,24 @@ sub format_year (@) { $url = htmllink($params{page}, $params{destpage}, "$archivebase/$params{year}", noimageinline => 1, - linktext => "$params{year}"); + linktext => $params{year}, + title => $params{year}); } add_depends($params{page}, "$archivebase/$params{year}", deptype("presence")); if (exists $pagesources{"$archivebase/$pyear"}) { $purl = htmllink($params{page}, $params{destpage}, "$archivebase/$pyear", noimageinline => 1, - linktext => "\←"); + linktext => "\←", + title => $pyear); } add_depends($params{page}, "$archivebase/$pyear", deptype("presence")); if (exists $pagesources{"$archivebase/$nyear"}) { $nurl = htmllink($params{page}, $params{destpage}, "$archivebase/$nyear", noimageinline => 1, - linktext => "\→"); + linktext => "\→", + title => $nyear); } add_depends($params{page}, "$archivebase/$nyear", deptype("presence")); @@ -333,7 +341,8 @@ EOF $murl = htmllink($params{page}, $params{destpage}, "$archivebase/$params{year}/$mtag", noimageinline => 1, - linktext => "$monthabbr"); + linktext => $monthabbr, + title => $monthname); $calendar.=qq{\t}; $calendar.=$murl; $calendar.=qq{\t\n}; diff --git a/debian/changelog b/debian/changelog index e31928223..2b468ca2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low pretty-printed dates, using the same formatting as used for page modification date display, etc. * htmllink: Allow a title attribute to be specified. + * calendar: Add title attributes for all links in the calendars. -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 -- cgit v1.2.3 From f02f806cf70ed19c9e9aa70e232ca46398b3538a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Dec 2009 12:58:45 -0500 Subject: calendar: Fix month wraparound error that broke in December. --- IkiWiki/Plugin/calendar.pm | 10 ++++++++-- debian/changelog | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index cbbb57e98..77fd50827 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -396,8 +396,14 @@ sub preprocess (@) { } elsif ($params{type} eq 'year' && $params{year} == $thisyear) { # calendar for current year, updates 1st of next month - $pagestate{$params{destpage}}{calendar}{nextchange}= - timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}); + if ($thismonth < 12) { + $pagestate{$params{destpage}}{calendar}{nextchange}= + timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}); + } + else { + $pagestate{$params{destpage}}{calendar}{nextchange}= + timelocal(0, 0, 0, 1, 1-1, $params{year}+1); + } } elsif ($params{type} eq 'year' && $params{year} > $thisyear) { # calendar for upcoming year, updates 1st of that year diff --git a/debian/changelog b/debian/changelog index 2b468ca2f..3afe89b59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low modification date display, etc. * htmllink: Allow a title attribute to be specified. * calendar: Add title attributes for all links in the calendars. + * calendar: Fix month wraparound error that broke in December. -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 -- cgit v1.2.3 From 82c7f367ec91fba14d1c48dc55c2a859c74fc08f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Dec 2009 13:15:30 -0500 Subject: releasing version 3.20091202 --- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 30 +++++++++---------- po/tr.po | 90 ++++++++++++++++++++++++++++---------------------------- 4 files changed, 63 insertions(+), 63 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3afe89b59..1408e4dce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20091114) UNRELEASED; urgency=low +ikiwiki (3.20091202) unstable; urgency=low * meta: Generate meta description tags even when the html scrubber is enabled. @@ -16,7 +16,7 @@ ikiwiki (3.20091114) UNRELEASED; urgency=low * calendar: Add title attributes for all links in the calendars. * calendar: Fix month wraparound error that broke in December. - -- Joey Hess Mon, 16 Nov 2009 15:46:45 -0500 + -- Joey Hess Wed, 02 Dec 2009 13:09:20 -0500 ikiwiki (3.20091113) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 491c69a8d..1651377e1 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20091113 +Version: 3.20091202 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 65ee22fb1..eb1824411 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-13 20:53-0500\n" +"POT-Creation-Date: 2009-12-02 13:10-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281 msgid "Error" msgstr "" @@ -436,7 +436,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:602 +#: ../IkiWiki/Plugin/inline.pm:621 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -582,7 +582,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652 #, perl-format msgid "building %s" msgstr "" @@ -1018,32 +1018,32 @@ msgstr "" msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:483 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:492 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:615 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:628 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:693 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1139,25 +1139,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/tr.po b/po/tr.po index de8fe21db..f3bce9f4f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-23 12:40-0400\n" +"POT-Creation-Date: 2009-12-02 13:10-0500\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -13,45 +13,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:113 +#: ../IkiWiki/CGI.pm:114 msgid "You need to log in first." msgstr "Önce sisteme giriş yapmanız gerekiyor." -#: ../IkiWiki/CGI.pm:146 +#: ../IkiWiki/CGI.pm:147 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:150 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:313 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:189 +#: ../IkiWiki/CGI.pm:190 msgid "Login" msgstr "Giriş" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:191 msgid "Preferences" msgstr "Tercihler" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:192 msgid "Admin" msgstr "Yönet" -#: ../IkiWiki/CGI.pm:231 +#: ../IkiWiki/CGI.pm:232 msgid "Preferences saved." msgstr "Tercihler kaydedildi." -#: ../IkiWiki/CGI.pm:277 +#: ../IkiWiki/CGI.pm:278 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:404 ../IkiWiki/CGI.pm:405 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281 msgid "Error" msgstr "Hata" @@ -350,16 +350,12 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:131 +#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/google.pm:31 -msgid "Failed to parse url, cannot determine domain name" -msgstr "" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "" @@ -437,7 +433,7 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:621 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -454,7 +450,7 @@ msgstr "" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:67 +#: ../IkiWiki/Plugin/mdwn.pm:69 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" @@ -479,6 +475,10 @@ msgstr "" msgid "Mirror" msgstr "" +#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +msgid "comment needs moderation" +msgstr "" + #: ../IkiWiki/Plugin/more.pm:8 msgid "more" msgstr "" @@ -579,76 +579,76 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:427 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:451 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:471 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:870 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:884 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:893 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:899 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:935 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:948 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1032 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 ../IkiWiki/Plugin/po.pm:1110 -#: ../IkiWiki/Plugin/po.pm:1150 +#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 +#: ../IkiWiki/Plugin/po.pm:1149 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1108 +#: ../IkiWiki/Plugin/po.pm:1107 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1113 +#: ../IkiWiki/Plugin/po.pm:1112 #, perl-format msgid "failed to read %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 +#: ../IkiWiki/Plugin/po.pm:1161 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1015,32 +1015,32 @@ msgstr "" msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:410 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:483 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:492 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:615 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:628 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:693 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1136,25 +1136,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "" -- cgit v1.2.3 From 3fd8a7f91ccf0f9628a345d7ae08e8bba508410c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 2 Dec 2009 17:22:42 -0500 Subject: cvs: Add missing bit to Automator. --- IkiWiki/Setup/Automator.pm | 3 +++ debian/changelog | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index d1594d7ea..7af93e73c 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -72,6 +72,9 @@ sub import (@) { elsif ($config{rcs} eq 'mercurial') { # TODO } + elsif ($config{rcs} eq 'cvs') { + $config{cvs_wrapper}=$config{repository}."/CVSROOT/post-commit"; + } else { error sprintf(gettext("unsupported revision control system %s"), $config{rcs}); diff --git a/debian/changelog b/debian/changelog index 1408e4dce..c693be513 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20091203) UNRELEASED; urgency=low + + * cvs: Add missing bit to Automator. + + -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 + ikiwiki (3.20091202) unstable; urgency=low * meta: Generate meta description tags even when the html scrubber is -- cgit v1.2.3 From af3cc556bab1e2b840f8521b4da09bcf05f04fd9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Dec 2009 13:12:12 -0500 Subject: add darcs to VCS list --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3e2fdc537..172e1b23d 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libhtml-parser-perl, liburi-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, - subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), + subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), -- cgit v1.2.3 From 700a4e31da325cb25184969ba5c7b9168e089459 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Dec 2009 15:02:26 -0500 Subject: added copyright info for translations --- debian/copyright | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 98feffc6f..9285bf541 100644 --- a/debian/copyright +++ b/debian/copyright @@ -148,6 +148,20 @@ Files: doc/logo/* Copyright: © 2006 Recai Oktaş License: GPL-2+ +Files: po/* +Copyright: + 2007 Damyan Ivanov + 2007-2009 Miroslav Kure + 2008 Jonas Smedegaard + 2008 Kai Wasserbäch + 2008-2009 Kurt Gramlich + 2007, 2009 The Free Software Foundation, Inc + 2007 Kartik Mistry + 2007 Pawel Tecza +License: + Redistribution and use in source and compiled forms, with or without + modification, are permitted under any circumstances. No warranty. + Files: doc/smileys/* Copyright: (c) 2000 - 2004 by Jürgen Hermann -- cgit v1.2.3 From eaec4d97e4c7a2b42e5a0932d63faed10bc232f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Dec 2009 15:07:20 -0500 Subject: improve po copyright info The FSF copyrights seem to be boilerplate, not real, so put in the actual authors' info. --- debian/copyright | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index 9285bf541..050a4dd61 100644 --- a/debian/copyright +++ b/debian/copyright @@ -155,9 +155,14 @@ Copyright: 2008 Jonas Smedegaard 2008 Kai Wasserbäch 2008-2009 Kurt Gramlich - 2007, 2009 The Free Software Foundation, Inc 2007 Kartik Mistry 2007 Pawel Tecza + 2007, 2009 Víctor Moral + 2007 Jean-Luc Coulon (f5ibh) + 2008 Christian Perrier + 2007 Cyril Brulebois + 2007 Daniel Nylander + 2009 Fernando González de Requena License: Redistribution and use in source and compiled forms, with or without modification, are permitted under any circumstances. No warranty. -- cgit v1.2.3 From c3ae09056d6ee9880d8cd118e98282f1a3655fe6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 6 Dec 2009 15:09:59 -0500 Subject: Add complete Spanish basewiki translation done by Fernando Gonzalez de Requena. --- debian/changelog | 2 + po/underlay.setup | 2 +- po/underlays/basewiki/ikiwiki.es.po | 71 +++++ po/underlays/basewiki/ikiwiki/directive.es.po | 133 +++++++++ po/underlays/basewiki/ikiwiki/formatting.es.po | 299 +++++++++++++++++++++ po/underlays/basewiki/ikiwiki/markdown.es.po | 50 ++++ po/underlays/basewiki/ikiwiki/openid.es.po | 117 ++++++++ po/underlays/basewiki/ikiwiki/pagespec.es.po | 251 +++++++++++++++++ .../basewiki/ikiwiki/pagespec/attachment.es.po | 119 ++++++++ po/underlays/basewiki/ikiwiki/pagespec/po.es.po | 64 +++++ po/underlays/basewiki/ikiwiki/searching.es.po | 84 ++++++ po/underlays/basewiki/ikiwiki/subpage.es.po | 51 ++++ .../basewiki/ikiwiki/subpage/linkingrules.es.po | 102 +++++++ po/underlays/basewiki/ikiwiki/wikilink.es.po | 107 ++++++++ po/underlays/basewiki/index.es.po | 31 +++ po/underlays/basewiki/recentchanges.es.po | 40 +++ po/underlays/basewiki/sandbox.es.po | 90 +++++++ po/underlays/basewiki/shortcuts.es.po | 233 ++++++++++++++++ po/underlays/basewiki/templates.es.po | 242 +++++++++++++++++ po/underlays/basewiki/templates/note.es.po | 44 +++ po/underlays/basewiki/templates/popup.es.po | 54 ++++ 21 files changed, 2185 insertions(+), 1 deletion(-) create mode 100644 po/underlays/basewiki/ikiwiki.es.po create mode 100644 po/underlays/basewiki/ikiwiki/directive.es.po create mode 100644 po/underlays/basewiki/ikiwiki/formatting.es.po create mode 100644 po/underlays/basewiki/ikiwiki/markdown.es.po create mode 100644 po/underlays/basewiki/ikiwiki/openid.es.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.es.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.es.po create mode 100644 po/underlays/basewiki/ikiwiki/searching.es.po create mode 100644 po/underlays/basewiki/ikiwiki/subpage.es.po create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.es.po create mode 100644 po/underlays/basewiki/index.es.po create mode 100644 po/underlays/basewiki/recentchanges.es.po create mode 100644 po/underlays/basewiki/sandbox.es.po create mode 100644 po/underlays/basewiki/shortcuts.es.po create mode 100644 po/underlays/basewiki/templates.es.po create mode 100644 po/underlays/basewiki/templates/note.es.po create mode 100644 po/underlays/basewiki/templates/popup.es.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c693be513..cffc316ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * cvs: Add missing bit to Automator. + * Add complete Spanish basewiki translation done by Fernando Gonzalez de + Requena. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 diff --git a/po/underlay.setup b/po/underlay.setup index a7d307e71..333d331d1 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -7,7 +7,7 @@ use IkiWiki::Setup::Standard { # Listing languages without active translations # will excessively bloat things. po_slave_languages => { - #'es' => 'Español', + 'es' => 'Español', #'de' => 'Deutsch', 'fr' => 'Français', 'da' => 'Dansk', diff --git a/po/underlays/basewiki/ikiwiki.es.po b/po/underlays/basewiki/ikiwiki.es.po new file mode 100644 index 000000000..f6c1eb3c9 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki.es.po @@ -0,0 +1,71 @@ +# Spanish translation of basewiki/ikiwiki page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki \n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-16 20:19+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then=\"(Currently running version [[!version ]].)\"\n" +"]]\n" +msgstr "" +"Este wiki funciona con [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then=\"(Versión actualmente en funcionamiento [[!version ]].)\"\n" +"]]\n" + +#. type: Plain text +msgid "Some documentation on using ikiwiki:" +msgstr "Alguna documentación sobre el uso de ikiwiki:" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/formatting]]" +msgstr "[[Aplicación de formato a las páginas|ikiwiki/formatting]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/wikilink]]" +msgstr "[[Enlaces Wiki («WikiLinks»)|ikiwiki/wikilink]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/subpage]]" +msgstr "[[Subpáginas|ikiwiki/subpage]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/pagespec]]" +msgstr "[[Selección de páginas («PageSpec»)|ikiwiki/pagespec]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/directive]]" +msgstr "[[Directivas|ikiwiki/directive]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/markdown]]" +msgstr "[[Lenguaje de marcado|ikiwiki/markdown]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/openid]]" +msgstr "[[ikiwiki/openid]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/searching]]" +msgstr "[[Búsqueda|ikiwiki/searching]]" + diff --git a/po/underlays/basewiki/ikiwiki/directive.es.po b/po/underlays/basewiki/ikiwiki/directive.es.po new file mode 100644 index 000000000..91fa89e29 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/directive.es.po @@ -0,0 +1,133 @@ +# Spanish translation of basewiki/ikiwiki/directive page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-18 02:21+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin " +"with `!` and may contain parameters. The general form is:" +msgstr "" +"Las directivas tienen una forma similar a un [[ikiwiki/WikiLink]], pero empiezan " +"con `!` y pueden contener parámetros. La forma general es:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n" +msgstr "\t\\[[!directive param=\"value\" param=\"value\"]]\n" + +#. type: Plain text +msgid "" +"This gets expanded before the rest of the page is processed, and can be used " +"to transform the page in various ways." +msgstr "" +"Esto se expande antes de que el resto de la página sea procesada, y puede utilizarse " +"para transformar la página de diferentes maneras." + +#. type: Plain text +msgid "" +"The quotes around values can be omitted if the value is a simple word. " +"Also, some directives may use parameters without values, for example:" +msgstr "" +"Se pueden omitir las comillas en torno a un valor si éste consiste en una sola " +"palabra. Además, algunas directivas pueden usar parámetros sin valores, " +"como por ejemplo:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!tag foo]]\n" +msgstr "\t\\[[!tag foo]]\n" + +#. type: Plain text +msgid "" +"A directive does not need to all be on one line, it can be wrapped to " +"multiple lines if you like:" +msgstr "" +"No es necesario que una directiva ocupe una sola línea, si lo desea puede " +"ocupar varias líneas:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!directive foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" +msgstr "" +"\t\\[[!directive foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" + +#. type: Plain text +msgid "" +"Also, multiple lines of *quoted* text can be used for a value. To allow " +"quote marks inside the quoted text, delimit the block of text with triple-" +"quotes:" +msgstr "" +"Además, se pueden usar múltiples líneas de texto *entrecomillado* como valor. Para " +"que se permitan las comillas dentro del texto citado, delimite el bloque de " +"texto con comillas triples:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive text=\"\"\"\n" +msgstr "\t\\[[!directive text=\"\"\"\n" + +#. type: Bullet: ' 1. ' +msgid "\"foo\"" +msgstr "\"foo\"" + +#. type: Bullet: ' 2. ' +msgid "\"bar\"" +msgstr "\"bar\"" + +#. type: Bullet: ' 3. ' +msgid "\"baz\"" +msgstr "\"baz\"" + +#. type: Plain text +msgid "" +"ikiwiki also has an older syntax for directives, which requires a space in " +"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This " +"syntax has several disadvantages: it requires a space after directives with " +"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in " +"[[wikilinks|ikiwiki/wikilink]]. ikiwiki now provides the `!`-prefixed " +"syntax shown above as default. However, ikiwiki still supports wikis using " +"the older syntax, if the `prefix_directives` option is disabled." +msgstr "" +"ikiwiki tiene además una sintaxis más antigua para las directivas, que requiere " +"un espacio en las directivas para distinguirlas de los [[wikilinks|ikiwiki/wikilink]]. " +"Esta sintaxis tiene varias desventajas: requiere un espacio después de las " +"directivas sin parámetros (tales como `\\[[pagecount ]]`), y prohíbe espacios en " +"los [[wikilinks|ikiwiki/wikilink]]. ikiwiki proporciona ahora de manera predeterminada " +"la sintaxis que utiliza el prefijo `!` mostrada arriba. Sin embargo, ikiwiki todavía " +"es compatible con los wikis que utilizan la antigua sintaxis, si se desactiva la " +"opción `prefix_directives`." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +msgid "Here is a list of currently available directives in this wiki:" +msgstr "Ésta es una lista de las directivas actualmente disponibles en este wiki:" + +#. type: Plain text +#, no-wrap +msgid "[[!listdirectives ]]\n" +msgstr "[[!listdirectives ]]\n" diff --git a/po/underlays/basewiki/ikiwiki/formatting.es.po b/po/underlays/basewiki/ikiwiki/formatting.es.po new file mode 100644 index 000000000..e8efac5b5 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/formatting.es.po @@ -0,0 +1,299 @@ +# Spanish translation of basewiki/ikiwiki/formatting page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-26 13:39-0300\n" +"PO-Revision-Date: 2009-08-18 20:20+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"Formatting wiki pages\"]]\n" +msgstr "[[!meta title=\"Aplicación de formato a las páginas wiki\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Text on this wiki is, by default, written in a form very close to how you " +"might write text for an email message. This style of text formatting is " +"called [[MarkDown]], and it works like this:" +msgstr "" +"El texto de este wiki está escrito, de manera predeterminada, en una forma " +"muy parecida a cómo se escribe texto para un mensaje de correo electrónico. " +"Este estilo de asignación de formato al texto se llama [[MarkDown]] y " +"funciona así:" + +#. type: Plain text +msgid "Leave blank lines between paragraphs." +msgstr "Deje líneas vacías entre párrafos." + +#. type: Plain text +#| msgid "" +#| "You can \\**emphasise*\\* or \\*\\***strongly emphasise**\\*\\* text by " +#| "placing it in single or double asterisks." +msgid "" +"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by " +"placing it in single or double asterisks." +msgstr "" +"Puede *\\*resaltar*\\* o **\\*\\*resaltar fuertemente\\*\\*** el texto " +"colocándolo entre asteriscos simples o dobles." + +#. type: Plain text +msgid "To create a list, start each line with an asterisk:" +msgstr "Para crear una lista, inicie cada línea con un asterisco:" + +#. type: Bullet: '* ' +msgid "\"* this is my list\"" +msgstr "\"* Ésta es mi lista\"" + +#. type: Bullet: '* ' +msgid "\"* another item\"" +msgstr "\"* Otro elemento\"" + +#. type: Plain text +msgid "" +"To make a numbered list, start each line with a number (any number will do) " +"followed by a period:" +msgstr "" +"Para hacer una lista numerada, inicie cada línea con un número (cualquier " +"número servirá) seguido de un punto:" + +#. type: Bullet: '1. ' +msgid "\"1. first line\"" +msgstr "\"1. Primera línea\"" + +#. type: Bullet: '2. ' +msgid "\"2. second line\"" +msgstr "\"2. Segunda línea\"" + +#. type: Bullet: '2. ' +msgid "\"2. third line\"" +msgstr "\"2. Tercera línea\"" + +#. type: Plain text +msgid "" +"To create a header, start a line with one or more `#` characters followed by " +"a space and the header text. The number of `#` characters controls the size " +"of the header:" +msgstr "" +"Para crear un título, inicie una línea con uno o más caracteres `#` seguidos " +"de un espacio y el texto del título. El número de caracteres `#` controla el " +"tamaño del título:" + +#. type: Title # +#, no-wrap +msgid "# h1" +msgstr "# h1" + +#. type: Title ## +#, no-wrap +msgid "## h2" +msgstr "## h2" + +#. type: Title ### +#, no-wrap +msgid "### h3" +msgstr "### h3" + +#. type: Title #### +#, no-wrap +msgid "#### h4" +msgstr "#### h4" + +#. type: Title ##### +#, no-wrap +msgid "##### h5" +msgstr "##### h5" + +#. type: Title ###### +#, no-wrap +msgid "###### h6" +msgstr "###### h6" + +#. type: Plain text +msgid "" +"To create a horizontal rule, just write three or more dashes or stars on " +"their own line:" +msgstr "" +"Para crear una línea horizontal, simplemente escriba tres o más guiones o " +"estrellas en su propia línea:" + +#. type: Plain text +#, no-wrap +msgid "To quote someone, prefix the quote with \">\":\n" +msgstr "Para citar a alguien, ponga delante de la cita \">\":\n" + +#. type: Plain text +#, no-wrap +msgid "" +"> To be or not to be,\n" +"> that is the question.\n" +msgstr "" +"> Ser o no ser,\n" +"> ésa es la cuestión.\n" + +#. type: Plain text +msgid "To write a code block, indent each line with a tab or 4 spaces:" +msgstr "" +"Para escribir un bloque de código, sangre cada línea con una tabulación o " +"con 4 espacios:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t10 PRINT \"Hello, world!\"\n" +"\t20 GOTO 10\n" +msgstr "" +"\t10 PRINT \"Hola mundo!\"\n" +"\t20 GOTO 10\n" + +#. type: Plain text +#, no-wrap +msgid "" +"To link to an url or email address, you can just put the\n" +"url in angle brackets: <>, or you can use the\n" +"form \\[link text\\]\\(url\\)\n" +msgstr "" +"Para enlazar a un url o a una dirección de correo electrónico, puede poner simplemente el\n" +"url entre paréntesis angulares: <>, o puede usar la\n" +"forma \\[link text\\]\\(url\\)\n" + +#. type: Plain text +msgid "" +"In addition to basic html formatting using [[MarkDown]], this wiki lets you " +"use the following additional features:" +msgstr "" +"Además de la aplicación de formato html básico utilizando [[MarkDown]], este " +"wiki le permite usar las siguientes características adicionales:" + +#. type: Bullet: '* ' +msgid "" +"To link to another page on the wiki, place the page's name inside double " +"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]." +msgstr "" +"Para enlazar a otra página del wiki, coloque el nombre de la página entre " +"dobles corchetes. Así, puede utilizar `\\[[WikiLink]]` para enlazar a " +"[[WikiLink]]." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Insert [[smileys]] and some other useful symbols. :-)" +msgstr "Inserte [[smileys]] y algunos otros símbolos útiles. :-)" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Use [[shortcuts]] to link to common resources." +msgstr "Use [[atajos|shortcuts]] para enlazar a recursos comunes." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n" +msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "" +"Create and fill out [[templates]] for repeated chunks of parameterized wiki " +"text." +msgstr "" +"Cree y rellene [[plantillas|templates]] para bloques repetidos de texto wiki " +"con parámetros." + +#. type: Plain text +#, no-wrap +msgid "" +"* Insert various [[directives|directive]] onto a page to perform useful\n" +" actions.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n" +msgstr "" +"* Inserte varias [[directivas|directive]] en una página para realizar\n" +" acciones útiles.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " For example, you can:\n" +msgstr " Por ejemplo, puede:\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Add a table of contents to a page:" +msgstr "Añadir una tabla de contenidos a una página:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc]]\n" +msgstr "\t\\[[!toc]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Change the title of a page:" +msgstr "Cambiar el título de una página:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!meta title=\"full page title\"]]\n" +msgstr "\t\\[[!meta title=\"full page title\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Create a blog by inlining a set of pages:" +msgstr "Crear un blog insertando un conjunto de páginas en otra:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"blog/*\"]]\n" +msgstr "\t\\[[!inline pages=\"blog/*\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " Full list of [[directives|directive]] enabled for this wiki:\n" +msgstr " Lista completa de [[directivas|directive]] activadas en este wiki:\n" + +#. type: Plain text +#, no-wrap +msgid " [[!listdirectives ]]\n" +msgstr " [[!listdirectives ]]\n" + diff --git a/po/underlays/basewiki/ikiwiki/markdown.es.po b/po/underlays/basewiki/ikiwiki/markdown.es.po new file mode 100644 index 000000000..daa61328b --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/markdown.es.po @@ -0,0 +1,50 @@ +# Spanish translation of basewiki/ikiwiki/markdown page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-18 20:43+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"[Markdown](http://daringfireball.net/projects/markdown/) is a minimal " +"markup language that resembles plain text as used in email messages. It is " +"the markup language used by this wiki by default." +msgstr "" +"[Markdown](http://daringfireball.net/projects/markdown/) es un lenguaje mínimo " +"de marcado que se parece al texto plano utilizado en los mensajes de correo electrónico. " +"Es el lenguaje de marcado utilizado en este wiki de manera predeterminada." + +#. type: Plain text +msgid "" +"For documentation about the markdown syntax, see [[formatting]] and " +"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)." +msgstr "" +"Si desea consultar documentación sobre la sintaxis de markdown, vea [[Aplicación_de_formato|formatting]] y " +"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)." + +#. type: Plain text +msgid "" +"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part " +"of the markdown syntax, and are the only bit of markup that this wiki " +"handles internally." +msgstr "" +"Tenga en cuenta que los [[WikiLinks|WikiLink]] y las [[directivas|directive]] no son " +"parte de la sintaxis de markdown, y son los únicos elementos de marcado " +"que este wiki maneja internamente." + diff --git a/po/underlays/basewiki/ikiwiki/openid.es.po b/po/underlays/basewiki/ikiwiki/openid.es.po new file mode 100644 index 000000000..4a2f19d60 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/openid.es.po @@ -0,0 +1,117 @@ +# Spanish translation of basewiki/ikiwiki/openid page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-19 18:53+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"OpenID\"]]\n" +msgstr "[[!meta title=\"OpenID\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"This wiki has OpenID **enabled**.\"\n" +" else=\"This wiki has OpenID **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"Este wiki tiene OpenID **activado**.\"\n" +" else=\"Este wiki tiene OpenID **desactivado**.\"]]\n" + +#. type: Plain text +msgid "" +"[OpenID](http://openid.net) is a decentralized authentication mechanism that " +"allows you to have one login that you can use on a growing number of " +"websites." +msgstr "" +"[OpenID](http://openid.net) es un mecanismo descentralizado de identificación que " +"le permite tener un acceso («login») que puede usar en un número creciente de " +"sitios web." + +#. type: Plain text +msgid "To sign up for an OpenID, visit one of the following identity providers:" +msgstr "Para solicitar un OpenID, visite a alguno de los proveedores de identidad siguientes:" + +#. type: Bullet: '* ' +msgid "[MyOpenID](https://www.myopenid.com/)" +msgstr "[MyOpenID](https://www.myopenid.com/)" + +#. type: Bullet: '* ' +msgid "[GetOpenID](https://getopenid.com/)" +msgstr "[GetOpenID](https://getopenid.com/)" + +#. type: Bullet: '* ' +msgid "[Videntity](http://videntity.org/)" +msgstr "[Videntity](http://videntity.org/)" + +#. type: Bullet: '* ' +msgid "[LiveJournal](http://www.livejournal.com/openid/)" +msgstr "[LiveJournal](http://www.livejournal.com/openid/)" + +#. type: Bullet: '* ' +msgid "[TrustBearer](https://openid.trustbearer.com/)" +msgstr "[TrustBearer](https://openid.trustbearer.com/)" + +#. type: Bullet: '* ' +msgid "" +"or any of the [many others out there](http://openiddirectory.com/openid-" +"providers-c-1.html)" +msgstr "" +"o cualquier de los [muchos otros que existen](http://openiddirectory.com/openid-" +"providers-c-1.html)" + +#. type: Plain text +#, no-wrap +msgid "" +"Your OpenID is the URL that you are given when you sign up.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" +msgstr "" +"Su OpenID es el URL que se le proporciona al registrarse.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" + +#. type: Plain text +msgid "" +"To sign in to this wiki using OpenID, just enter it in the OpenID field in " +"the signin form. You do not need to give this wiki a password or go through " +"any registration process when using OpenID." +msgstr "" +"Para identificarse en este wiki usando OpenID, simplemente introdúzcalo en el " +"Campo OpenID del formulario de identificación. Si usa OpenID, no es necesario " +"que proporcione ninguna contraseña a este wiki, ni que realice ningún proceso " +"de registro." + +#. type: Plain text +msgid "" +"It's also possible to make a page in the wiki usable as an OpenID url, by " +"delegating it to an openid server. Here's an example of how to do that:" +msgstr "" +"También es posible hacer una página del wiki utilizable como un url OpenID, " +"asignándolo a un servidor openid. Éste es un ejemplo de cómo hacerlo:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" +msgstr "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" + diff --git a/po/underlays/basewiki/ikiwiki/pagespec.es.po b/po/underlays/basewiki/ikiwiki/pagespec.es.po new file mode 100644 index 000000000..124e3333c --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec.es.po @@ -0,0 +1,251 @@ +# Spanish translation of basewiki/ikiwiki/pagespec page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-23 21:00+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"To select a set of pages, such as pages that are locked, pages whose commit " +"emails you want subscribe to, or pages to combine into a blog, the wiki uses " +"a PageSpec. This is an expression that matches a set of pages." +msgstr "" +"Para seleccionar un conjunto de páginas, como páginas que están bloqueadas, " +"páginas a cuyo envío de correo electrónico quiere suscribirse, o páginas para combinar " +"en un blog, el wiki utiliza una PageSpec. Ésta consiste en una expresión que se " +"corresponde con un conjunto de páginas." + +#. type: Plain text +msgid "" +"The simplest PageSpec is a simple list of pages. For example, this matches " +"any of the three listed pages:" +msgstr "" +"La PageSpec más simple es una lista simple de páginas. Por ejemplo, ésta se " +"corresponde con cualquiera de las tres páginas listadas:" + +#. type: Plain text +#, no-wrap +msgid "\tfoo or bar or baz\n" +msgstr "\tfoo or bar or baz\n" + +#. type: Plain text +msgid "" +"More often you will want to match any pages that have a particular thing in " +"their name. You can do this using a glob pattern. \"`*`\" stands for any " +"part of a page name, and \"`?`\" for any single letter of a page name. So " +"this matches all pages about music, and any [[SubPage]]s of the SandBox, but " +"does not match the SandBox itself:" +msgstr "" +"A menudo querrá seleccionar cualquier página que tenga alguna particularidad " +"en su nombre. Puede hacerlo utilizando un patrón «glob». \"`*`\" representa cualquier " +"parte del nombre de una página, y \"`?`\" cualquier letra del nombre de una página. " +"Así, esto se corresponde con todas las páginas sobre música, y cualquier [[subpágina|SubPage]] " +"de la [[zona de pruebas («SandBox»)|SandBox]], pero no con la zona de pruebas («SandBox») misma:" + +#. type: Plain text +#, no-wrap +msgid "\t*music* or SandBox/*\n" +msgstr "\t*music* or SandBox/*\n" + +#. type: Plain text +msgid "" +"You can also prefix an item with \"`!`\" to skip pages that match it. So to " +"match all pages except for Discussion pages and the SandBox:" +msgstr "" +"También puede utilizar \"`!`\" delante de un elemento para que no se incluyan " +"las páginas que se correspondan con ese elemento. Así, para seleccionar todas " +"las páginas excepto las de Discusión y la Zona de pruebas («SandBox»):" + +#. type: Bullet: ' * ' +msgid "and !SandBox and !*/Discussion" +msgstr "and !SandBox and !*/Discussion" + +#. type: Plain text +msgid "" +"Some more elaborate limits can be added to what matches using these " +"functions:" +msgstr "" +"Se pueden añadir límites más elaborados para seleccionar páginas utilizando " +"estas funciones:" + +#. type: Bullet: '* ' +msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)" +msgstr "" +"\"`link(page)`\" - selecciona solamente páginas que enlazan a una determiada " +"página (o patrón «glob»)" + +#. type: Bullet: '* ' +msgid "" +"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag " +"(or tags matched by a glob)" +msgstr "" +"\"`tagged(tag)`\" - selecciona páginas que están etiquetadas con o enlazadas " +"a la etiqueta dada (o etiquetas que se corresponden con un patrón «glob»)" + +#. type: Bullet: '* ' +msgid "\"`backlink(page)`\" - matches only pages that a given page links to" +msgstr "" +"\"`backlink(page)`\" - selecciona solamente páginas a las que enlaza una " +"página determinada" + +#. type: Bullet: '* ' +msgid "\"`creation_month(month)`\" - matches only pages created on the given month" +msgstr "\"`creation_month(month)`\" - selecciona solamente páginas creadas en el mes dado" + +#. type: Bullet: '* ' +msgid "\"`creation_day(mday)`\" - or day of the month" +msgstr "\"`creation_day(mday)`\" - o en el día del mes" + +#. type: Bullet: '* ' +msgid "\"`creation_year(year)`\" - or year" +msgstr "\"`creation_year(year)`\" - o en el año" + +#. type: Bullet: '* ' +msgid "" +"\"`created_after(page)`\" - matches only pages created after the given page " +"was created" +msgstr "" +"\"`created_after(page)`\" - selecciona solamente páginas creadas después de que la " +"página dada fuera creada" + +#. type: Bullet: '* ' +msgid "" +"\"`created_before(page)`\" - matches only pages created before the given " +"page was created" +msgstr "" +"\"`created_before(page)`\" - selecciona solamente páginas creadas antes de que la " +"página dada fuera creada" + +#. type: Bullet: '* ' +msgid "" +"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing " +"the glob by itself is actually a shorthand for this function." +msgstr "" +"\"`glob(someglob)`\" - selecciona solamente páginas que se corresponden con el «glob» " +"dado. Escribir simplemente el «glob» mismo es una abreviatura para esta función." + +#. type: Bullet: '* ' +msgid "" +"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages " +"that globs do not usually match." +msgstr "" +"\"`internal(glob)`\" - como `glob()`, pero selecciona incluso páginas de uso " +"interno, que los «globs» normalmente no seleccionan." + +#. type: Bullet: '* ' +msgid "" +"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license" +"(glob)`\", \"`copyright(glob)`\" - match pages that have the given metadata, " +"matching the specified glob." +msgstr "" +"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", \"`license" +"(glob)`\", \"`copyright(glob)`\" - seleccionan páginas que contienen los metadatos " +"dados, que se corresponden con el «glob» especificado." + +#. type: Bullet: '* ' +msgid "" +"\"`user(username)`\" - tests whether a modification is being made by a user " +"with the specified username. If openid is enabled, an openid can also be put " +"here." +msgstr "" +"\"`user(username)`\" - comprueba si se está haciendo una modificación por un " +"usuario con el nombre de usuario especificado. Si openid está habilitado, también " +"se puede usar aquí un openid." + +#. type: Bullet: '* ' +msgid "" +"\"`admin()`\" - tests whether a modification is being made by one of the " +"wiki admins." +msgstr "" +"\"`admin()`\" - comprueba si se está haciendo una modificación por uno de " +"los administradores del wiki." + +#. type: Bullet: '* ' +msgid "" +"\"`ip(address)`\" - tests whether a modification is being made from the " +"specified IP address." +msgstr "" +"\"`ip(address)`\" - comprueba si se está haciendo una modificación desde " +"la dirección IP especificada." + +#. type: Bullet: '* ' +msgid "" +"\"`postcomment(glob)`\" - matches only when comments are being posted to a " +"page matching the specified glob" +msgstr "" +"\"`postcomment(glob)`\" - selecciona solamente cuando se están poniendo comentarios " +"a una página que se corresponde con el «glob» especificado" + +#. type: Plain text +msgid "" +"For example, to match all pages in a blog that link to the page about music " +"and were written in 2005:" +msgstr "" +"Por ejemplo, para seleccionar todas las páginas de un blog que enlazan a la página " +"sobre música y que fueron escritas en 2005:" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and link(music) and creation_year(2005)\n" +msgstr "\tblog/* and link(música) and creation_year(2005)\n" + +#. type: Plain text +msgid "" +"Note the use of \"and\" in the above example, that means that only pages " +"that match each of the three expressions match the whole. Use \"and\" when " +"you want to combine expression like that; \"or\" when it's enough for a page " +"to match one expression. Note that it doesn't make sense to say \"index and " +"SandBox\", since no page can match both expressions." +msgstr "" +"Fíjese en el uso de \"and\" en el ejemplo anterior, que significa que sólo son seleccionadas " +"las páginas que se corresponden con cada una de las tres expresiones. Utilice \"and\" " +"cuando quiera combinar una expresión como ésa; utilice \"or\" cuando sea suficiente que una " +"página se corresponda con una de las expresiones. Fíjese en que no tiene sentido decir " +"\"index and SandBox\", puesto que ninguna página puede corresponderse con ambas " +"expresiones." + +#. type: Plain text +msgid "" +"More complex expressions can also be created, by using parentheses for " +"grouping. For example, to match pages in a blog that are tagged with either " +"of two tags, use:" +msgstr "" +"También se pueden crear expresiones más complejas, utilizando paréntesis para " +"agruparlas. Por ejemplo, para seleccionar páginas de un blog que están etiquetadas " +"con alguna de dos etiquetas, utilice:" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and (tagged(foo) or tagged(bar))\n" +msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n" + +#. type: Plain text +msgid "" +"Note that page names in PageSpecs are matched against the absolute filenames " +"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will " +"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the " +"directory of the page containing the pagespec, you can use \"./\". For " +"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"." +msgstr "" +"Tenga en cuenta que los nombres de página en las PageSpecs se seleccionan según los " +"nombre de archivo absolutos de las páginas del wiki, de tal modo que una «pagespec» " +"\"foo\" utilizada en la página \"a/b\" no seleccionará una página llamada \"a/foo\" o \"a/b/foo\". " +"Para seleccionar de manera relativa al directorio de la página que contiene la «pagespec», " +"puede utilizar \"./\". Por ejemplo, \"./foo\" en la página \"a/b\" selecciona la página \"a/foo\"." + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po new file mode 100644 index 000000000..201d87937 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.es.po @@ -0,0 +1,119 @@ +# Spanish translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-09-03 13:21+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"This wiki has attachments **enabled**.\"\n" +" else=\"This wiki has attachments **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"Este wiki tiene los archivos adjuntos **activados**.\"\n" +" else=\"Este wiki tiene los archivos adjuntos **desactivados**.\"]]\n" + +#. type: Plain text +msgid "" +"If attachments are enabled, the wiki admin can control what types of " +"attachments will be accepted, via the `allowed_attachments` configuration " +"setting." +msgstr "" +"Si los archivos adjuntos están activados, el administrador del wiki puede controlar " +"qué tipos de archivos adjuntos serán aceptados a través de la opción de configuración " +"`allowed_attachments`." + +#. type: Plain text +msgid "" +"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 " +"files to be uploaded by joey into a specific directory, and check all " +"attachments for viruses, something like this could be used:" +msgstr "" +"Por ejemplo, para limitar cualquier archivo a 50 kilobytes, pero permitir que " +"joey envíe archivos mp3 más grandes a un directorio específico, y comprobar " +"todos los archivos adjuntos en busca de virus, se podría utilizar algo como lo " +"siguiente:" + +#. type: Plain text +#, no-wrap +msgid "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" +msgstr "\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" + +#. type: Plain text +msgid "" +"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following " +"additional tests:" +msgstr "" +"La sintaxis normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales " +"siguientes:" + +#. type: Bullet: '* ' +msgid "" +"\"`maxsize(size)`\" - tests whether the attachment is no larger than the " +"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", \"gb" +"\" etc can be used to specify the units." +msgstr "" +"\"`maxsize(tamaño)`\" - comprueba que el archivo adjunto no sea más grande " +"que el tamaño especificado. De manera predeterminada el tamaño se expresa " +"en bytes, pero se puede utilizar «kb», «mb», «gb», etc., para especificar las " +"unidades." + +#. type: Bullet: '* ' +msgid "" +"\"`minsize(size)`\" - tests whether the attachment is no smaller than the " +"specified size." +msgstr "" +"\"`minsize(tamaño)`\" - comprueba que el archivo adjunto no sea más pequeño que " +"el tamaño especificado." + +#. type: Bullet: '* ' +msgid "" +"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as " +"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other " +"enabled page format)." +msgstr "" +"\"`ispage()`\" - comprueba si el archivo adjunto será tratado por ikiwiki como una " +"página wiki. (Es decir, si tiene una extensión \".mdwn\", o la de cualquier otro " +"formato de página activado)." + +#. type: Plain text +#, no-wrap +msgid "" +" So, if you don't want to allow wiki pages to be uploaded as attachments,\n" +" use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n" +" as attachments, use `ispage()`.\n" +msgstr "" +" Así, si no quiere permitir que se envíen páginas wiki como archivos adjuntos,\n" +" utilice `!ispage()` ; si sólo quiere permitir el envío de páginas wiki como \n" +" archivos adjuntos, utilice `ispage()`.\n" + +#. type: Bullet: '* ' +msgid "" +"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can " +"include a glob in the type, for example `mimetype(image/*)`." +msgstr "" +"\"`mimetype(foo/bar)`\" - comprueba el tipo MIME del archivo adjunto. Puede incluir " +"un «glob» en el tipo, por ejemplo `mimetype(image/*)`." + +#. type: Bullet: '* ' +msgid "\"`virusfree()`\" - checks the attachment with an antiviral program." +msgstr "\"`virusfree()`\" - comprueba el archivo adjunto con un programa antivirus." + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.es.po b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po new file mode 100644 index 000000000..3a9d8d4a1 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/po.es.po @@ -0,0 +1,64 @@ +# Spanish translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-09-03 13:48+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(po)\"\n" +" then=\"This wiki has po support **enabled**.\"\n" +" else=\"This wiki has po support **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(po)\"\n" +" then=\"Este wiki tiene **activada** la compatibilidad con po.\"\n" +" else=\"Este wiki tiene **desactivada** la compatibilidad con po.\"]]\n" + +#. type: Plain text +msgid "" +"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular [[ikiwiki/" +"PageSpec]] syntax is expanded with the following additional tests that can " +"be used to improve user navigation in a multi-lingual wiki:" +msgstr "" +"Si el complemento («plugin») [[!iki plugins/po desc=po]] está activado, la sintaxis " +"normal de [[ikiwiki/PageSpec]] se amplía con las comprobaciones adicionales " +"siguientes, que se pueden utilizar para mejorar la navegación del usuario en " +"un wiki multilingüe:" + +#. type: Bullet: '* ' +msgid "" +"\"`lang(LL)`\" - tests whether a page is written in the language specified " +"as a ISO639-1 (two-letter) language code." +msgstr "" +"\"`lang(LL)`\" - comprueba si una página está escrita en el idioma especificado según " +"el código ISO639-1 (dos letras)." + +#. type: Bullet: '* ' +msgid "" +"\"`currentlang()`\" - tests whether a page is written in the same language " +"as the current page." +msgstr "" +"\"`currentlang()`\" - comprueba si una página está escrita en el mismo idioma " +"que la página actual." + +#. type: Plain text +msgid "" +"Note that every non-po page is considered to be written in " +"`po_master_language`, as specified in `ikiwiki.setup`." +msgstr "" +"Tenga en cuenta que se considera que cualquier página que no " +"sea de tipo «po» está escrita en `po_master_language`, según " +"se especifica en `ikiwiki.setup`." + diff --git a/po/underlays/basewiki/ikiwiki/searching.es.po b/po/underlays/basewiki/ikiwiki/searching.es.po new file mode 100644 index 000000000..7ab8cdca3 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/searching.es.po @@ -0,0 +1,84 @@ +# Spanish translation of basewiki/searching page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# First translation by Oscar Jacho +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: searching\n" +"POT-Creation-Date: 2009-08-26 13:39-0300\n" +"PO-Revision-Date: 2009-12-06 18:16+0100\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: none\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(search)\"\n" +"then=\"This wiki has searching **enabled**.\"\n" +"else=\"This wiki has searching **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(search)\"\n" +"then=\"Este wiki tiene la búsqueda **habilitada**.\"\n" +"else=\"Este wiki tiene la búsqueda **deshabilitada**.\"]]\n" + +#. type: Plain text +msgid "" +"If searching is enabled, you can enter search terms in the search field, as " +"you'd expect. There are a few special things you can do to construct more " +"powerful searches." +msgstr "" +"Si la búsqueda está habilitada, puede introducir el texto a buscar en el campo de búsqueda, tal " +"y como cabría esperar. Hay además algunas reglas que puede usar para construir búsquedas más " +"sofisticadas." + +#. type: Bullet: '* ' +msgid "To match a phrase, enclose it in double quotes." +msgstr "Para buscar una frase exacta, pongala entre comillas dobles." + +#. type: Bullet: '* ' +msgid "`AND` can be used to search for documents containing two expressions." +msgstr "`AND` se puede usar para buscar documentos que contengan dos expresiones." + +#. type: Bullet: '* ' +msgid "" +"`OR` can be used to search for documents containing either one of two " +"expressions." +msgstr "" +"`OR` se puede usar para buscar documentos que contengan cualquiera de las dos " +"expresiones." + +#. type: Bullet: '* ' +msgid "" +"Parentheses can be used to build up complicated search expressions. For " +"example, \"(foo AND bar) OR (me AND you)\"" +msgstr "" +"Los paréntesis se pueden usar para construir expresiones de búsqueda más complicadas. Por " +"ejemplo, \"(foo AND bar) OR (me AND you)\"" + +#. type: Bullet: '* ' +msgid "" +"Prefix a search term with \"-\" to avoid it from appearing in the results. " +"For example, \"-discussion\" will omit \"discussion\"." +msgstr "" +"Ponga \"-\" antes de un término de búsqueda para evitar que aparezca en los resultados. " +"Por ejemplo, \"-discussion\" omitirá \"discussion\"." + +#. type: Bullet: '* ' +msgid "To search for a page with a given title, use \"title:foo\"." +msgstr "Para buscar una página con un determinado título, use \"title:foo\"." + +#. type: Bullet: '* ' +msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"." +msgstr "Para buscar páginas que contengan un enlace a \"bar\", use \"link:bar\"." + diff --git a/po/underlays/basewiki/ikiwiki/subpage.es.po b/po/underlays/basewiki/ikiwiki/subpage.es.po new file mode 100644 index 000000000..0b0c8453e --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage.es.po @@ -0,0 +1,51 @@ +# Spanish translation of basewiki/ikiwiki/subpage page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-09-03 18:21+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"ikiwiki supports placing pages in a directory hierarchy. For example, this " +"page, [[SubPage]] has some related pages placed under it, like [[SubPage/" +"LinkingRules]]. This is a useful way to add some order to your wiki rather " +"than just having a great big directory full of pages." +msgstr "" +"ikiwiki permite colocar páginas en una jerarquía de directorios. Por ejemplo, bajo " +"esta página, [[SubPage]] («subpágina»), hay algunas páginas relacionadas, como [[SubPage/LinkingRules]]. Ésta es una manera práctica de poner un poco de orden " +"en el wiki, en lugar de tener simplemente un gran directorio lleno de páginas." + +#. type: Plain text +msgid "" +"To add a SubPage, just make a subdirectory and put pages in it. For example, " +"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage " +"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be " +"nested as deeply as you'd like." +msgstr "" +"Para añadir una subpágina, simplemente cree un subdirectorio y ponga páginas en " +"él. Por ejemplo, esta página es «SubPage.mdwn» en las fuentes del wiki, y hay además " +"un directorio «SubPage», que contiene «SubPage/LinkingRules.mdwn». Las subpáginas " +"pueden anidarse tanto como desee." + +#. type: Plain text +msgid "Linking to and from a SubPage is explained in [[LinkingRules]]." +msgstr "" +"La creación de un enlace a y desde una subpágina se explica en [[LinkingRules]] " +"(Reglas para la creación de enlaces)." + diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po new file mode 100644 index 000000000..f81291fa9 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.es.po @@ -0,0 +1,102 @@ +# Spanish translation of basewiki/ikiwiki/subpage/linkingrules page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-09-03 19:47+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"To link to or from a [[SubPage]], you can normally use a regular " +"[[WikiLink]] that does not contain the name of the parent directory of the " +"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page " +"that matches your link." +msgstr "" +"Para crear un enlace a o desde una [[subpágina|SubPage]], usualmente " +"puede usar un [[WikiLink]] normal que no contenga el nombre del directorio " +"superior de la [[subpágina|SubPage]]. Ikiwiki desciende por la jerarquía de " +"directorios buscando una página que se corresponda con su enlace." + +#. type: Plain text +msgid "" +"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first " +"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to " +"FooBar/OtherPage and finally to OtherPage in the root of the wiki." +msgstr "" +"Por ejemplo, si «FooBar/SubPagina» enlaza a «OtraPagina», ikiwiki preferirá primero " +"dirigir el enlace a «FooBar/SubPagina/OtraPagina» si existe, a continuación a «FooBar/OtraPagina», " +"y finalmente a «OtraPagina» en el directorio raíz del wiki." + +#. type: Plain text +msgid "" +"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" " +"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage " +"is created, the link will _change_ to point to FooBar/OtherPage. On the " +"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this " +"creation of a [[SubPage]] of FooBar." +msgstr "" +"Tenga en cuenta que esto significa que si un enlace en «FooBar/AlgunaPagina» " +"a «OtraPagina» enlaza actualmente a «OtraPagina» en el directorio raíz del wiki, " +"y se crea «FooBar/OtraPagina», el enlace _cambiará_ para dirigir a «FooBar/OtraPagina». " +"Por otra parte, un enlace desde «BazBar» a «OtraPagina» no cambiará por esta creación " +"de una [[subpágina|SubPage]] de «FooBar»." + +#. type: Plain text +msgid "" +"You can also specify a link that contains a directory name, like \"FooBar/" +"OtherPage\" to more exactly specify what page to link to. This is the only " +"way to link to an unrelated [[SubPage]]." +msgstr "" +"También puede especificar un enlace que contenga un nombre de directorio, como " +"«FooBar/OtraPagina» para especificar con más exactitud a qué página enlazar. Ésta es " +"la única manera de enlazar a una [[subpágina|SubPage]] no relacionada." + +#. type: Plain text +msgid "" +"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", " +"or from BazBar/SubPage to \"FooBar/SubPage\"." +msgstr "" +"Puede utilizar esto, por ejemplo, para enlazar desde «BazBar» a «FooBar/SubPagina», " +"o desde «BazBar/SubPagina» a «FooBar/SubPagina»." + +#. type: Plain text +msgid "" +"You can also use \"/\" at the start of a link, to specify exactly which page " +"to link to, when there are multiple pages with similar names and the link " +"goes to the wrong page by default. For example, linking from \"FooBar/SubPage" +"\" to \"/OtherPage\" will link to the \"OtherPage\" in the root of the wiki, " +"even if there is a \"FooBar/OtherPage\"." +msgstr "" +"También puede utilizar «/» al principio de un enlace, para especificar exactamente " +"a qué página enlazar, cuando existen múltiples páginas con nombres similares y " +"el enlace conduce a la página equivocada de manera predeterminada. Por ejemplo, " +"crear un enlace desde «FooBar/SubPagina» a «/OtraPagina» conducirá a la «OtraPagina» " +"del directorio raíz del wiki, incluso aunque haya una «FooBar/OtraPagina»." + +#. type: Plain text +msgid "" +"Also, if the wiki is configured with a userdir, you can link to pages within " +"the userdir without specifying a path to them. This is to allow for easy " +"linking to a user's page in the userdir, to sign a comment. These links are " +"checked for last of all." +msgstr "" +"Además, si el wiki está configurado con un directorio «userdir», puede enlazar a " +"páginas dentro del «userdir» sin especificar una ruta hasta ellas. Esto ocurre para " +"permitir la creación sencilla de enlaces a la página de un usuario en el «userdir», " +"para firmar un comentario. Estos enlaces se comprueban en último lugar." + diff --git a/po/underlays/basewiki/ikiwiki/wikilink.es.po b/po/underlays/basewiki/ikiwiki/wikilink.es.po new file mode 100644 index 000000000..252bc9984 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/wikilink.es.po @@ -0,0 +1,107 @@ +# Spanish translation of basewiki/ikiwiki/wikilink page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: wikilink\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-12-06 17:57+0100\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: none\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"WikiLinks provide easy linking between pages of the wiki. To create a " +"[[WikiLink]], just put the name of the page to link to in double brackets. " +"For example `\\[[WikiLink]]`." +msgstr "" +"Los WikiLinks proporcionan enlaces fáciles entre páginas del wiki. Para crear un " +"[[WikiLink]], ponga simplemente el nombre de la página a enlazar entre corchetes " +"dobles. Por ejemplo, `\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"If you ever need to write something like `\\[[WikiLink]]` without creating a " +"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`." +msgstr "" +"Si necesita crea algo como `\\[[WikiLink]]` sin crear un link wiki, simplemente añada " +"`\\` como prefijo, de la siguiente manera: `\\\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"There are some special [[SubPage/LinkingRules]] that come into play when " +"linking between [[SubPages|SubPage]]." +msgstr "" +"Hay algunas [[Reglas para la creación de enlaces|SubPage/LinkingRules]] especiales " +"que entran en juego al enlazar [[Subpáginas|SubPage]]." + +#. type: Plain text +msgid "" +"Also, if the file linked to by a WikiLink looks like an image, it will be " +"displayed inline on the page." +msgstr "" +"Además, si el archivo enlazado por un WikiLink parece una imagen, se mostrará " +"como parte de la página." + +#. type: Plain text +msgid "" +"WikiLinks are matched with page names in a case-insensitive manner, so you " +"don't need to worry about getting the case the same, and can capitalise " +"links at the start of a sentence, and so on." +msgstr "" +"Los WikiLinks se corresponden con nombres de página sin tener en cuenta si se " +"usan letras mayúsculas o minúsculas, así que no tiene que preocuparse por esto, y " +"puede por ejemplo utilizar mayúsculas en un enlace si se encuentra al principio de una frase." + +#. type: Plain text +msgid "" +"It's also possible to write a WikiLink that uses something other than the " +"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the " +"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]." +msgstr "" +"También es posible escribir un WikiLink que use otra cosa en lugar del nombre de la " +"página como texto del enlace. Por ejemplo `\\[[foo_bar|SandBox]]` enlaza a la página " +"de la zona de pruebas («SandBox»), pero el enlace aparece así: [[foo_bar|SandBox]]." + +#. type: Plain text +msgid "" +"To link to an anchor inside a page, you can use something like `" +"\\[[WikiLink#foo]]` ." +msgstr "" +"Para enlazar a un punto («anchor») dentro de una página, puede utilizar algo " +"como `\\[[WikiLink#foo]]` ." + +#. type: Title ## +#, no-wrap +msgid "Directives and WikiLinks" +msgstr "Directivas y WikiLinks" + +#. type: Plain text +msgid "" +"ikiwiki has two syntaxes for [[directives|directive]]. The older syntax " +"used spaces to distinguish between directives and wikilinks; as a result, " +"with that syntax in use, you cannot use spaces in WikiLinks, and must " +"replace spaces with underscores. The newer syntax, enabled with the " +"`prefix_directives` option in an ikiwiki setup file, prefixes directives " +"with `!`, and thus does not prevent links with spaces. Future versions of " +"ikiwiki will turn this option on by default." +msgstr "" +"ikiwiki tiene dos sintaxis para las [[directivas|directive]]. La sintaxis antigua " +"utilizaba espacios para distinguir entre directivas y wikilinks; como resultado, " +"al utilizar esa sintaxis, no podía utilizar espacios en los WikiLinks, y debía reemplazar " +"los espacios con guiones bajos. La nueva sintaxis, activada con la opción `prefix_directives` " +"en un archivo de configuración de ikiwiki, añade a las directivas el prefijo `!`, y así no " +"impide enlaces con espacios. Futuras versiones de ikiwiki activarán esta opción de " +"manera predeterminada." + diff --git a/po/underlays/basewiki/index.es.po b/po/underlays/basewiki/index.es.po new file mode 100644 index 000000000..548e966e2 --- /dev/null +++ b/po/underlays/basewiki/index.es.po @@ -0,0 +1,31 @@ +# Spanish translation of basewiki/index page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-16 21:03+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +msgid "Welcome to your new wiki." +msgstr "Bienvenido a su nuevo wiki." + +#. type: Plain text +msgid "All wikis are supposed to have a [[SandBox]], so this one does too." +msgstr "" +"Se supone que todos los wikis tienen una [[Zona_de_pruebas|SandBox]], " +"así que éste también la tiene." + +#. type: Plain text +msgid "This wiki is powered by [[ikiwiki]]." +msgstr "Este wiki funciona con [[ikiwiki]]." + diff --git a/po/underlays/basewiki/recentchanges.es.po b/po/underlays/basewiki/recentchanges.es.po new file mode 100644 index 000000000..1c5c461ca --- /dev/null +++ b/po/underlays/basewiki/recentchanges.es.po @@ -0,0 +1,40 @@ +# Spanish translation of basewiki/recentchanges page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki \n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-16 22:38+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"RecentChanges\"]]\n" +msgstr "[[!meta title=\"CambiosRecientes\"]]\n" + +#. type: Plain text +msgid "Recent changes to this wiki:" +msgstr "Cambios recientes a este wiki:" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" +msgstr "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" + diff --git a/po/underlays/basewiki/sandbox.es.po b/po/underlays/basewiki/sandbox.es.po new file mode 100644 index 000000000..12bf5347d --- /dev/null +++ b/po/underlays/basewiki/sandbox.es.po @@ -0,0 +1,90 @@ +# Spanish translation of basewiki/sandbox page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:56-0300\n" +"PO-Revision-Date: 2009-08-16 19:15+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki." +msgstr "Esta es la Zona de Pruebas («SandBox»), una página que cualquiera puede editar para aprender a usar el wiki." + +#. type: Plain text +msgid "Here's a paragraph." +msgstr "Aquí podemos ver un párrafo." + +#. type: Plain text +msgid "Here's another one with *emphasised* text." +msgstr "Aquí podemos ver otro con texto *resaltado*." + +#. type: Title # +#, no-wrap +msgid "Header" +msgstr "Título" + +#. type: Title ## +#, no-wrap +msgid "Subheader" +msgstr "Subtítulo" + +#. type: Plain text +#, no-wrap +msgid "" +"> This is a blockquote.\n" +">\n" +"> This is the first level of quoting.\n" +">\n" +"> > This is nested blockquote.\n" +">\n" +"> Back to the first level.\n" +msgstr "" +"> Esto es un bloque de cita. \n" +">\n" +"> Éste es el primer nivel de citación.\n" +">\n" +"> > Esto es un bloque de cita de nivel inferior.\n" +">\n" +"> De vuelta al primer nivel.\n" + +#. type: Plain text +msgid "Numbered list" +msgstr "Lista numerada" + +#. type: Bullet: '1. ' +msgid "First item." +msgstr "Primer elemento." + +#. type: Bullet: '1. ' +msgid "Another." +msgstr "Otro." + +#. type: Bullet: '1. ' +msgid "And another.." +msgstr "Y otro ..." + +#. type: Plain text +msgid "Bulleted list" +msgstr "Lista" + +#. type: Bullet: '* ' +msgid "*item*" +msgstr "*elemento*" + +#. type: Bullet: '* ' +msgid "item" +msgstr "elemento" + +#. type: Plain text +msgid "[[ikiwiki/WikiLink]]" +msgstr "[[ikiwiki/WikiLink]]" + diff --git a/po/underlays/basewiki/shortcuts.es.po b/po/underlays/basewiki/shortcuts.es.po new file mode 100644 index 000000000..8ac3759f5 --- /dev/null +++ b/po/underlays/basewiki/shortcuts.es.po @@ -0,0 +1,233 @@ +# Spanish translation of shortcuts page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-26 13:39-0300\n" +"PO-Revision-Date: 2009-08-17 01:02+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"This wiki has shortcuts **enabled**.\"\n" +" else=\"This wiki has shortcuts **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"Este wiki tiene los atajos **activados**.\"\n" +" else=\"Este wiki tiene los atajos **desactivados**.\"]]\n" + +#. type: Plain text +msgid "Some examples of using shortcuts include:" +msgstr "Algunos ejemplos de uso de los atajos incluyen:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n" +msgstr "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tCompruebe la \\[[!cia ikiwiki desc=\"página de CIA para %s\"]].\n" + +#. type: Plain text +msgid "This page controls what shortcut links the wiki supports." +msgstr "Esta página controla qué atajos de enlace se pueden hacer en el wiki." + +#. type: Bullet: '* ' +msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]" +msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" +msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]" +msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]" +msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" +msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]" +msgstr "[[!shortcut name=debbug url=\"http://bugs.debian.org/%s\" desc=\"bug #%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc=" +"\"debian-%s@lists.debian.org\"]]" +msgstr "" +"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" desc=" +"\"debian-%s@lists.debian.org\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" +msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]" +msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s" +"\"]]" +msgstr "" +"[[!shortcut name=debrt url=\"https://rt.debian.org/Ticket/Display.html?id=%s" +"\"]]" + +#. type: Plain text +#, no-wrap +msgid "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or `\\[[!debss package/version]]`. See http://snapshot.debian.net for details.\n" +"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n" +"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n" +"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n" +"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n" +"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n" +"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n" +"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n" +"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n" +"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n" +"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n" +"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n" +"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n" +"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n" +"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n" +"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n" +"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n" +"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n" +"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n" +"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n" +"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n" +"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n" +"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n" +"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n" +"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n" +"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n" +"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n" +"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n" +"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n" +"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n" +"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n" +"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n" +"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n" +msgstr "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Uso: `\\[[!debss package]]`, `\\[[!debss package#version]]`, o `\\[[!debss package/version]]`. Para más detalles, vea http://snapshot.debian.net .\n" +"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n" +"* [[!shortcut name=fdobug url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" desc=\"freedesktop.org bug #%s\"]]\n" +"* [[!shortcut name=fdolist url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" desc=\"%s@lists.freedesktop.org\"]]\n" +"* [[!shortcut name=gnomebug url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug #%s\"]]\n" +"* [[!shortcut name=linuxbug url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug #%s\"]]\n" +"* [[!shortcut name=mozbug url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug #%s\"]]\n" +"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" desc=\"%s@gnu.org\"]]\n" +"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n" +"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n" +"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" desc=\"gmane.%s\"]]\n" +"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n" +"* [[!shortcut name=cpan url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n" +"* [[!shortcut name=ctan url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n" +"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n" +"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n" +"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n" +"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC %s\"]]\n" +"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n" +"* [[!shortcut name=meatballwiki url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n" +"* [[!shortcut name=emacswiki url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n" +"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n" +"* [[!shortcut name=dict url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n" +"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n" +"* [[!shortcut name=gpg url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n" +"* [[!shortcut name=perldoc url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n" +"* [[!shortcut name=whois url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n" +"* [[!shortcut name=cve url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n" +"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n" +"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n" +"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n" +"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n" +"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n" + +#. type: Plain text +#| msgid "" +#| "To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the " +#| "url, \"%s\" is replaced with the text passed to the named shortcut, after " +#| "url-encoding it, and '%S' is replaced with the raw, non-encoded text. The " +#| "optional `desc` parameter controls the description of the link." +msgid "" +"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, " +"\"%s\" is replaced with the text passed to the named shortcut, after [[!" +"wikipedia url_encoding]] it, and '%S' is replaced with the raw, non-encoded " +"text. The optional `desc` parameter controls the description of the link." +msgstr "" +"Para añadir un nuevo atajo, utilice la [[directiva|ikiwiki/directive]] " +"`shortcut`. En el url, «%s» se reemplaza con el texto que se pasa al atajo " +"nombrado, después de codificarlo mediante el [[!wikipedia url_encoding]], y «%S» se " +"reemplaza con el texto en bruto, no codificado. El parámetro opcional `desc` " +"controla la descripción del enlace." + +#. type: Plain text +msgid "" +"Remember that the `name` you give the shortcut will become a new [[ikiwiki/" +"directive]]. Avoid using a `name` that conflicts with an existing " +"directive. These directives also accept a `desc` parameter that will " +"override the one provided at definition time." +msgstr "" +"Recuerde que el `name` («nombre») que le dé al atajo se convertirá en una " +"nueva [[directiva|ikiwiki/directive]]. Evite utilizar un `name` («nombre») " +"que choque con una directiva que ya exista. Estas directivas también aceptan " +"un parámetro `desc` que anulará la que se proporcione en la definición." + +#. type: Plain text +#| msgid "" +#| "If you come up with a shortcut that you think others might find useful, " +#| "consider contributing it to the [shortcuts page on the ikiwiki ikiwiki]" +#| "(http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will " +#| "include your shortcut in the standard underlay." +msgid "" +"If you come up with a shortcut that you think others might find useful, " +"consider contributing it to the [shortcuts page on the ikiwiki wiki](http://" +"ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include " +"your shortcut in the standard underlay." +msgstr "" +"Si se le ocurre un atajo que crea que puede ser útil para otros, considere " +"aportarlo a la [página de atajos en el wiki ikiwiki](http://ikiwiki.info/" +"shortcuts/), de tal modo que futuras versiones de ikiwiki puedan incluir su " +"atajo en la base estándar." + diff --git a/po/underlays/basewiki/templates.es.po b/po/underlays/basewiki/templates.es.po new file mode 100644 index 000000000..21173d528 --- /dev/null +++ b/po/underlays/basewiki/templates.es.po @@ -0,0 +1,242 @@ +# Spanish translation of templates page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-17 13:22+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(template)\"\n" +"then=\"This wiki has templates **enabled**.\"\n" +"else=\"This wiki has templates **disabled**.\"\n" +"]]\n" +msgstr "" +"[[!if test=\"enabled(template)\"\n" +"then=\"Este wiki tiene las plantillas **activadas**.\"\n" +"else=\"Este wiki tiene las plantillas **desactivadas**.\"\n" +"]]\n" + +#. type: Plain text +msgid "" +"Templates are files that can be filled out and inserted into pages in the " +"wiki." +msgstr "" +"Las plantillas son archivos que se pueden completar e insertar en páginas " +"del wiki." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" + +#. type: Plain text +msgid "These templates are available for inclusion onto other pages in this wiki:" +msgstr "Estas plantillas están disponibles en este wiki para ser incluidas en otras páginas:" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" +msgstr "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" + +#. type: Title ## +#, no-wrap +msgid "Using a template" +msgstr "Uso de una plantilla" + +#. type: Plain text +msgid "Using a template works like this:" +msgstr "El uso de una plantilla es así:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!template id=note text=\"\"\"Here is the text to insert into my note.\"\"\"]]\n" +msgstr "\t\\[[!template id=note text=\"\"\"Éste es el texto que se insertará en mi nota.\"\"\"]]\n" + +#. type: Plain text +msgid "" +"This fills out the [[note]] template, filling in the `text` field with the " +"specified value, and inserts the result into the page." +msgstr "" +"Esto rellena la plantilla [[note]] («nota»), completando el campo `text` " +"(«texto») con el valor especificado, e inserta el resultado en la página." + +#. type: Plain text +msgid "" +"Generally, a value can include any markup that would be allowed in the wiki " +"page outside the template. Triple-quoting the value even allows quotes to be " +"included in it. Combined with multi-line quoted values, this allows for " +"large chunks of marked up text to be embedded into a template:" +msgstr "" +"Por lo general, un valor puede incluir cualquier marcado («markup») permitido " +"en la página wiki fuera de la plantilla. La utilización de comillas triples permite " +"incluso que se incluyan comillas. En combinación con valores entrecomillados " +"en múltiples líneas, esto permite que se incluyan grandes fragmentos de texto " +"marcado en una plantilla:" + +#. type: Plain text +#, no-wrap +msgid " \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n" +msgstr " \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 notes=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "\\[[Charley]]'s sister." +msgstr "Hermana de \\[[Charley]]." + +#. type: Bullet: ' * ' +msgid "\"I want to be an astronaut when I grow up.\"" +msgstr "\"Quiero ser astronauta cuando crezca.\"" + +#. type: Bullet: ' * ' +msgid "Really 8 and a half." +msgstr "8 y medio en realidad." + +#. type: Title ## +#, no-wrap +msgid "Creating a template" +msgstr "Creación de una plantilla" + +#. type: Plain text +msgid "" +"To create a template, simply add a template directive to a page, and the " +"page will provide a link that can be used to create the template. The " +"template is a regular wiki page, located in the `templates/` subdirectory " +"inside the source directory of the wiki." +msgstr "" +"Para crear una plantilla, simplemente añada una directiva de plantilla a una " +"página, y ésta proporcionará un enlace que puede utilizarse para crear la " +"plantilla. La plantilla es una página wiki normal, situada en el subdirectorio " +"`templates/` dentro del directorio fuente del wiki." + +#. type: Plain text +msgid "" +"The template uses the syntax used by the [[!cpan HTML::Template]] perl " +"module, which allows for some fairly complex things to be done. Consult its " +"documentation for the full syntax, but all you really need to know are a few " +"things:" +msgstr "" +"La plantilla utiliza la sintaxis usada por el módulo perl [[!cpan HTML::Template]], " +"que permite hacer algunas cosas bastante complejas. Consulte su documentación " +"para ver la sintaxis completa, pero todo lo que realmente necesita saber son unas " +"pocas cosas:" + +#. type: Bullet: '* ' +msgid "" +"Each parameter you pass to the template directive will generate a template " +"variable. There are also some pre-defined variables like PAGE and BASENAME." +msgstr "" +"Cada parámetro que pase a la directiva de plantilla generará una variable de " +"plantilla. También existen algunas variables predefinidas como PAGE y BASENAME." + +#. type: Bullet: '* ' +msgid "" +"To insert the value of a variable, use ``. Wiki markup in " +"the value will first be converted to html." +msgstr "" +"Para introducir el valor de una variable, utilice ``. El marcado " +"(«markup») wiki en el valor será convertido primero a html." + +#. type: Bullet: '* ' +msgid "" +"To insert the raw value of a variable, with wiki markup not yet converted to " +"html, use ``." +msgstr "" +"Para insertar el valor sin procesar de una variable, con el marcado wiki no " +"convertido todavía a html, utilice ``." + +#. type: Bullet: '* ' +msgid "" +"To make a block of text conditional on a variable being set use `text`." +msgstr "" +"Para que un bloque de texto dependa de que una variable haya sido establecida, " +"utilice `texto`." + +#. type: Bullet: '* ' +msgid "" +"To use one block of text if a variable is set and a second if it's not, use " +"`textother text`" +msgstr "" +"Para utilizar un bloque de texto si se ha establecido una variable, y otro texto " +"si no se ha establecido, utilice " +"`textootro texto`" + +#. type: Plain text +msgid "Here's a sample template:" +msgstr "Esto es una plantilla de ejemplo:" + +#. type: Plain text +#, no-wrap +msgid "" +" \n" +" Name: \\[[]]
    \n" +" Age:
    \n" +" \n" +" Favorite color:
    \n" +" \n" +" No favorite color.
    \n" +"
    \n" +" \n" +"
    \n" +" \n" +"
    \n" +"
    \n" +msgstr "" +" \n" +" Nombre: \\[[]]
    \n" +" Edad:
    \n" +" \n" +" Color favorito:
    \n" +" \n" +" Ningún color favorito.
    \n" +"
    \n" +" \n" +"
    \n" +" \n" +"
    \n" +"
    \n" + +#. type: Plain text +msgid "" +"The filled out template will be formatted the same as the rest of the page " +"that contains it, so you can include WikiLinks and all other forms of wiki " +"markup in the template. Note though that such WikiLinks will not show up as " +"backlinks to the page that uses the template." +msgstr "" +"La plantilla rellenada se formateará de la misma manera que el resto de la página " +"que la contiene, así que puede incluir WikiLinks («enlaces wiki») y todas las otras " +"formas de marcado wiki en la plantilla. Sin embargo, tenga en cuenta que estos " +"WikiLinks no aparecerán como «backlinks» a la página que usa la plantilla." + +#. type: Plain text +msgid "" +"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This " +"ensures that if the name contains something that might be mistaken for wiki " +"markup, it's not converted to html before being processed as a [[ikiwiki/" +"WikiLink]]." +msgstr "" +"Tenga en cuenta el uso de «raw_name» dentro del generador de [[ikiwiki/WikiLink]]. " +"Esto asegura que si el nombre contiene algo que pueda ser tomado equivocadamente " +"como marcado wiki, no sea convertido a html antes de ser procesado como un " +"[[ikiwiki/WikiLink]]." + diff --git a/po/underlays/basewiki/templates/note.es.po b/po/underlays/basewiki/templates/note.es.po new file mode 100644 index 000000000..de2c53f5f --- /dev/null +++ b/po/underlays/basewiki/templates/note.es.po @@ -0,0 +1,44 @@ +# Spanish translation of basewiki/templates/note page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-17 13:48+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "" +"
    \n" +"\n" +"
    \n" +"\n" +"Use this template to insert a note into a page. The note will be styled to\n" +"float to the right of other text on the page. This template has one\n" +"parameter:\n" +"
      \n" +"
    • `text` - the text to display in the note\n" +"
    \n" +"
    \n" +msgstr "" +"
    \n" +"\n" +"
    \n" +"\n" +"Use esta plantilla para insertar una nota en una página. La nota se\n" +"configurará para flotar a la derecha de otro texto en la página.\n" +"Esta plantilla tiene un parámetro:\n" +"
      \n" +"
    • `text` - el texto que aparecerá en la nota\n" +"
    \n" +"
    \n" + diff --git a/po/underlays/basewiki/templates/popup.es.po b/po/underlays/basewiki/templates/popup.es.po new file mode 100644 index 000000000..10fddb8c0 --- /dev/null +++ b/po/underlays/basewiki/templates/popup.es.po @@ -0,0 +1,54 @@ +# Spanish translation of basewiki/templates/popup page for ikiwiki. +# Copyright (C) 2009 Free Software Foundation, Inc. +# This file is distributed under the same license as the ikiwiki package. +# Fernando González de Requena , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki\n" +"POT-Creation-Date: 2009-08-15 18:30-0300\n" +"PO-Revision-Date: 2009-08-17 14:06+0200\n" +"Last-Translator: Fernando González de Requena \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\n" +"Use this template to create a popup window that is displayed when the mouse\n" +"is over part of the page. This template has two parameters:\n" +"
      \n" +"
    • `mouseover` - This is the text or other content that triggers the\n" +"popup.\n" +"
    • `popup` - This should be the content of the popup window. It can be\n" +"anything, even images or a whole little wiki page, but should not be too\n" +"large for good usability.\n" +"
    \n" +"Note that browsers that do not support the CSS will display the popup\n" +"inline in the page, inside square brackets.\n" +"
    \n" +"\n" +"[]\n" +"\n" +msgstr "" +"\n" +"Utilice esta plantilla para crear una ventana emergente que se mostrará cuando\n" +"el ratón esté encima de una parte de la página. Esta plantilla tiene dos parámetros:\n" +"
      \n" +"
    • `mouseover` - Éste es el texto, u otro contenido, que activa la ventana\n" +"emergente.\n" +"
    • `popup` - Éste debería ser el contenido de la ventana emergente. Puede ser\n" +"cualquier cosa, incluso imágenes o una pequeña página wiki completa, pero no\n" +"debe ser demasiado grande para favorecer una buena usabilidad.\n" +"
    \n" +"Tenga en cuenta que los navegadores que no sean compatibles con el CSS mostrarán\n" +"la ventana emergente como parte de la página, dentro de corchetes.\n" +"
    \n" +"\n" +"[]\n" +"\n" + -- cgit v1.2.3 From 43b251aec4e5c788cd1c9ae2f3ca3725462de8b7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Dec 2009 19:03:43 -0500 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cffc316ea..ccf45df94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,7 +41,7 @@ ikiwiki (3.20091113) unstable; urgency=low * httpauth: Add cgiauthurl setting that can be used to do http basic auth only when ikiwiki needs authentication, rather than for any access to the cgi/wiki. - * inline: Do not generated feeds for nested inlines. + * inline: Do not generate feeds for nested inlines. * inline: Allow direct inclusion of non-page files in raw mode. * inline: Fix display of all pages when archive=yes or show=0 are used. -- cgit v1.2.3 From ff422a1d8903251da3768bd994753c2b04154ce9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Dec 2009 15:47:47 -0500 Subject: Improve javascript onload handling. I noticed the onload hook running twice sometimes when using chromium. Change from using arguments.callee.done to a onload_done variable fixed it. I guess that the callee differed in chromium. Probably the cause of the problem is that chrome supports both window.onload and document.addEventListener. --- debian/changelog | 1 + underlays/javascript/ikiwiki.js | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ccf45df94..eb8248804 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * cvs: Add missing bit to Automator. * Add complete Spanish basewiki translation done by Fernando Gonzalez de Requena. + * Improve javascript onload handling. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki.js index 1252f244f..aebc5cf7e 100644 --- a/underlays/javascript/ikiwiki.js +++ b/underlays/javascript/ikiwiki.js @@ -10,11 +10,13 @@ if (document.addEventListener) { // other browsers window.onload = run_hooks_onload; +var onload_done = 0; + function run_hooks_onload() { // avoid firing twice - if (arguments.callee.done) + if (onload_done) return; - arguments.callee.done = true; + onload_done = true; run_hooks("onload"); } -- cgit v1.2.3 From f843033749d3fd481ec74dbb0181d33cb4bf4668 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 13 Dec 2009 13:00:42 -0500 Subject: monotone: Deal with format change in version 0.45. (Thanks, Richard Levitte) --- IkiWiki/Plugin/monotone.pm | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 05c5a514d..c717ceefb 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -228,7 +228,7 @@ sub read_certs ($$) { my @ret; my $line = $results[0]; - while ($line =~ m/\s+key\s"(.*?)"\nsignature\s"(ok|bad|unknown)"\n\s+name\s"(.*?)"\n\s+value\s"(.*?)"\n\s+trust\s"(trusted|untrusted)"\n/sg) { + while ($line =~ m/\s+key\s["\[](.*?)[\]"]\nsignature\s"(ok|bad|unknown)"\n\s+name\s"(.*?)"\n\s+value\s"(.*?)"\n\s+trust\s"(trusted|untrusted)"\n/sg) { push @ret, { key => $1, signature => $2, diff --git a/debian/changelog b/debian/changelog index eb8248804..491e07a4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * Add complete Spanish basewiki translation done by Fernando Gonzalez de Requena. * Improve javascript onload handling. + * monotone: Deal with format change in version 0.45. + (Thanks, Richard Levitte) -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From b4bc7d17080055c615bc264c4d5b7d791161682c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Dec 2009 17:01:55 -0500 Subject: rename: Fix some utf-8 problems. The crux of the problem is that the cgi object has raw values not converted to utf-8, and rename was using its fields. Also fixed a missed place where the form object did not get its fields utf-8 encoded. --- IkiWiki/Plugin/rename.pm | 9 +++++---- debian/changelog | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index c3e03496f..8213d21f6 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -235,6 +235,7 @@ sub formbuilder (@) { if (defined $form->field("do") && ($form->field("do") eq "edit" || $form->field("do") eq "create")) { + IkiWiki::decode_form_utf8($form); my $q=$params{cgi}; my $session=$params{session}; @@ -242,7 +243,7 @@ sub formbuilder (@) { rename_start($q, $session, 0, $form->field("page")); } elsif ($form->submitted eq "Rename Attachment") { - my @selected=$q->param("attachment_select"); + my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select"); if (@selected > 1) { error(gettext("Only one attachment can be renamed at a time.")); } @@ -278,7 +279,7 @@ sub sessioncgi ($$) { if ($q->param("do") eq 'rename') { my $session=shift; - my ($form, $buttons)=rename_form($q, $session, $q->param("page")); + my ($form, $buttons)=rename_form($q, $session, Encode::decode_utf8($q->param("page"))); IkiWiki::decode_form_utf8($form); if ($form->submitted eq 'Cancel') { @@ -290,9 +291,9 @@ sub sessioncgi ($$) { # These untaints are safe because of the checks # performed in check_canrename later. - my $src=$q->param("page"); + my $src=$form->field("page"); my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src}); - my $dest=IkiWiki::possibly_foolish_untaint(titlepage($q->param("new_name"))); + my $dest=IkiWiki::possibly_foolish_untaint(titlepage($form->field("new_name"))); my $destfile=$dest; if (! $q->param("attachment")) { my $type=$q->param('type'); diff --git a/debian/changelog b/debian/changelog index 491e07a4a..41f4ec870 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * Improve javascript onload handling. * monotone: Deal with format change in version 0.45. (Thanks, Richard Levitte) + * rename: Fix some utf-8 problems. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From bb1ce7207d9707848dfa7ebf6e32bfff5736732c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Dec 2009 17:16:40 -0500 Subject: attachment: Fix several utf-8 problems. Similar to those in the rename plugin, although here we can't use the form object. --- IkiWiki/Plugin/attachment.pm | 5 +++-- debian/changelog | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 087c315a9..953e71625 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -112,7 +112,7 @@ sub formbuilder (@) { return if ! defined $form->field("do") || ($form->field("do") ne "edit" && $form->field("do") ne "create") ; - my $filename=$q->param('attachment'); + my $filename=Encode::decode_utf8($q->param('attachment')); if (defined $filename && length $filename && ($form->submitted eq "Upload Attachment" || $form->submitted eq "Save Page")) { my $session=$params{session}; @@ -189,9 +189,10 @@ sub formbuilder (@) { IkiWiki::saveindex(); } elsif ($form->submitted eq "Insert Links") { - my $page=quotemeta($q->param("page")); + my $page=quotemeta(Encode::decode_utf8($q->param("page"))); my $add=""; foreach my $f ($q->param("attachment_select")) { + $f=Encode::decode_utf8($f); $f=~s/^$page\///; $add.="[[$f]]\n"; } diff --git a/debian/changelog b/debian/changelog index 41f4ec870..c286065fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * monotone: Deal with format change in version 0.45. (Thanks, Richard Levitte) * rename: Fix some utf-8 problems. + * attachment: Fix several utf-8 problems. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From cdbdf19c369c7a79251cf938b6d8d893accd4599 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Dec 2009 17:19:31 -0500 Subject: attachment: Fix reversion in attachment sorting by age. Reversion was introduced by over-eager removal of mtime_raw in 2b569f99d9e7f1d4d30c7f3adde9729ff4d868cf --- IkiWiki/Plugin/attachment.pm | 1 + debian/changelog | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm index 953e71625..cbe6efc21 100644 --- a/IkiWiki/Plugin/attachment.pm +++ b/IkiWiki/Plugin/attachment.pm @@ -231,6 +231,7 @@ sub attachment_list ($) { link => htmllink($page, $page, $f, noimageinline => 1), size => IkiWiki::Plugin::filecheck::humansize((stat(_))[7]), mtime => displaytime($IkiWiki::pagemtime{$f}), + mtime_raw => $IkiWiki::pagemtime{$f}, }; } } diff --git a/debian/changelog b/debian/changelog index c286065fa..258f07b08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low (Thanks, Richard Levitte) * rename: Fix some utf-8 problems. * attachment: Fix several utf-8 problems. + * attachment: Fix reversion in attachment sorting by age. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From 4ee754536d14610580f852d134a842c2cb9a1665 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Dec 2009 17:26:48 -0500 Subject: remove: Fix problem removing pages with utf-8 in the name. --- IkiWiki/Plugin/remove.pm | 6 +++--- debian/changelog | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index cbc8a0f2c..2b8cf0414 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -166,7 +166,7 @@ sub formbuilder (@) { removal_confirm($q, $session, 0, $form->field("page")); } elsif ($form->submitted eq "Remove Attachments") { - my @selected=$q->param("attachment_select"); + my @selected=map { Encode::decode_utf8($_) } $q->param("attachment_select"); if (! @selected) { error(gettext("Please select the attachments to remove.")); } @@ -187,7 +187,7 @@ sub sessioncgi ($$) { postremove($session); } elsif ($form->submitted eq 'Remove' && $form->validate) { - my @pages=$q->param("page"); + my @pages=$form->field("page"); # Validate removal by checking that the page exists, # and that the user is allowed to edit(/remove) it. @@ -237,7 +237,7 @@ sub sessioncgi ($$) { } } else { - removal_confirm($q, $session, 0, $q->param("page")); + removal_confirm($q, $session, 0, $form->field("page")); } exit 0; diff --git a/debian/changelog b/debian/changelog index 258f07b08..d84477298 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * rename: Fix some utf-8 problems. * attachment: Fix several utf-8 problems. * attachment: Fix reversion in attachment sorting by age. + * remove: Fix problem removing pages with utf-8 in the name. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From 2bceb10b5fd06e8e0867cbc6d72a16cbaae35803 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Dec 2009 18:16:47 -0500 Subject: 404/goto: Fix 404 display of utf-8 pages. Problem here was that no charset http header was being sent. I fixed this globally by making cgi_custom_failure send the header. Required changing its parameters. --- IkiWiki/CGI.pm | 12 ++++++++---- IkiWiki/Plugin/getsource.pm | 3 ++- IkiWiki/Plugin/goto.pm | 3 ++- debian/changelog | 1 + 4 files changed, 13 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 9277223f0..866711a71 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -235,11 +235,15 @@ sub cgi_prefs ($$) { showform($form, $buttons, $session, $q); } -sub cgi_custom_failure ($$) { - my $header=shift; +sub cgi_custom_failure ($$$) { + my $q=shift; + my $httpstatus=shift; my $message=shift; - print $header; + print $q->header( + -status => $httpstatus, + -charset => 'utf-8', + ); print $message; # Internet Explod^Hrer won't show custom 404 responses @@ -274,7 +278,7 @@ sub check_banned ($$) { $session->delete(); cgi_savesession($session); cgi_custom_failure( - $q->header(-status => "403 Forbidden"), + $q, "403 Forbidden", gettext("You are banned.")); } } diff --git a/IkiWiki/Plugin/getsource.pm b/IkiWiki/Plugin/getsource.pm index ae9ea3cc7..d1555430e 100644 --- a/IkiWiki/Plugin/getsource.pm +++ b/IkiWiki/Plugin/getsource.pm @@ -58,7 +58,8 @@ sub cgi_getsource ($) { if (! exists $pagesources{$page}) { IkiWiki::cgi_custom_failure( - $cgi->header(-status => "404 Not Found"), + $cgi, + "404 Not Found", IkiWiki::misctemplate(gettext("missing page"), "

    ". sprintf(gettext("The page %s does not exist."), diff --git a/IkiWiki/Plugin/goto.pm b/IkiWiki/Plugin/goto.pm index 2e2dc04a1..439552f62 100644 --- a/IkiWiki/Plugin/goto.pm +++ b/IkiWiki/Plugin/goto.pm @@ -51,7 +51,8 @@ sub cgi_goto ($;$) { if (! length $link) { IkiWiki::cgi_custom_failure( - $q->header(-status => "404 Not Found"), + $q, + "404 Not Found", IkiWiki::misctemplate(gettext("missing page"), "

    ". sprintf(gettext("The page %s does not exist."), diff --git a/debian/changelog b/debian/changelog index d84477298..ff922532a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * attachment: Fix several utf-8 problems. * attachment: Fix reversion in attachment sorting by age. * remove: Fix problem removing pages with utf-8 in the name. + * 404/goto: Fix 404 display of utf-8 pages. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From f9190f523c75fc5db93eff80e3b1dc005ee474f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Dec 2009 18:54:30 -0500 Subject: reorg --- debian/changelog | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ff922532a..cbb496e07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,14 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low - * cvs: Add missing bit to Automator. * Add complete Spanish basewiki translation done by Fernando Gonzalez de Requena. * Improve javascript onload handling. * monotone: Deal with format change in version 0.45. (Thanks, Richard Levitte) - * rename: Fix some utf-8 problems. - * attachment: Fix several utf-8 problems. + * cvs: Add missing bit to Automator. * attachment: Fix reversion in attachment sorting by age. - * remove: Fix problem removing pages with utf-8 in the name. - * 404/goto: Fix 404 display of utf-8 pages. + * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and + goto. -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 -- cgit v1.2.3 From 985ac23ca7df3ca166be2911bdbcb3b3d9c36b1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 18 Dec 2009 21:02:07 -0500 Subject: releasing version 3.20091218 --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 30 +++++++++++++++--------------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cbb496e07..0e76bd727 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20091203) UNRELEASED; urgency=low +ikiwiki (3.20091218) unstable; urgency=low * Add complete Spanish basewiki translation done by Fernando Gonzalez de Requena. @@ -10,7 +10,7 @@ ikiwiki (3.20091203) UNRELEASED; urgency=low * Fix utf-8 problems in rename, remove, attachment, 404, sourcepage, and goto. - -- Joey Hess Wed, 02 Dec 2009 17:22:21 -0500 + -- Joey Hess Fri, 18 Dec 2009 20:47:24 -0500 ikiwiki (3.20091202) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 1651377e1..eb6e5d039 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20091202 +Version: 3.20091218 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index eb1824411..bf78ec046 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 13:10-0500\n" +"POT-Creation-Date: 2009-12-18 20:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,7 +30,7 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:318 msgid "Your login session has expired." msgstr "" @@ -50,11 +50,11 @@ msgstr "" msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:282 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:409 ../IkiWiki/CGI.pm:410 ../IkiWiki.pm:1281 msgid "Error" msgstr "" @@ -320,20 +320,20 @@ msgstr "" msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "" @@ -817,20 +817,20 @@ msgstr "" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -1059,16 +1059,16 @@ msgstr "" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -- cgit v1.2.3 From 3a1c8c2b463b8a4f6b3b2c866c5e1b1500f95193 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Dec 2009 14:31:51 -0500 Subject: pagestats: Add show parameter. Closes: #562129 --- IkiWiki/Plugin/pagestats.pm | 10 ++++++++++ debian/changelog | 6 ++++++ doc/ikiwiki/directive/pagestats.mdwn | 6 ++++++ 3 files changed, 22 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm index 47638210a..4313aa271 100644 --- a/IkiWiki/Plugin/pagestats.pm +++ b/IkiWiki/Plugin/pagestats.pm @@ -63,6 +63,16 @@ sub preprocess (@) { $max = $counts{$page} if $counts{$page} > $max; } + if (exists $params{show}) { + my $i=0; + my %show; + foreach my $key (sort { $counts{$b} <=> $counts{$a} } keys %counts) { + last if ++$i > $params{show}; + $show{$key}=$counts{$key}; + } + %counts=%show; + } + if ($style eq 'table') { return "\n". join("\n", map { diff --git a/debian/changelog b/debian/changelog index 0e76bd727..e01037171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20091219) UNRELEASED; urgency=low + + * pagestats: Add show parameter. Closes: #562129 + + -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 + ikiwiki (3.20091218) unstable; urgency=low * Add complete Spanish basewiki translation done by Fernando Gonzalez de diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn index f14c80b07..68f4d2734 100644 --- a/doc/ikiwiki/directive/pagestats.mdwn +++ b/doc/ikiwiki/directive/pagestats.mdwn @@ -22,4 +22,10 @@ Or to display a cloud of tags related to Linux, you could use: \[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]] +The optional `show` parameter limits display to the specified number of +pages. For instance, to show a table of the top ten pages with the most +links: + + \[[!pagestats style="table" show="10"]] + [[!meta robots="noindex, follow"]] -- cgit v1.2.3 From 7cf435b678e99ca9956de5d0454371b30c610b66 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Dec 2009 15:16:01 -0500 Subject: credit --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e01037171..d3a510d4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low - * pagestats: Add show parameter. Closes: #562129 + * pagestats: Add show parameter. Closes: #562129 (David Paleino) -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 -- cgit v1.2.3 From ffc9f25e734a8ca5397f2dfd09c1e31725624ee0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Dec 2009 15:28:18 -0500 Subject: toc: Add startlevel parameter. (kerravonsen) --- IkiWiki/Plugin/toc.pm | 11 ++++++++--- debian/changelog | 1 + doc/ikiwiki/directive/toc.mdwn | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/toc.pm b/IkiWiki/Plugin/toc.pm index a585564e7..b8537d3eb 100644 --- a/IkiWiki/Plugin/toc.pm +++ b/IkiWiki/Plugin/toc.pm @@ -53,8 +53,8 @@ sub format (@) { my $page=""; my $index=""; my %anchors; - my $curlevel; - my $startlevel=0; + my $startlevel=($params{startlevel} ? $params{startlevel} : 0); + my $curlevel=$startlevel-1; my $liststarted=0; my $indent=sub { "\t" x $curlevel }; $p->handler(start => sub { @@ -65,12 +65,17 @@ sub format (@) { my $anchor="index".++$anchors{$level}."h$level"; $page.="$text"; - # Take the first header level seen as the topmost level, + # Unless we're given startlevel as a parameter, + # take the first header level seen as the topmost level, # even if there are higher levels seen later on. if (! $startlevel) { $startlevel=$level; $curlevel=$startlevel-1; } + elsif (defined $params{startlevel} && + $level < $params{startlevel}) { + return; + } elsif ($level < $startlevel) { $level=$startlevel; } diff --git a/debian/changelog b/debian/changelog index d3a510d4a..ae0b5eefd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low * pagestats: Add show parameter. Closes: #562129 (David Paleino) + * toc: Add startlevel parameter. (kerravonsen) -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/doc/ikiwiki/directive/toc.mdwn b/doc/ikiwiki/directive/toc.mdwn index bf504dafc..bb1afa1ac 100644 --- a/doc/ikiwiki/directive/toc.mdwn +++ b/doc/ikiwiki/directive/toc.mdwn @@ -14,6 +14,12 @@ the `levels` parameter: The toc directive will take the level of the first header as the topmost level, even if there are higher levels seen later in the file. +To create a table of contents that only shows headers starting with a given +level, use the `startlevel` parameter. For example, to show only h2 and +smaller headers: + + \[[!toc startlevel=2]] + The table of contents will be created as an ordered list. If you want an unordered list instead, you can change the list-style in your local style sheet. -- cgit v1.2.3 From 008d59d3d9a933c7bcce81f777989a991c63bbf7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 28 Dec 2009 19:27:03 -0500 Subject: Remove example ikiwiki setup file from the Debian package. This re-enables linking to /usr/share/ikiwiki/examples which has the example sites also used by auto-blog.setup. The example setup file can be generated at any time using ikiwiki --dumpsetup so I do not see a reason to ship it. Closes: #562183 --- debian/changelog | 5 +++++ debian/examples | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 debian/examples (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ae0b5eefd..dec2423fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,11 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low * pagestats: Add show parameter. Closes: #562129 (David Paleino) * toc: Add startlevel parameter. (kerravonsen) + * Remove example ikiwiki setup file from the Debian package. This + re-enables linking to /usr/share/ikiwiki/examples which has the + example sites also used by auto-blog.setup. The example setup file + can be generated at any time using ikiwiki --dumpsetup so I do + not see a reason to ship it. Closes: #562183 -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/debian/examples b/debian/examples deleted file mode 100644 index a1e623192..000000000 --- a/debian/examples +++ /dev/null @@ -1 +0,0 @@ -ikiwiki.setup -- cgit v1.2.3 From 9f841c07dff16433fce805111d8ab45ff38ce228 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Dec 2009 15:56:25 -0500 Subject: Use env hack in python scripts. --- debian/changelog | 1 + doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn | 2 ++ plugins/pythondemo | 2 +- plugins/rst | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index dec2423fe..ee6f9adfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low example sites also used by auto-blog.setup. The example setup file can be generated at any time using ikiwiki --dumpsetup so I do not see a reason to ship it. Closes: #562183 + * Use env hack in python scripts. -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn b/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn index f89c76fe8..a594adc09 100644 --- a/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn +++ b/doc/bugs/rst_plugin_has_python_hardcode_in_shebang_line.mdwn @@ -11,3 +11,5 @@ Thus I suggest to change the shebang line to: #!/usr/bin/env python +> [[done]], although the irony of all the perl hashbangs in ikiwiki +> being hardcoded doesn't escape me. --[[Joey]] diff --git a/plugins/pythondemo b/plugins/pythondemo index c63ce3973..911f4d7d9 100755 --- a/plugins/pythondemo +++ b/plugins/pythondemo @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # pythondemo — demo Python ikiwiki plugin diff --git a/plugins/rst b/plugins/rst index 449dba415..9f64b33a0 100755 --- a/plugins/rst +++ b/plugins/rst @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # # rst — xml-rpc-based ikiwiki plugin to process RST files -- cgit v1.2.3 From 6af6c89df314cf2f9c9e053c04aa2bd492072ab1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Dec 2009 15:41:17 -0500 Subject: comments: Add a checksum to the name of comment pages, to avoid merge conflicts when comments are posted to two branches of a site. --- IkiWiki/Plugin/comments.pm | 32 ++++++++++++++++++++++-------- debian/changelog | 3 +++ doc/todo/conflict_free_comment_merges.mdwn | 9 +++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 517e16f9f..6340fc2cb 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -377,8 +377,6 @@ sub editcomment ($$) { IkiWiki::check_canedit($page, $cgi, $session); $postcomment=0; - my $location=unique_comment_location($page, $config{srcdir}); - my $content = "[[!comment format=$type\n"; # FIXME: handling of double quotes probably wrong? @@ -410,8 +408,11 @@ sub editcomment ($$) { my $subject = $form->field('subject'); if (defined $subject && length $subject) { $subject =~ s/"/"/g; - $content .= " subject=\"$subject\"\n"; } + else { + $subject = "comment ".(num_comments($page, $config{srcdir}) + 1); + } + $content .= " subject=\"$subject\"\n"; $content .= " date=\"" . decode_utf8(strftime('%Y-%m-%dT%H:%M:%SZ', gmtime)) . "\"\n"; @@ -421,6 +422,8 @@ sub editcomment ($$) { $editcontent =~ s/"/\\"/g; $content .= " content=\"\"\"\n$editcontent\n\"\"\"]]\n"; + my $location=unique_comment_location($page, $content, $config{srcdir}); + # This is essentially a simplified version of editpage: # - the user does not control the page that's created, only the parent # - it's always a create operation, never an edit @@ -458,7 +461,7 @@ sub editcomment ($$) { if (! $ok) { my $penddir=$config{wikistatedir}."/comments_pending"; - $location=unique_comment_location($page, $penddir); + $location=unique_comment_location($page, $content, $penddir); writefile("$location._comment", $penddir, $content); IkiWiki::printheader($session); print IkiWiki::misctemplate(gettext(gettext("comment stored for moderation")), @@ -554,7 +557,7 @@ sub commentmoderation ($$) { if ($action eq 'Accept') { my $content=eval { readfile($file) }; next if $@; # file vanished since form was displayed - my $dest=unique_comment_location($page, $config{srcdir})."._comment"; + my $dest=unique_comment_location($page, $content, $config{srcdir})."._comment"; writefile($dest, $config{srcdir}, $content); if ($config{rcs} and $config{comments_commit}) { IkiWiki::rcs_add($dest); @@ -813,15 +816,28 @@ sub pagetemplate (@) { } } -sub unique_comment_location ($) { +sub num_comments ($$) { my $page=shift; my $dir=shift; + my @comments=glob("$dir/$page/$config{comments_pagename}*._comment"); + return @comments; +} + +sub unique_comment_location ($$$) { + my $page=shift; + + eval q{use Digest::MD5 'md5_hex'}; + error($@) if $@; + my $content_md5=md5_hex(shift); + + my $dir=shift; + my $location; - my $i = 0; + my $i = num_comments($page, $dir); do { $i++; - $location = "$page/$config{comments_pagename}$i"; + $location = "$page/$config{comments_pagename}${i}_${content_md5}"; } while (-e "$dir/$location._comment"); return $location; diff --git a/debian/changelog b/debian/changelog index ee6f9adfb..984351415 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,9 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low can be generated at any time using ikiwiki --dumpsetup so I do not see a reason to ship it. Closes: #562183 * Use env hack in python scripts. + * comments: Add a checksum to the name of comment pages, to + avoid merge conflicts when comments are posted to two branches of a + site. -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn index e0e8acb34..2cef0ee8c 100644 --- a/doc/todo/conflict_free_comment_merges.mdwn +++ b/doc/todo/conflict_free_comment_merges.mdwn @@ -12,3 +12,12 @@ title is specified, to retain the current behavior of the default title being "comment N". What do you think [[smcv]]? --[[Joey]] + +> I had to use md5sums, as sha1sum perl module may not be available and I +> didn't want to drag it in. But I think that's ok; this doesn't need to be +> cryptographically secure and even the chances of being able to +> purposefully cause a md5 collision and thus an undesired merge conflict +> are quite low since it modifies the input text and adds a date stamp to +> it. +> +> Anyway, I think it's good, [[[done]] --[[Joey]] -- cgit v1.2.3 From 2ae1d9d928c12be21a32c9fd4809f12bebc20e77 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 1 Jan 2010 03:37:59 -0500 Subject: linkmap: Add option to omit disconnected pages from the map. --- IkiWiki/Plugin/linkmap.pm | 25 ++++++++++++++++++++----- debian/changelog | 1 + doc/ikiwiki/directive/linkmap.mdwn | 13 ++++++++++--- 3 files changed, 31 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm index 9540bd112..28acbda32 100644 --- a/IkiWiki/Plugin/linkmap.pm +++ b/IkiWiki/Plugin/linkmap.pm @@ -49,6 +49,7 @@ sub genmap ($) { my $mapnum=shift; return "" unless exists $maps{$mapnum}; my %params=%{$maps{$mapnum}}; + my $connected=IkiWiki::yesno($params{connected}); # Get all the items to map. my %mapitems = map { $_ => urlto($_, $params{destpage}) } @@ -79,24 +80,38 @@ sub genmap ($) { print OUT "charset=\"utf-8\";\n"; print OUT "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n" if defined $params{width} and defined $params{height}; + my %shown; + my $show=sub { + my $item=shift; + if (! $shown{$item}) { + print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n"; + $shown{$item}=1; + } + }; foreach my $item (keys %mapitems) { - print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n"; + $show->($item) unless $connected; foreach my $link (map { bestlink($item, $_) } @{$links{$item}}) { - print OUT "\"$item\" -> \"$link\";\n" - if $mapitems{$link}; + next unless length $link and $mapitems{$link}; + foreach my $endpoint ($item, $link) { + $show->($endpoint); + } + print OUT "\"$item\" -> \"$link\";\n"; } } print OUT "}\n"; - close OUT; + close OUT || error gettext("failed to run dot"); local $/=undef; my $ret="\n". . ""; - close IN; + close IN || error gettext("failed to run dot"); waitpid $pid, 0; + if ($?) { + error gettext("failed to run dot"); + } $SIG{PIPE}="DEFAULT"; error gettext("failed to run dot") if $sigpipe; diff --git a/debian/changelog b/debian/changelog index 984351415..eb9bf496f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low * comments: Add a checksum to the name of comment pages, to avoid merge conflicts when comments are posted to two branches of a site. + * linkmap: Add option to omit disconnected pages from the map. -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/doc/ikiwiki/directive/linkmap.mdwn b/doc/ikiwiki/directive/linkmap.mdwn index 38cf0fd11..baa6fff61 100644 --- a/doc/ikiwiki/directive/linkmap.mdwn +++ b/doc/ikiwiki/directive/linkmap.mdwn @@ -7,9 +7,7 @@ graph showing the links between a set of pages in the wiki. Example usage: Only links between mapped pages will be shown; links pointing to or from unmapped pages will be omitted. If the pages to include are not specified, -the links between all pages (and other files) in the wiki are mapped. For -best results, only a small set of pages should be mapped, since otherwise -the map can become very large, unwieldy, and complicated. +the links between all pages (and other files) in the wiki are mapped. Here are descriptions of all the supported parameters to the `linkmap` directive: @@ -18,5 +16,14 @@ directive: * `height`, `width` - Limit the size of the map to a given height and width, in inches. Both must be specified for the limiting to take effect, otherwise the map's size is not limited. +* `connected` - Controls whether to include pages on the map that link to + no other pages (connected=no, the default), or to only show pages that + link to others (connected=yes). + +For best results, only a small set of pages should be mapped, since +otherwise the map can become very large, unwieldy, and complicated. +If too many pages are included, the map may get so large that graphviz +cannot render it. Using the `connected` parameter is a good way to prune +out pages that clutter the map. [[!meta robots="noindex, follow"]] -- cgit v1.2.3 From 63cc5384bb4bd6a033ff85821b1bb904150d76c2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 1 Jan 2010 15:09:15 -0500 Subject: inline: Fix bug that limited displayed pages when feedshow was specified w/o show. --- IkiWiki/Plugin/inline.pm | 2 +- debian/changelog | 2 ++ doc/ikiwiki/directive/inline/discussion.mdwn | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 93dc0149e..17d1611db 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -209,7 +209,7 @@ sub preprocess_inline (@) { if ($params{show}) { $num=$params{show}; } - if ($params{feedshow} && $num < $params{feedshow}) { + if ($params{feedshow} && $num < $params{feedshow} && $num > 0) { $num=$params{feedshow}; } if ($params{skip} && $num) { diff --git a/debian/changelog b/debian/changelog index eb9bf496f..4ad346c13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low avoid merge conflicts when comments are posted to two branches of a site. * linkmap: Add option to omit disconnected pages from the map. + * inline: Fix bug that limited displayed pages when feedshow was + specified w/o show. -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn index c0d7c76c6..998ba642b 100644 --- a/doc/ikiwiki/directive/inline/discussion.mdwn +++ b/doc/ikiwiki/directive/inline/discussion.mdwn @@ -132,9 +132,7 @@ Else can you please suggest a smarter way of getting certain data out from pages Reading the documentation I would think that `feedshow` does not influence `show`. - [[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]] - -> Somehow the line above is not displayed correctly. + \[[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]] Only ten pages are listed in this example although `archive` is set to yes. Removing `feedshow=10` all matching pages are shown. @@ -144,3 +142,5 @@ Is that behaviour intended? > Is something going wrong because `quick="yes"` [[»turns off generation of any feeds«|inline]]? --[[PaulePanter]] --[[PaulePanter]] + +>> Bug was that if feedshow was specified without show it limited to it incorrectly. Fixed. --[[Joey]] -- cgit v1.2.3 From 7dd074e2e712c67c8c1a26841a69281fa9d293cb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Jan 2010 15:42:20 -0500 Subject: Fix several places that did not properly handle capitalization of the discussionpage setting. Specifically, fixes discussion actions on discussion pages, and unbreaks the opendiscussion plugin. --- IkiWiki/Plugin/inline.pm | 4 ++-- IkiWiki/Plugin/opendiscussion.pm | 2 +- IkiWiki/Render.pm | 2 +- debian/changelog | 7 ++++++- doc/bugs/disable_sub-discussion_pages.mdwn | 3 +++ 5 files changed, 13 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 17d1611db..ec99300b3 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -357,9 +357,9 @@ sub preprocess_inline (@) { my $file = $pagesources{$page}; my $type = pagetype($file); if ($config{discussion}) { - if ($page !~ /.*\/\Q$config{discussionpage}\E$/ && + if ($page !~ /.*\/\Q$config{discussionpage}\E$/i && (length $config{cgiurl} || - exists $pagesources{$page."/".$config{discussionpage}})) { + exists $pagesources{$page."/".lc($config{discussionpage})})) { $template->param(have_actions => 1); $template->param(discussionlink => htmllink($page, diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 1bec4b013..4517ff88b 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -23,7 +23,7 @@ sub canedit ($$) { my $cgi=shift; my $session=shift; - return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/; + return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i; return undef; } diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 308d60ed0..c82d8a35a 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -92,7 +92,7 @@ sub genpage ($$) { $actions++; } if ($config{discussion}) { - if ($page !~ /.*\/\Q$config{discussionpage}\E$/ && + if ($page !~ /.*\/\Q$config{discussionpage}\E$/i && (length $config{cgiurl} || exists $links{$page."/".$config{discussionpage}})) { $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1)); diff --git a/debian/changelog b/debian/changelog index 4ad346c13..bccb8b797 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,6 @@ -ikiwiki (3.20091219) UNRELEASED; urgency=low +ikiwiki (3.20100102.3) UNRELEASED; urgency=low + + Happy palindrome day! * pagestats: Add show parameter. Closes: #562129 (David Paleino) * toc: Add startlevel parameter. (kerravonsen) @@ -14,6 +16,9 @@ ikiwiki (3.20091219) UNRELEASED; urgency=low * linkmap: Add option to omit disconnected pages from the map. * inline: Fix bug that limited displayed pages when feedshow was specified w/o show. + * Fix several places that did not properly handle capitalization of + the discussionpage setting. Specifically, fixes discussion actions + on discussion pages, and unbreaks the opendiscussion plugin. -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn index 233a377f1..39d9ba528 100644 --- a/doc/bugs/disable_sub-discussion_pages.mdwn +++ b/doc/bugs/disable_sub-discussion_pages.mdwn @@ -9,6 +9,9 @@ I do want discussion subpage, but I don't want to have, for example: discussion/ >> This bug appears to have returned. For example, >> [[plugins/contrib/unixauth/discussion]] has a Discussion link. -- [[schmonz]] +>>> Lots of case issues this time. Audited for and fixed them all. [[done]] +>>> --[[Joey]] + >>> Joey, I've just seen that you closed that bug in ikiwiki 1.37, but it seems >>> you fixed it only for English "discussion" page. The bug still occurs >>> for the international "discussion" pages. I have backported ikiwiki 1.40 -- cgit v1.2.3 From 9fdb9561dc7e5c9e50f0fc25995f3fefd5c72980 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Jan 2010 21:54:07 -0500 Subject: releasing version 3.20100102.3 --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 21 +++++++++++---------- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bccb8b797..02d3ec65b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100102.3) UNRELEASED; urgency=low +ikiwiki (3.20100102.3) unstable; urgency=low Happy palindrome day! @@ -20,7 +20,7 @@ ikiwiki (3.20100102.3) UNRELEASED; urgency=low the discussionpage setting. Specifically, fixes discussion actions on discussion pages, and unbreaks the opendiscussion plugin. - -- Joey Hess Fri, 25 Dec 2009 14:31:22 -0500 + -- Joey Hess Sat, 02 Jan 2010 21:46:16 -0500 ikiwiki (3.20091218) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index eb6e5d039..78c32b962 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20091218 +Version: 3.20100102.3 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index bf78ec046..38a464141 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-18 20:48-0500\n" +"POT-Creation-Date: 2010-01-02 21:47-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -224,36 +224,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -440,7 +440,8 @@ msgstr "" msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:102 ../IkiWiki/Plugin/linkmap.pm:109 +#: ../IkiWiki/Plugin/linkmap.pm:113 ../IkiWiki/Plugin/linkmap.pm:116 msgid "failed to run dot" msgstr "" -- cgit v1.2.3 From aed16b4833f98eda566f75b6a1a679febc1ba5ff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jan 2010 12:54:18 -0500 Subject: inline: Avoid showing edit links if page editing is disabled. (Sjoerd) --- IkiWiki/Plugin/inline.pm | 5 ++++- debian/changelog | 7 +++++++ .../inline_plugin_sets_editurl_even_when_editpage_is_disabled.html | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index ec99300b3..401852513 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -369,9 +369,12 @@ sub preprocess_inline (@) { forcesubpage => 1)); } } - if (length $config{cgiurl} && defined $type) { + if (length $config{cgiurl} && + defined $type && + IkiWiki->can("cgi_editpage")) { $template->param(have_actions => 1); $template->param(editurl => cgiurl(do => "edit", page => $page)); + } } diff --git a/debian/changelog b/debian/changelog index 02d3ec65b..df3490640 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20100104) UNRELEASED; urgency=low + + * inline: Avoid showing edit links if page editing is disabled. + (Sjoerd) + + -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 + ikiwiki (3.20100102.3) unstable; urgency=low Happy palindrome day! diff --git a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html index e4e37b34a..62c91a932 100644 --- a/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html +++ b/doc/bugs/inline_plugin_sets_editurl_even_when_editpage_is_disabled.html @@ -12,3 +12,5 @@ see subject, simple patch below } } + +[[done]] --[[Joey]] -- cgit v1.2.3 From f8bd25bfc7c590abbd31f42bb4d745d43c3d7f14 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jan 2010 14:56:04 -0500 Subject: signinedit: Auto-disable the plugin when all authentication methods are disabled. --- IkiWiki/Plugin/signinedit.pm | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm index 032a0034c..8b44a68f7 100644 --- a/IkiWiki/Plugin/signinedit.pm +++ b/IkiWiki/Plugin/signinedit.pm @@ -29,6 +29,7 @@ sub canedit ($$$) { # signin can override this. if (! defined $session->param("name") || ! IkiWiki::userinfo_get($session->param("name"), "regdate")) { + return "" unless exists $IkiWiki::hooks{auth}; return sub { IkiWiki::needsignin($cgi, $session) }; } else { diff --git a/debian/changelog b/debian/changelog index df3490640..aa4f1ac3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * inline: Avoid showing edit links if page editing is disabled. (Sjoerd) + * signinedit: Auto-disable the plugin when all authentication methods + are disabled. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From ae493178cf58cf5d7edfa30ccabe758b06febcb4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jan 2010 15:01:25 -0500 Subject: lockedit: Detect if no authentication plugins are enabled, and die with an error message as this configuration does not make sense. --- IkiWiki/Plugin/lockedit.pm | 7 +++++++ debian/changelog | 2 ++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 0fa329251..8914ba498 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -7,6 +7,7 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "lockedit", call => \&getsetup); + hook(type => "checkconfig", id => "lockedit", call => \&checkconfig); hook(type => "canedit", id => "lockedit", call => \&canedit); } @@ -26,6 +27,12 @@ sub getsetup () { }, } +sub checkconfig () { + if (! exists $IkiWiki::hooks{auth}) { + error gettext("lockedit plugin is enabled, but no authentication plugins are enabled"); + } +} + sub canedit ($$) { my $page=shift; my $cgi=shift; diff --git a/debian/changelog b/debian/changelog index aa4f1ac3c..2c121ef54 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low (Sjoerd) * signinedit: Auto-disable the plugin when all authentication methods are disabled. + * lockedit: Detect if no authentication plugins are enabled, and + die with an error message as this configuration does not make sense. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From 264f46989470db93293938e327744554b5177f82 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jan 2010 19:40:33 -0500 Subject: lockedit can make sense with no auth plugins On second though, you might want a wide-open wiki with some locked pages that cannot be edited online. So, the right thing for lockedit to do when there are no auth plugins is to just say the page cannot be edited. --- IkiWiki/Plugin/lockedit.pm | 12 +++--------- debian/changelog | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 8914ba498..74ddbb153 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -7,7 +7,6 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "lockedit", call => \&getsetup); - hook(type => "checkconfig", id => "lockedit", call => \&checkconfig); hook(type => "canedit", id => "lockedit", call => \&canedit); } @@ -27,12 +26,6 @@ sub getsetup () { }, } -sub checkconfig () { - if (! exists $IkiWiki::hooks{auth}) { - error gettext("lockedit plugin is enabled, but no authentication plugins are enabled"); - } -} - sub canedit ($$) { my $page=shift; my $cgi=shift; @@ -46,8 +39,9 @@ sub canedit ($$) { user => $session->param("name"), ip => $ENV{REMOTE_ADDR}, )) { - if (! defined $user || - ! IkiWiki::userinfo_get($session->param("name"), "regdate")) { + if ((! defined $user || + ! IkiWiki::userinfo_get($session->param("name"), "regdate")) && + exists $IkiWiki::hooks{auth}) { return sub { IkiWiki::needsignin($cgi, $session) }; } else { diff --git a/debian/changelog b/debian/changelog index 2c121ef54..aa4f1ac3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,6 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low (Sjoerd) * signinedit: Auto-disable the plugin when all authentication methods are disabled. - * lockedit: Detect if no authentication plugins are enabled, and - die with an error message as this configuration does not make sense. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From d78e8ee45275060d70686e540c94aa5aa47d9f31 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Jan 2010 20:51:40 -0500 Subject: comments: Fix permalinks for comments using new conflict-free filenames. --- IkiWiki/Plugin/comments.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 6340fc2cb..5586cca52 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -224,7 +224,7 @@ sub preprocess { $pagestate{$page}{meta}{title} = $params{subject}; } - if ($params{page} =~ m/\/(\Q$config{comments_pagename}\E\d+)$/) { + if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) { $pagestate{$page}{meta}{permalink} = urlto(IkiWiki::dirname($params{page}), undef, 1). "#".page_to_id($params{page}); } diff --git a/debian/changelog b/debian/changelog index aa4f1ac3c..f36580d26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low (Sjoerd) * signinedit: Auto-disable the plugin when all authentication methods are disabled. + * comments: Fix permalinks for comments using new conflict-free filenames. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From bde52652152cb4105665f18569fd807b08025d59 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 7 Jan 2010 15:44:32 -0500 Subject: close --- debian/changelog | 1 + doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f36580d26..4f7c1a60c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * signinedit: Auto-disable the plugin when all authentication methods are disabled. * comments: Fix permalinks for comments using new conflict-free filenames. + * img: Support alignment of images with captions. (Giuseppe Bilotta) -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 diff --git a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn index 6500600f3..e986bdc82 100644 --- a/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn +++ b/doc/bugs/align_doesn__39__t_always_work_with_img_plugin_.mdwn @@ -4,4 +4,4 @@ As best as I can tell this is because the "caption" parameter works by wrapping -- AdamShand -> I agree, this is annoying. --[[Joey]] +> I agree, this is annoying... and [[done]]! --[[Joey]] -- cgit v1.2.3 From 59d929d6b1271c84c6d17ffbff65b57bf67d49e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Jan 2010 16:20:09 -0500 Subject: websetup: Fix utf-8 problems. --- IkiWiki/Plugin/websetup.pm | 9 +++++++-- debian/changelog | 1 + doc/bugs/utf-8_bug_in_websetup.pm.mdwn | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 9edd22d26..75aa3681c 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -139,7 +139,11 @@ sub showfields ($$$@) { my $value=$config{$key}; if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { - $value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion + $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) } @{$value} : ""), + "", ""]; # blank items for expansion + } + else { + $value=Encode::encode_utf8($value); } if ($info{type} eq "string") { @@ -290,7 +294,6 @@ sub showform ($$) { shift->(form => $form, cgi => $cgi, session => $session, buttons => $buttons); }); - IkiWiki::decode_form_utf8($form); my %fields=showfields($form, undef, undef, IkiWiki::getsetup()); @@ -308,6 +311,8 @@ sub showform ($$) { $fields{$_}=$shown{$_} foreach keys %shown; } } + + IkiWiki::decode_form_utf8($form); if ($form->submitted eq "Cancel") { IkiWiki::redirect($cgi, $config{url}); diff --git a/debian/changelog b/debian/changelog index 4f7c1a60c..5d5cdd564 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low are disabled. * comments: Fix permalinks for comments using new conflict-free filenames. * img: Support alignment of images with captions. (Giuseppe Bilotta) + * websetup: Fix utf-8 problems. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 diff --git a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn index c3a5262cd..debedb01c 100644 --- a/doc/bugs/utf-8_bug_in_websetup.pm.mdwn +++ b/doc/bugs/utf-8_bug_in_websetup.pm.mdwn @@ -4,6 +4,8 @@ I type chinese characters into the fields. After press "save setup" button the c I submit a patch that solve the problem for me. --Lingo +> Fully fixing it is slightly more complex, but now [[done]] --[[Joey]] + ---- --- websetup.pm 2009-12-02 05:07:46.000000000 +0800 -- cgit v1.2.3 From 1f51af907e93ee45b01a4a7f6015575522a3105d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Jan 2010 16:27:08 -0500 Subject: websetup: Fix bug in array change detection. --- IkiWiki/Plugin/websetup.pm | 6 +++++- debian/changelog | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 75aa3681c..e477bcc20 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -362,7 +362,11 @@ sub showform ($$) { @value=sort grep { length $_ } @value; my @oldvalue=sort grep { length $_ } (defined $config{$key} ? @{$config{$key}} : ()); - if ((@oldvalue) == (@value)) { + my $same=(@oldvalue) == (@value); + for (my $x=0; $same && $x < @value; $x++) { + $same=0 if $value[$x] ne $oldvalue[$x]; + } + if ($same) { delete $rebuild{$field}; } else { diff --git a/debian/changelog b/debian/changelog index 5d5cdd564..bd638b36f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * comments: Fix permalinks for comments using new conflict-free filenames. * img: Support alignment of images with captions. (Giuseppe Bilotta) * websetup: Fix utf-8 problems. + * websetup: Fix bug in array change detection. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From 9dc5685de44760d2c06a0376c97eb699de2f2964 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 9 Jan 2010 23:10:26 -0500 Subject: linkmap: Simplify and improve browser compatability by using an img, not object tag. I noticed that chromium was not hyperlinking the areas in the object-based linkmap, while img works ok. Dunno why, but img based is nicer anyway since it is allowed right through the htmlscrubber with no workarounds. --- IkiWiki/Plugin/linkmap.pm | 30 ++++-------------------------- debian/changelog | 2 ++ 2 files changed, 6 insertions(+), 26 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm index 28acbda32..68eb6c8c6 100644 --- a/IkiWiki/Plugin/linkmap.pm +++ b/IkiWiki/Plugin/linkmap.pm @@ -9,7 +9,6 @@ use IPC::Open2; sub import { hook(type => "getsetup", id => "linkmap", call => \&getsetup); hook(type => "preprocess", id => "linkmap", call => \&preprocess); - hook(type => "format", id => "linkmap", call => \&format); } sub getsetup () { @@ -21,34 +20,13 @@ sub getsetup () { } my $mapnum=0; -my %maps; sub preprocess (@) { my %params=@_; $params{pages}="*" unless defined $params{pages}; - # Can't just return the linkmap here, since the htmlscrubber - # scrubs out all tags (with good reason!) - # Instead, insert a placeholder tag, which will be expanded during - # formatting. $mapnum++; - $maps{$mapnum}=\%params; - return "
    "; -} - -sub format (@) { - my %params=@_; - - $params{content}=~s/
    <\/div>/genmap($1)/eg; - - return $params{content}; -} - -sub genmap ($) { - my $mapnum=shift; - return "" unless exists $maps{$mapnum}; - my %params=%{$maps{$mapnum}}; my $connected=IkiWiki::yesno($params{connected}); # Get all the items to map. @@ -102,10 +80,10 @@ sub genmap ($) { close OUT || error gettext("failed to run dot"); local $/=undef; - my $ret="\n". - . - ""; + my $ret="\"".gettext("linkmap").\n". + ; close IN || error gettext("failed to run dot"); waitpid $pid, 0; diff --git a/debian/changelog b/debian/changelog index bd638b36f..55213df9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * img: Support alignment of images with captions. (Giuseppe Bilotta) * websetup: Fix utf-8 problems. * websetup: Fix bug in array change detection. + * linkmap: Simplify and improve browser compatability by using an img, + not object tag. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From 97bc5d8bcacd482874d0050166ba3f7a87ef9fd1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 18 Jan 2010 12:08:26 -0500 Subject: typos --- IkiWiki/CGI.pm | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index cd4a5574c..bb26add9a 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -52,7 +52,7 @@ sub redirect ($$) { } sub decode_cgi_utf8 ($) { - # decode_form_utf8 method is needed for 5.10 + # decode_form_utf8 method is needed for 5.01 if ($] < 5.01) { my $cgi = shift; foreach my $f ($cgi->param) { diff --git a/debian/changelog b/debian/changelog index 55213df9c..f17eed3e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -262,7 +262,7 @@ ikiwiki (3.141592) unstable; urgency=low * Add new hooks: canremove, canrename, rename. (intrigeri) * rename: Refactor subpage rename handling code into rename hook. (intrigeri) - * po: New plugin, suporting translation of wiki pages using po files. + * po: New plugin, suporting translation of wiki pages using po files. (intrigeri) * Add build machinery to build po files to translate the underlay wikis, * Add further build machinery to generate translated underlays from -- cgit v1.2.3 From 8bf2f5a31ae3569b0c1c5b139640f7e8356a90f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 19 Jan 2010 23:42:04 -0500 Subject: handle git-notes breakage The new git-notes feature in git 1.6.6 changes git log output in a way that broke ikiwiki's parser if notes are added to commits. I decided to deal with this by disabling notes when ikiwiki uses git, by setting GIT_NOTES_REF="". AFAICS, looking up notes when dumping logs will only waste time, since it does not currently seem to make sense for ikiwiki to do anything with the notes. --- IkiWiki/Plugin/git.pm | 3 +++ debian/changelog | 3 +++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 786c7b1f2..1eec6aee6 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -51,6 +51,9 @@ sub checkconfig () { wrappermode => (defined $config{git_wrappermode} ? $config{git_wrappermode} : "06755"), }; } + + # Avoid notes, parser does not handle and they only slow things down. + $ENV{GIT_NOTES_REF}=""; # Run receive test only if being called by the wrapper, and not # when generating same. diff --git a/debian/changelog b/debian/changelog index f17eed3e5..6fbbe0a23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * websetup: Fix bug in array change detection. * linkmap: Simplify and improve browser compatability by using an img, not object tag. + * git: The new git-notes feature in git 1.6.6 changes git log output + in a way that broke ikiwiki's parser if notes are added to commits. + Deal with this. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From ee9ae0a3149f04e9373a0b7b1fece99f5cc78e9c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 21 Jan 2010 15:23:25 -0500 Subject: po: avoid crash when page is empty Note that there is an associated po4a warning when a page is empty: Use of uninitialized value $file in substitution (s///) at /usr/share/perl5/Locale/Po4a/Text.pm line 205. I've filed a bug with po4a about that, but the important thing is fixing the crash here. --- IkiWiki/Plugin/po.pm | 12 ++---------- debian/changelog | 1 + 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 02fc4a89e..f8801185e 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -1057,11 +1057,8 @@ sub commit_and_refresh ($$) { IkiWiki::saveindex(); } -# on success, returns the filtered content. -# on error, if $nonfatal, warn and return undef; else, error out. -sub po_to_markup ($$;$) { +sub po_to_markup ($$) { my ($page, $content) = (shift, shift); - my $nonfatal = shift; $content = '' unless defined $content; $content = decode_utf8(encode_utf8($content)); @@ -1084,10 +1081,6 @@ sub po_to_markup ($$;$) { my $fail = sub ($) { my $msg = "po(po_to_markup) - $page : " . shift; - if ($nonfatal) { - warn $msg; - return undef; - } error($msg, sub { unlink $infile, $outfile}); }; @@ -1108,8 +1101,7 @@ sub po_to_markup ($$;$) { $doc->write($outfile) or return $fail->(sprintf(gettext("failed to write %s"), $outfile)); - $content = readfile($outfile) - or return $fail->(sprintf(gettext("failed to read %s"), $outfile)); + $content = readfile($outfile); # Unlinking should happen automatically, thanks to File::Temp, # but it does not work here, probably because of the way writefile() diff --git a/debian/changelog b/debian/changelog index 6fbbe0a23..91f5d7807 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * git: The new git-notes feature in git 1.6.6 changes git log output in a way that broke ikiwiki's parser if notes are added to commits. Deal with this. + * po: Avoid crash when a page is empty. -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 -- cgit v1.2.3 From ac1b40643113893f9bc58bd92e23e2e94d475231 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 22 Jan 2010 16:25:22 -0500 Subject: releasing version 3.20100122 --- debian/changelog | 7 ++- ikiwiki.spec | 2 +- po/bg.po | 138 ++++++++++++++++++++++++++++--------------------------- po/cs.po | 137 +++++++++++++++++++++++++++--------------------------- po/da.po | 137 +++++++++++++++++++++++++++--------------------------- po/de.po | 137 +++++++++++++++++++++++++++--------------------------- po/es.po | 138 ++++++++++++++++++++++++++++--------------------------- po/fr.po | 137 +++++++++++++++++++++++++++--------------------------- po/gu.po | 138 ++++++++++++++++++++++++++++--------------------------- po/ikiwiki.pot | 89 ++++++++++++++++++----------------- po/it.po | 137 +++++++++++++++++++++++++++--------------------------- po/pl.po | 138 ++++++++++++++++++++++++++++--------------------------- po/sv.po | 138 ++++++++++++++++++++++++++++--------------------------- po/tr.po | 124 ++++++++++++++++++++++++------------------------- po/vi.po | 138 ++++++++++++++++++++++++++++--------------------------- 15 files changed, 886 insertions(+), 849 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 91f5d7807..4e76b1d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100104) UNRELEASED; urgency=low +ikiwiki (3.20100122) unstable; urgency=low * inline: Avoid showing edit links if page editing is disabled. (Sjoerd) @@ -8,14 +8,13 @@ ikiwiki (3.20100104) UNRELEASED; urgency=low * img: Support alignment of images with captions. (Giuseppe Bilotta) * websetup: Fix utf-8 problems. * websetup: Fix bug in array change detection. - * linkmap: Simplify and improve browser compatability by using an img, + * linkmap: Simplify and improve browser compatibility by using an img, not object tag. * git: The new git-notes feature in git 1.6.6 changes git log output in a way that broke ikiwiki's parser if notes are added to commits. - Deal with this. * po: Avoid crash when a page is empty. - -- Joey Hess Mon, 04 Jan 2010 12:53:24 -0500 + -- Joey Hess Fri, 22 Jan 2010 16:02:36 -0500 ikiwiki (3.20100102.3) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 78c32b962..044c7c033 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100102.3 +Version: 3.20100122 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 8f62d4652..810a16e95 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -16,46 +16,46 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Първо трябва да влезете." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 #, fuzzy msgid "Preferences" msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Предпочитанията са запазени." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Грешка" @@ -229,36 +229,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -328,38 +328,38 @@ msgstr "" msgid "fortune failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -453,16 +453,21 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 #, fuzzy msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" @@ -608,7 +613,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" @@ -662,23 +667,18 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1112 -#, fuzzy, perl-format -msgid "failed to read %s" -msgstr "грешка при запис на файла „%s”: %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -847,20 +847,20 @@ msgstr "обновяване на страницата „%s”" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -998,30 +998,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1036,54 +1036,54 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1099,16 +1099,16 @@ msgstr "грешка при четене на „%s”: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1181,25 +1181,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" @@ -1224,6 +1224,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "failed to read %s" +#~ msgstr "грешка при запис на файла „%s”: %s" + #~ msgid "discussion" #~ msgstr "дискусия" diff --git a/po/cs.po b/po/cs.po index 37374be28..399111069 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Nejprve se musíte přihlásit." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -27,35 +27,35 @@ msgstr "" "pravděpodobná chyba konfigurace: je nastavena proměnná sslcookie, ale " "Ezkoušíte se přihlásit přes http a ne přes https" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 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:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "Vaše sezení expirovalo." -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "Přihlášení" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Předvolby" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Správce" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Nastavení uloženo." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Chyba" @@ -227,36 +227,36 @@ msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat" msgid "comments on page '%s' are closed" msgstr "komentáře na stránce „%s“ jsou uzamčeny" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "komentář uložen pro schválení" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "Váš komentář bude zobrazen po schválení moderátorem" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "Přidán komentář" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "Komentáře" @@ -323,36 +323,36 @@ msgstr "musíte zadat formát a text" msgid "fortune failed" msgstr "fortune selhal" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "chybějící stránka" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "Stránka %s neexistuje." -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 msgid "not a page" msgstr "není stránkou" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" @@ -439,15 +439,20 @@ msgstr "Přidat nový příspěvek nazvaný:" msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "Stránka %s je zamknutá a nelze ji měnit" @@ -589,7 +594,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "sestavuji %s" @@ -647,22 +652,17 @@ msgstr "nepodařilo se přeložit %s" msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "nepodařilo se přečíst %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " @@ -830,20 +830,20 @@ msgstr "přejmenování %s" msgid "Also rename SubPages and attachments" msgstr "Také přejmenovat podstránky a přílohy" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "Najednou lze přejmenovat pouze jednu přílohu." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "Vyberte přílohu, kterou chcete přejmenovat." -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -971,24 +971,24 @@ msgstr "modul" msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "moduly" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -996,7 +996,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1013,12 +1013,12 @@ msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" msgid "bad file name %s" msgstr "chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1027,42 +1027,42 @@ msgstr "" "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s má několik možných zdrojových stránek" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "sestavuji %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není sestavována pomocí %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "sestavuji %s, která závisí na %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1078,16 +1078,16 @@ msgstr "nemohu číst %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "nepodporovaný systém pro správu verzí: %s" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" @@ -1158,25 +1158,25 @@ msgstr "nelze použít několik rcs modulů" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" @@ -1201,6 +1201,9 @@ msgstr "Který uživatel (wiki účet nebo openid) bude správce?" msgid "What is the domain name of the web server?" msgstr "Jaké je doménové jméno webového serveru?" +#~ msgid "failed to read %s" +#~ msgstr "nepodařilo se přečíst %s" + #~ msgid "Failed to parse url, cannot determine domain name" #~ msgstr "Nepodařilo se syntakticky rozebrat url, nelze určit doménová jméno." diff --git a/po/da.po b/po/da.po index 9801ca011..4bff9254c 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -19,11 +19,11 @@ msgstr "" "X-Poedit-Country: DENMARK\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Du skal først logge på." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -31,35 +31,35 @@ msgstr "" "mulig opsætningsfejl: sslcookie er sat, men du forsøger at logge på via " "http, ikke https" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "Din kørsel (login session) er udløbet" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "Pålogning" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Indstillinger" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Admin" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Indstillinger gemt" -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Fejl" @@ -234,36 +234,36 @@ msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "Kommentarer" @@ -330,37 +330,37 @@ msgstr "skal angive format og tekst" msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "kan ikke få sider til at passe sammen: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" @@ -450,15 +450,20 @@ msgstr "Tilføj nyt indlæg med følgende titel:" msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s er låst og kan ikke redigeres" @@ -605,7 +610,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "danner %s" @@ -663,22 +668,17 @@ msgstr "oversættelse af %s mislykkedes" msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "læsning af %s mislykkedes" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -845,20 +845,20 @@ msgstr "omdøb %s" msgid "Also rename SubPages and attachments" msgstr "Omdøb også UnderSider og vedhæftninger" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "Kun en vedhæftning kan blive omdøbt ad gangen." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "Vælg vedhæftningen som skal omdøbes." -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -986,26 +986,26 @@ msgstr "udvidelse" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "udvidelser" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1013,7 +1013,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1028,12 +1028,12 @@ msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1042,42 +1042,42 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1093,16 +1093,16 @@ msgstr "kan ikke læse %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "revisionskontrolsystem %s ikke understøttet" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" @@ -1174,25 +1174,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" @@ -1217,6 +1217,9 @@ msgstr "Hvilken bruger (wiki konto eller openid) skal være administrator?" msgid "What is the domain name of the web server?" msgstr "Hvad er webserverens domænenavn?" +#~ msgid "failed to read %s" +#~ msgstr "læsning af %s mislykkedes" + #~ msgid "Failed to parse url, cannot determine domain name" #~ msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" diff --git a/po/de.po b/po/de.po index e4b5ed9c4..53d0db850 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -15,11 +15,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Sie müssen sich zuerst anmelden." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -27,36 +27,36 @@ msgstr "" "vermutliche Fehlkonfiguration: sslcookie ist gesetzt, aber Sie versuchen " "sich via http anzumelden, nicht https" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "Ihre Anmeldezeit ist abgelaufen." -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "Anmelden" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Einstellungen" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Administrator" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Einstellungen gespeichert." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Fehler" @@ -232,36 +232,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "Kommentare zur Seite %s sind gesperrt" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "Der Kommentar wurde zur Moderation gespeichert" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "Ihr Kommentar wird nach Moderation verschickt" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "Kommentar hinzugefügt" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "Kommentare" @@ -328,37 +328,37 @@ msgstr "Format und Text müssen spezifiziert werden" msgid "fortune failed" msgstr "fortune fehlgeschlagen" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "Kann die Seiten nicht zuordnen: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" @@ -450,15 +450,20 @@ msgstr "Füge einen neuen Beitrag hinzu. Titel:" msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s ist gesperrt und kann nicht bearbeitet werden" @@ -608,7 +613,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "erzeuge %s" @@ -666,22 +671,17 @@ msgstr "übersetzen von %s fehlgeschlagen" msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "lesen von %s fehlgeschlagen" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -851,20 +851,20 @@ msgstr "benenne %s um" msgid "Also rename SubPages and attachments" msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" @@ -992,26 +992,26 @@ msgstr "Erweiterung" msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "Erweiterungen" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1019,7 +1019,7 @@ msgstr "" "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1037,12 +1037,12 @@ msgstr "" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1051,42 +1051,42 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1103,16 +1103,16 @@ msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "nicht unterstütztes Versionskontrollsystem %s" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1188,25 +1188,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" @@ -1231,6 +1231,9 @@ msgstr "Wer (Wiki-Konto oder OpenID) soll Administrator sein?" msgid "What is the domain name of the web server?" msgstr "Wie lautet der Domainname des Webservers?" +#~ msgid "failed to read %s" +#~ msgstr "lesen von %s fehlgeschlagen" + #~ msgid "Failed to parse url, cannot determine domain name" #~ msgstr "" #~ "auswerten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" diff --git a/po/es.po b/po/es.po index ca26b0bf6..de85edbdf 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -18,11 +18,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Antes es necesario identificarse." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -31,36 +31,36 @@ msgstr "" "activa, pero está intentando registrarse en el sistema vía el protocolo " "'http' y no 'https'" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 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:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "Su registro en el sistema ha expirado." -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "Identificación" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Preferencias" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Administración" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Error" @@ -236,36 +236,36 @@ msgstr "la página '%s' no existe, así que no se puede comentar sobre ella" msgid "comments on page '%s' are closed" msgstr "los comentarios para la página '%s' están cerrados" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "comentario guardado a la espera de aprobación" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "Su comentario será publicado después de que el moderador lo revise" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "Añadir un comentario" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "Comentarios" @@ -332,37 +332,37 @@ msgstr "se deben especificar tanto el formato como el texto" msgid "fortune failed" msgstr "el programa fortune ha fallado" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "no encuentro páginas coincidentes: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" @@ -454,15 +454,20 @@ msgstr "Añadir una entrada nueva titulada:" msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "La página %s está bloqueada y no puede modificarse" @@ -609,7 +614,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" @@ -663,23 +668,18 @@ msgstr "dimensionamiento fallido: %s" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1112 -#, fuzzy, perl-format -msgid "failed to read %s" -msgstr "no puedo leer de %s: %s " - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -845,20 +845,20 @@ msgstr "cambiando de nombre %s" msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -990,26 +990,26 @@ msgstr "complemento" msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "complementos" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1017,7 @@ msgstr "" "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1034,12 +1034,12 @@ msgstr "no puedo determinar el identificador de un usuario no fiable como %s" msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1048,44 +1048,44 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1101,16 +1101,16 @@ msgstr "no puedo leer el archivo %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "el sistema de control de versiones %s no está soportado" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1185,29 +1185,29 @@ msgstr "no puedo emplear varios complementos rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" @@ -1235,6 +1235,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "¿ Cuál es el dominio para el servidor web ?" +#, fuzzy +#~ msgid "failed to read %s" +#~ msgstr "no puedo leer de %s: %s " + #~ msgid "Failed to parse url, cannot determine domain name" #~ msgstr "" #~ "Error en el análisis del URL, no puedo determinar el nombre del dominio" diff --git a/po/fr.po b/po/fr.po index fbfb49a88..5ba71d6cf 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -17,11 +17,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Vous devez d'abord vous identifier." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -29,35 +29,35 @@ msgstr "" "Erreur de configuration probable : sslcookie est positionné mais vous tentez " "de vous connecter avec http au lieu de https" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Échec de l'identification, vous devez autoriser les cookies." -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "Session d'authentification expirée." -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Erreur" @@ -229,36 +229,36 @@ msgstr "La page '%s' n'existe pas, commentaire impossible." msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "Commentaires" @@ -325,36 +325,36 @@ msgstr "le format et le texte doivent être indiqués" msgid "fortune failed" msgstr "Échec du lancement de « fortune »" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 msgid "not a page" msgstr "Ce n'est pas une page." -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" @@ -446,15 +446,20 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s est verrouillé et ne peut être modifié" @@ -607,7 +612,7 @@ msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "construction de %s" @@ -665,22 +670,17 @@ msgstr "Impossible de traduire %s" msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "Impossible de lire %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " @@ -849,20 +849,20 @@ msgstr "%s renommé" msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -990,26 +990,26 @@ msgstr "greffon" msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "Greffons" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1017,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1033,12 +1033,12 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1047,42 +1047,42 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1100,16 +1100,16 @@ msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1184,25 +1184,25 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1227,6 +1227,9 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "failed to read %s" +#~ msgstr "Impossible de lire %s" + #~ msgid "Failed to parse url, cannot determine domain name" #~ msgstr "Impossible d'analyser l'URL, pas de nom de domaine" diff --git a/po/gu.po b/po/gu.po index 96e9ad184..83afdef4c 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -15,46 +15,46 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 #, fuzzy msgid "Preferences" msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "ક્ષતિ" @@ -227,36 +227,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -326,38 +326,38 @@ msgstr "" msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -448,15 +448,20 @@ msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેર msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" @@ -598,7 +603,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" @@ -652,23 +657,18 @@ msgstr "માપ બદલવામાં નિષ્ફળ: %s" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1112 -#, fuzzy, perl-format -msgid "failed to read %s" -msgstr "%s વાંચવામાં નિષ્ફળ: %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -837,20 +837,20 @@ msgstr "રેન્ડર કરે છે %s" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -984,30 +984,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1022,54 +1022,54 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1085,16 +1085,16 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1165,25 +1165,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" @@ -1208,6 +1208,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "failed to read %s" +#~ msgstr "%s વાંચવામાં નિષ્ફળ: %s" + #~ msgid "discussion" #~ msgstr "ચર્ચા" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 38a464141..f4749b841 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-02 21:47-0500\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,45 +16,45 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "" -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:318 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "" -#: ../IkiWiki/CGI.pm:282 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:409 ../IkiWiki/CGI.pm:410 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "" @@ -241,7 +241,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" @@ -338,18 +338,18 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -436,16 +436,20 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:621 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:102 ../IkiWiki/Plugin/linkmap.pm:109 -#: ../IkiWiki/Plugin/linkmap.pm:113 ../IkiWiki/Plugin/linkmap.pm:116 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" @@ -583,7 +587,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" @@ -637,22 +641,17 @@ msgstr "" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -959,30 +958,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -997,54 +996,54 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:483 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:492 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:615 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:628 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:693 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" diff --git a/po/it.po b/po/it.po index 7e0d3dd90..3b0f45348 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -13,11 +13,11 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Occorre prima effettuare l'accesso." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -25,35 +25,35 @@ msgstr "" "possibile errore di configurazione: sslcookie è impostato, ma si sta " "tentando un accesso via http, non https" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "La sessione è scaduta." -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "Entra" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Preferenze" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Amministrazione" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Preferenze salvate." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Errore" @@ -226,36 +226,36 @@ msgstr "la pagina «%s» non esiste, impossibile commentarla" msgid "comments on page '%s' are closed" msgstr "i commenti per la pagina «%s» sono chiusi" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "commento trattenuto per moderazione" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "Il commento sarà pubblicato dopo la verifica del moderatore" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "Aggiunto commento" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "moderazione commento" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "Commenti" @@ -322,36 +322,36 @@ msgstr "occorre specificare formato e testo" msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 msgid "not a page" msgstr "non è una pagina" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" @@ -441,15 +441,20 @@ msgstr "Aggiungere un nuovo articolo dal titolo:" msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "impossibile eseguire dot" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s è bloccata e non può essere modificata" @@ -598,7 +603,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "compilazione di %s" @@ -656,22 +661,17 @@ msgstr "impossibile tradurre %s" msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "impossibile leggere %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " @@ -841,20 +841,20 @@ msgstr "rinomina di %s" msgid "Also rename SubPages and attachments" msgstr "Rinomina anche SottoPagine e allegati" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "Si può rinominare un solo allegato alla volta." -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "Selezionare l'allegato da rinominare." -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -982,26 +982,26 @@ msgstr "plugin" msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "plugin" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1009,7 +1009,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1024,12 +1024,12 @@ msgstr "impossibile determinare l'id del committer non fidato %s" msgid "bad file name %s" msgstr "nome file %s scorretto" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "scansione %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1038,42 +1038,42 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1089,16 +1089,16 @@ msgstr "impossibile leggere %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "sistema di controllo di revisione %s non supportato" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "impossibile creare un repository tramite ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1170,25 +1170,25 @@ msgstr "impossibile usare più plugin rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" @@ -1213,6 +1213,9 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" +#~ msgid "failed to read %s" +#~ msgstr "impossibile leggere %s" + #~ msgid "Failed to parse url, cannot determine domain name" #~ msgstr "" #~ "Errore nell'interpretazione dell'URL, impossibile determinare il nome del " diff --git a/po/pl.po b/po/pl.po index 81addd8d9..203155cfb 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -16,48 +16,48 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Proszę najpierw zalogować się." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 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:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 #, fuzzy msgid "Preferences" msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Preferencje zapisane." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Błąd" @@ -231,36 +231,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -330,38 +330,38 @@ msgstr "" msgid "fortune failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -455,16 +455,21 @@ msgstr "Tytuł nowego wpisu" msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 #, fuzzy msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" @@ -611,7 +616,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" @@ -665,23 +670,18 @@ msgstr "awaria w trakcie zmiany rozmiaru: %s" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1112 -#, fuzzy, perl-format -msgid "failed to read %s" -msgstr "awaria w trakcie odczytu %s: %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -852,20 +852,20 @@ msgstr "renderowanie %s" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -1006,30 +1006,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1044,54 +1044,54 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1107,16 +1107,16 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1189,25 +1189,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" @@ -1232,6 +1232,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "failed to read %s" +#~ msgstr "awaria w trakcie odczytu %s: %s" + #~ msgid "discussion" #~ msgstr "dyskusja" diff --git a/po/sv.po b/po/sv.po index 21a65ae5d..49518e2a8 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -15,46 +15,46 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Du måste logga in först." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 #, fuzzy msgid "Preferences" msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Inställningar sparades." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Fel" @@ -228,36 +228,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -327,38 +327,38 @@ msgstr "" msgid "fortune failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -450,16 +450,21 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 #, fuzzy msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s är låst av %s och kan inte redigeras" @@ -604,7 +609,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" @@ -658,23 +663,18 @@ msgstr "misslyckades med att skriva %s: %s" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1112 -#, fuzzy, perl-format -msgid "failed to read %s" -msgstr "misslyckades med att skriva %s: %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -842,20 +842,20 @@ msgstr "ritar upp %s" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -993,30 +993,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1031,54 +1031,54 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1094,16 +1094,16 @@ msgstr "kan inte läsa %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1174,25 +1174,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" @@ -1217,6 +1217,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "failed to read %s" +#~ msgstr "misslyckades med att skriva %s: %s" + #~ msgid "discussion" #~ msgstr "diskussion" diff --git a/po/tr.po b/po/tr.po index f3bce9f4f..113427f9b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-02 13:10-0500\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -13,45 +13,45 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Önce sisteme giriş yapmanız gerekiyor." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "Giriş" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 msgid "Preferences" msgstr "Tercihler" -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "Yönet" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Tercihler kaydedildi." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Hata" @@ -221,36 +221,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -317,36 +317,36 @@ msgstr "" msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -433,15 +433,20 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:621 +#: ../IkiWiki/Plugin/inline.pm:624 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" @@ -579,7 +584,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:652 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" @@ -633,22 +638,17 @@ msgstr "" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1112 -#, perl-format -msgid "failed to read %s" -msgstr "" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -814,20 +814,20 @@ msgstr "" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -955,30 +955,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -993,54 +993,54 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:410 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:483 +#: ../IkiWiki/Render.pm:486 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:492 +#: ../IkiWiki/Render.pm:495 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:615 +#: ../IkiWiki/Render.pm:618 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:628 +#: ../IkiWiki/Render.pm:631 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:693 +#: ../IkiWiki/Render.pm:696 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1056,16 +1056,16 @@ msgstr "" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" diff --git a/po/vi.po b/po/vi.po index 03ff3bf76..9fccf87b5 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-31 18:31-0400\n" +"POT-Creation-Date: 2010-01-22 16:04-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -16,46 +16,46 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.6fc1\n" -#: ../IkiWiki/CGI.pm:114 +#: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." msgstr "Trước tiên bạn cần phải đăng nhập." -#: ../IkiWiki/CGI.pm:147 +#: ../IkiWiki/CGI.pm:149 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" msgstr "" -#: ../IkiWiki/CGI.pm:150 +#: ../IkiWiki/CGI.pm:152 msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/CGI.pm:169 ../IkiWiki/CGI.pm:314 +#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 msgid "Your login session has expired." msgstr "" -#: ../IkiWiki/CGI.pm:190 +#: ../IkiWiki/CGI.pm:192 msgid "Login" msgstr "" -#: ../IkiWiki/CGI.pm:191 +#: ../IkiWiki/CGI.pm:193 #, fuzzy msgid "Preferences" msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:194 msgid "Admin" msgstr "" -#: ../IkiWiki/CGI.pm:232 +#: ../IkiWiki/CGI.pm:234 msgid "Preferences saved." msgstr "Tùy thích đã được lưu." -#: ../IkiWiki/CGI.pm:278 +#: ../IkiWiki/CGI.pm:284 msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:405 ../IkiWiki/CGI.pm:406 ../IkiWiki.pm:1282 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 msgid "Error" msgstr "Lỗi" @@ -229,36 +229,36 @@ msgstr "" msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:467 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:482 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:486 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:579 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:618 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comments" msgstr "" @@ -328,38 +328,38 @@ msgstr "" msgid "fortune failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:73 +#: ../IkiWiki/Plugin/getsource.pm:74 #, fuzzy msgid "not a page" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:75 +#: ../IkiWiki/Plugin/getsource.pm:76 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:651 ../IkiWiki/Plugin/git.pm:669 +#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:691 +#: ../IkiWiki/Plugin/git.pm:697 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:695 +#: ../IkiWiki/Plugin/git.pm:701 msgid "you are not allowed to change file modes" msgstr "" @@ -453,16 +453,21 @@ msgstr "" msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:598 +#: ../IkiWiki/Plugin/inline.pm:624 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" -#: ../IkiWiki/Plugin/linkmap.pm:101 +#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 +#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 #, fuzzy msgid "failed to run dot" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/lockedit.pm:47 +#: ../IkiWiki/Plugin/linkmap.pm:84 +msgid "linkmap" +msgstr "" + +#: ../IkiWiki/Plugin/lockedit.pm:48 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s bị %s khoá nên không thể sửa được" @@ -605,7 +610,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:638 +#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" @@ -659,23 +664,18 @@ msgstr "lỗi ghi %s: %s" msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1095 ../IkiWiki/Plugin/po.pm:1109 -#: ../IkiWiki/Plugin/po.pm:1149 +#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1141 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1107 +#: ../IkiWiki/Plugin/po.pm:1100 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1112 -#, fuzzy, perl-format -msgid "failed to read %s" -msgstr "lỗi ghi %s: %s" - -#: ../IkiWiki/Plugin/po.pm:1161 +#: ../IkiWiki/Plugin/po.pm:1153 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -843,20 +843,20 @@ msgstr "đang vẽ %s" msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:247 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:250 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:347 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:571 +#: ../IkiWiki/Plugin/rename.pm:572 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -994,30 +994,30 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/websetup.pm:244 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:257 +#: ../IkiWiki/Plugin/websetup.pm:261 msgid "plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:395 +#: ../IkiWiki/Plugin/websetup.pm:404 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:399 +#: ../IkiWiki/Plugin/websetup.pm:408 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:436 +#: ../IkiWiki/Plugin/websetup.pm:445 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1032,54 +1032,54 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:150 +#: ../IkiWiki/Render.pm:153 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:271 +#: ../IkiWiki/Render.pm:274 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:300 ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:305 +#: ../IkiWiki/Render.pm:308 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:395 +#: ../IkiWiki/Render.pm:413 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:471 +#: ../IkiWiki/Render.pm:486 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:480 +#: ../IkiWiki/Render.pm:495 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:603 +#: ../IkiWiki/Render.pm:618 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:616 +#: ../IkiWiki/Render.pm:631 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:696 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1095,16 +1095,16 @@ msgstr "không thể đọc %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:76 +#: ../IkiWiki/Setup/Automator.pm:79 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:102 +#: ../IkiWiki/Setup/Automator.pm:105 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:120 +#: ../IkiWiki/Setup/Automator.pm:123 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1175,25 +1175,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1264 +#: ../IkiWiki.pm:1263 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1863 +#: ../IkiWiki.pm:1862 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2006 +#: ../IkiWiki.pm:2005 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2017 +#: ../IkiWiki.pm:2016 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2036 +#: ../IkiWiki.pm:2035 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1218,6 +1218,10 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "failed to read %s" +#~ msgstr "lỗi ghi %s: %s" + #~ msgid "discussion" #~ msgstr "thảo luận" -- cgit v1.2.3 From 73253d6925ef84f9dd9e72919f8a136b93a0d277 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 26 Jan 2010 22:26:50 -0500 Subject: template: Preprocess parameters before htmlizing. Consider a template like: [[!template type=note text=""" [[!inline pages="*foo*"]] """]] The text parameter is htmlized before being passed into the template (in case the template wraps it in a that prevents markdown from htmlizing it later). But, when markdown sees "*foo*", it turns that into foo. Later, when preprocessing the inline directive, that leads to suprising results. To fix this, I made template parameters be preprocessed (and filtered) before being htmlized. Note that I left in the preprocessing (and filtering) of the template output at the end. That's still relevant when the template itself contains preprocessor directives. --- IkiWiki/Plugin/template.pm | 19 +++++++++++-------- debian/changelog | 6 ++++++ 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index b6097bb49..39d9667f9 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -25,6 +25,10 @@ sub getsetup () { sub preprocess (@) { my %params=@_; + # This needs to run even in scan mode, in order to process + # links and other metadata included via the template. + my $scan=! defined wantarray; + if (! exists $params{id}) { error gettext("missing id parameter") } @@ -58,24 +62,23 @@ sub preprocess (@) { $params{basename}=IkiWiki::basename($params{page}); foreach my $param (keys %params) { + my $value=IkiWiki::preprocess($params{page}, $params{destpage}, + IkiWiki::filter($params{page}, $params{destpagea}, + $params{$param}), $scan); if ($template->query(name => $param)) { $template->param($param => IkiWiki::htmlize($params{page}, $params{destpage}, pagetype($pagesources{$params{page}}), - $params{$param})); + $value)); } if ($template->query(name => "raw_$param")) { - $template->param("raw_$param" => $params{$param}); + $template->param("raw_$param" => $value); } } - # This needs to run even in scan mode, in order to process - # links and other metadata includes via the template. - my $scan=! defined wantarray; - return IkiWiki::preprocess($params{page}, $params{destpage}, - IkiWiki::filter($params{page}, $params{destpage}, - $template->output), $scan); + IkiWiki::filter($params{page}, $params{destpage}, + $template->output), $scan); } 1 diff --git a/debian/changelog b/debian/changelog index 4e76b1d69..0ec696d3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100123) UNRELEASED; urgency=low + + * template: Preprocess parameters before htmlizing. + + -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 + ikiwiki (3.20100122) unstable; urgency=low * inline: Avoid showing edit links if page editing is disabled. -- cgit v1.2.3 From f91d79f469956c423373c8747c92218c668f0ba8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 28 Jan 2010 21:07:23 -0500 Subject: img: Fix a bug that could taint @links with undef values. --- IkiWiki/Plugin/img.pm | 4 ++++ debian/changelog | 1 + 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index c1048d3c9..82db15a7e 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -26,6 +26,10 @@ sub preprocess (@) { my ($image) = $_[0] =~ /$config{wiki_file_regexp}/; # untaint my %params=@_; + if (! defined $image) { + error("bad image filename"); + } + if (exists $imgdefaults{$params{page}}) { foreach my $key (keys %{$imgdefaults{$params{page}}}) { if (! exists $params{$key}) { diff --git a/debian/changelog b/debian/changelog index 0ec696d3c..5d27b7af0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * template: Preprocess parameters before htmlizing. + * img: Fix a bug that could taint @links with undef values. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From 49d8c5b821743355fa60b30e1b2b456c44aaa221 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 1 Feb 2010 15:18:53 -0500 Subject: setup automator: Configure Term::Readline to use bold for prompt, rather than default underline. Closes: #517656 --- IkiWiki/Setup/Automator.pm | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 7af93e73c..9fee4dcb7 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -15,6 +15,7 @@ sub ask ($$) { my ($question, $default)=@_; my $r=Term::ReadLine->new("ikiwiki"); + $r->ornaments("md,me"); $r->readline(encode_utf8($question)." ", $default); } diff --git a/debian/changelog b/debian/changelog index 5d27b7af0..8e01950a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * template: Preprocess parameters before htmlizing. * img: Fix a bug that could taint @links with undef values. + * setup automator: Configure Term::Readline to use bold for prompt, rather + than default underline. Closes: #517656 -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From 345b40c65288874e458e2bec51f81f429f0b3db1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Feb 2010 14:51:56 -0500 Subject: Allow jumping directly into account registration process by going to ikiwiki.cgi?do=register --- IkiWiki/Plugin/passwordauth.pm | 16 ++++++++++++---- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 8cf5af51e..1898030b5 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -104,11 +104,11 @@ sub formbuilder_setup (@) { my $session=$params{session}; my $cgi=$params{cgi}; - if ($form->title eq "signin" || $form->title eq "register") { + if ($form->title eq "signin" || $form->title eq "register" || $cgi->param("do") eq "register") { $form->field(name => "name", required => 0); $form->field(name => "password", type => "password", required => 0); - if ($form->submitted eq "Register" || $form->submitted eq "Create Account") { + if ($form->submitted eq "Register" || $form->submitted eq "Create Account" || $cgi->param("do") eq "register") { $form->field(name => "confirm_password", type => "password"); $form->field(name => "account_creation_password", type => "password") if (defined $config{account_creation_password} && @@ -232,7 +232,7 @@ sub formbuilder (@) { my $buttons=$params{buttons}; if ($form->title eq "signin" || $form->title eq "register") { - if ($form->submitted && $form->validate) { + if (($form->submitted && $form->validate) || $cgi->param("do") eq "register") { if ($form->submitted eq 'Login') { $session->param("name", $form->field("name")); IkiWiki::cgi_postsignin($cgi, $session); @@ -295,7 +295,7 @@ sub formbuilder (@) { $form->field(name => "name", required => 0); push @$buttons, "Reset Password"; } - elsif ($form->submitted eq "Register") { + elsif ($form->submitted eq "Register" || $cgi->param("do") eq "register") { @$buttons="Create Account"; } } @@ -336,6 +336,14 @@ sub sessioncgi ($$) { IkiWiki::cgi_prefs($q, $session); exit; } + elsif ($q->param("do") eq "register") { + # After registration, need to go somewhere, so show prefs page. + $session->param(postsignin => "do=prefs"); + # Due to do=register, this will run in registration-only + # mode. + IkiWiki::cgi_signin($q, $session); + exit; + } } sub auth ($$) { diff --git a/debian/changelog b/debian/changelog index 8e01950a8..7beb0db82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * img: Fix a bug that could taint @links with undef values. * setup automator: Configure Term::Readline to use bold for prompt, rather than default underline. Closes: #517656 + * Allow jumping directly into account registration process by going to + ikiwiki.cgi?do=register -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From b547170a965e93a759de1612d4ce64d38eeea59c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Feb 2010 15:07:10 -0500 Subject: Improve display of openid in preferences page. Now that openiduser is in IkiWiki core, it's ok to have passwordauth check for it, and avoid displaying useless password fields when showing preferences for an openid. Also improved the styling of the display of the openid in the preferneces page. --- IkiWiki/Plugin/openid.pm | 14 +++++++------- IkiWiki/Plugin/passwordauth.pm | 3 ++- debian/changelog | 1 + 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index dc0e0f48e..b60740c0e 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -82,13 +82,13 @@ sub formbuilder_setup (@) { } } } - elsif ($form->title eq "preferences") { - if (! defined $form->field(name => "name")) { - $form->field(name => "OpenID", disabled => 1, - value => $session->param("name"), - size => 50, force => 1, - fieldset => "login"); - } + elsif ($form->title eq "preferences" && + IkiWiki::openiduser($session->param("name"))) { + $form->field(name => "openid_url", disabled => 1, + label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), + value => $session->param("name"), + size => 50, force => 1, + fieldset => "login"); } } diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 1898030b5..b70f9b788 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -206,7 +206,8 @@ sub formbuilder_setup (@) { } } } - elsif ($form->title eq "preferences") { + elsif ($form->title eq "preferences" && + IkiWiki::openiduser($session->param("name"))) { $form->field(name => "name", disabled => 1, value => $session->param("name"), force => 1, fieldset => "login"); diff --git a/debian/changelog b/debian/changelog index 7beb0db82..9867cf75a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low than default underline. Closes: #517656 * Allow jumping directly into account registration process by going to ikiwiki.cgi?do=register + * Improve display of openid in preferences page. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From a2e78ebcf27680eedf30e00f1ee9b86ed1d9e127 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 4 Feb 2010 15:30:41 -0500 Subject: Add link to userpage (or creation link) to top of preferences page. --- IkiWiki/Plugin/passwordauth.pm | 44 ++++++++++++++++++++++++++++-------------- debian/changelog | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 94c5b0492..b3a798055 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -206,21 +206,35 @@ sub formbuilder_setup (@) { } } } - elsif ($form->title eq "preferences" && - ! IkiWiki::openiduser($session->param("name"))) { - $form->field(name => "name", disabled => 1, - value => $session->param("name"), force => 1, - fieldset => "login"); - $form->field(name => "password", type => "password", - fieldset => "login", - validate => sub { - shift eq $form->field("confirm_password"); - }), - $form->field(name => "confirm_password", type => "password", - fieldset => "login", - validate => sub { - shift eq $form->field("password"); - }), + elsif ($form->title eq "preferences") { + my $user=$session->param("name"); + if (! IkiWiki::openiduser($user)) { + $form->field(name => "name", disabled => 1, + value => $user, force => 1, + fieldset => "login"); + $form->field(name => "password", type => "password", + fieldset => "login", + validate => sub { + shift eq $form->field("confirm_password"); + }); + $form->field(name => "confirm_password", type => "password", + fieldset => "login", + validate => sub { + shift eq $form->field("password"); + }); + + my $userpage=$config{userdir} ? $config{userdir}."/".$user : $user; + if (exists $pagesources{$userpage}) { + $form->text(gettext("Your user page: "). + htmllink("", "", $userpage, + noimageinline => 1)); + } + else { + $form->text(" "edit", page => $userpage). + "\">".gettext("Create your user page").""); + } + } } } diff --git a/debian/changelog b/debian/changelog index 9867cf75a..e07bada28 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * Allow jumping directly into account registration process by going to ikiwiki.cgi?do=register * Improve display of openid in preferences page. + * Add link to userpage (or creation link) to top of preferences page. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From eda1d1321b7510d717c236b668e430bf1f656bed Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Feb 2010 15:53:54 -0500 Subject: auto-blog.setup: Lock all pages, so only admin can post to the blog by default. --- auto-blog.setup | 1 + debian/changelog | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/auto-blog.setup b/auto-blog.setup index 82aa8d415..e3059e32e 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -47,4 +47,5 @@ IkiWiki::Setup::Automator->import( comments_pagespec => "posts/* and !*/Discussion", blogspam_pagespec => "postcomment(*)", discussion => 0, + locked_pages => "*", ) diff --git a/debian/changelog b/debian/changelog index e07bada28..b4acac633 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low ikiwiki.cgi?do=register * Improve display of openid in preferences page. * Add link to userpage (or creation link) to top of preferences page. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From b384af237df92e787f84f845d0d2bc182f7775ff Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Feb 2010 16:19:17 -0500 Subject: opendiscussion: This plugin will also now allow posting comments to otherwise locked-down sites. --- IkiWiki/Plugin/opendiscussion.pm | 1 + debian/changelog | 2 ++ doc/plugins/comments.mdwn | 4 ++-- doc/plugins/lockedit.mdwn | 11 +++-------- doc/plugins/opendiscussion.mdwn | 5 +++-- 5 files changed, 11 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 4b91f5d83..5a455940b 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -25,6 +25,7 @@ sub canedit ($$) { my $session=shift; return "" if $page=~/(\/|^)\Q$config{discussionpage}\E$/i; + return "" if pagespec_match($page, "postcomment(*)"); return undef; } diff --git a/debian/changelog b/debian/changelog index b4acac633..a65592277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * Add link to userpage (or creation link) to top of preferences page. * auto-blog.setup: Lock all pages, so only admin can post to the blog by default. + * opendiscussion: This plugin will also now allow posting comments + to otherwise locked-down sites. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 diff --git a/doc/plugins/comments.mdwn b/doc/plugins/comments.mdwn index b6d4d252b..f933d32be 100644 --- a/doc/plugins/comments.mdwn +++ b/doc/plugins/comments.mdwn @@ -14,8 +14,8 @@ authorship should hopefully be unforgeable by CGI users. The intention is that on a non-wiki site (like a blog) you can lock all pages for admin-only access, then allow otherwise unprivileged (or perhaps even anonymous) users to comment on posts. See the documentation of the -[[lockedit]] and [[anonok]] pages for details on locking down a wiki so -users can only post comments. +[[opendiscussion]], [[lockedit]] and [[anonok]] pages for details on locking +down a wiki so readers can only post comments. Individual comments are stored as internal-use pages named something like `page/comment_1`, `page/comment_2`, etc. These pages internally use a diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn index c8f64ea47..681163203 100644 --- a/doc/plugins/lockedit.mdwn +++ b/doc/plugins/lockedit.mdwn @@ -12,14 +12,9 @@ to lock. For example, you could choose to lock all pages created before 2006, or all pages that are linked to from the page named "locked". More usually though, you'll just list some names of pages to lock. -One handy thing to do if you're using ikiwiki for your blog is to lock -"* and !*/Discussion". This prevents others from adding to or modifying -posts in your blog, while still letting them comment via the Discussion -pages. - -Alternatively, if you're using the [[comments]] plugin, you can lock -"!postcomment(*)" to allow users to comment on pages, but not edit anything -else. +If you want to lock down a blog so only you can post to it, you can just +lock "*", and enable the [[opendiscussion]] plugin, so readers can still post +[[comments]]. Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]] can specify that some pages are not locked for some users. For example, diff --git a/doc/plugins/opendiscussion.mdwn b/doc/plugins/opendiscussion.mdwn index b2ba68bf7..3b5ab4858 100644 --- a/doc/plugins/opendiscussion.mdwn +++ b/doc/plugins/opendiscussion.mdwn @@ -1,5 +1,6 @@ [[!template id=plugin name=opendiscussion author="[[Joey]]"]] [[!tag type/auth]] -This plugin allows editing of Discussion pages by anonymous users who have -not logged into the wiki. +This plugin allows editing of Discussion pages, and posting of comments, +even when the [[lockedit]] plugin has been configured to otherwise prevent +editing. -- cgit v1.2.3 From caa5db6c54c5c6368d511214961e749f5451379c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Feb 2010 16:20:03 -0500 Subject: add opendiscussion to auto-blog.setup --- auto-blog.setup | 2 +- debian/changelog | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/auto-blog.setup b/auto-blog.setup index e3059e32e..7ff413187 100644 --- a/auto-blog.setup +++ b/auto-blog.setup @@ -36,7 +36,7 @@ IkiWiki::Setup::Automator->import( cgiurl => "http://$domain/~$ENV{USER}/$wikiname_short/ikiwiki.cgi", cgi_wrapper => "$ENV{HOME}/public_html/$wikiname_short/ikiwiki.cgi", adminemail => "$ENV{USER}\@$domain", - add_plugins => [qw{goodstuff websetup comments blogspam}], + add_plugins => [qw{goodstuff websetup comments opendiscussion blogspam}], disable_plugins => [qw{}], libdir => "$ENV{HOME}/.ikiwiki", rss => 1, diff --git a/debian/changelog b/debian/changelog index a65592277..794dec418 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,10 +8,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low ikiwiki.cgi?do=register * Improve display of openid in preferences page. * Add link to userpage (or creation link) to top of preferences page. - * auto-blog.setup: Lock all pages, so only admin can post to the blog - by default. * opendiscussion: This plugin will also now allow posting comments to otherwise locked-down sites. + * auto-blog.setup: Lock all pages, so only admin can post to the blog + by default, and enable opendiscussion so others can comment. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From 5a2de27947d084f73fdbbc55028af378f62b42b3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 6 Feb 2010 16:25:39 -0500 Subject: Fix color and format plugins to appear in the websetup interface. --- IkiWiki/Plugin/color.pm | 9 +++++++++ IkiWiki/Plugin/format.pm | 9 +++++++++ debian/changelog | 1 + 3 files changed, 19 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/color.pm b/IkiWiki/Plugin/color.pm index 20505893b..b9407ba28 100644 --- a/IkiWiki/Plugin/color.pm +++ b/IkiWiki/Plugin/color.pm @@ -10,6 +10,15 @@ use IkiWiki 3.00; sub import { hook(type => "preprocess", id => "color", call => \&preprocess); hook(type => "format", id => "color", call => \&format); + hook(type => "getsetup", id => "color", call => \&getsetup); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, } sub preserve_style ($$$) { diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm index 1513cbed7..c8041209f 100644 --- a/IkiWiki/Plugin/format.pm +++ b/IkiWiki/Plugin/format.pm @@ -7,6 +7,15 @@ use IkiWiki 3.00; sub import { hook(type => "preprocess", id => "format", call => \&preprocess); + hook(type => "getsetup", id => "format", call => \&getsetup); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, } sub preprocess (@) { diff --git a/debian/changelog b/debian/changelog index 794dec418..06d11aa29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low to otherwise locked-down sites. * auto-blog.setup: Lock all pages, so only admin can post to the blog by default, and enable opendiscussion so others can comment. + * Fix color and format plugins to appear in the websetup interface. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From a4ec579d1a6632447db91f2e52e90633b96a070f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Feb 2010 16:24:14 -0500 Subject: amazon_s3: Fix to support the EU S3 datacenter, which is more picky about attempts to create already existing buckets. --- IkiWiki/Plugin/amazon_s3.pm | 6 +++++- debian/changelog | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm index 3571c4189..cfd8cd347 100644 --- a/IkiWiki/Plugin/amazon_s3.pm +++ b/IkiWiki/Plugin/amazon_s3.pm @@ -132,6 +132,10 @@ sub getbucket { }); } + if (! $bucket) { + # Try to use existing bucket. + $bucket=$s3->bucket($config{amazon_s3_bucket}); + } if (! $bucket) { error(gettext("Failed to create S3 bucket: "). $s3->err.": ".$s3->errstr."\n"); @@ -178,7 +182,7 @@ sub writefile ($$$;$$) { # First, write the file to disk. my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer); - + my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file"); # Store the data in S3. diff --git a/debian/changelog b/debian/changelog index 06d11aa29..358a5dc5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * auto-blog.setup: Lock all pages, so only admin can post to the blog by default, and enable opendiscussion so others can comment. * Fix color and format plugins to appear in the websetup interface. + * amazon_s3: Fix to support the EU S3 datacenter, which is more picky + about attempts to create already existing buckets. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 -- cgit v1.2.3 From 046095552ac231366d71a3c7a84bdc6d46662212 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Feb 2010 17:26:09 -0500 Subject: httpauth: When cgiauthurl is configured, httpauth can now be used alongside other authentication methods (like openid or anonok). Rather than always redirect to the cgiauthurl for authentication, there is now a button on the login form to use it. --- IkiWiki/Plugin/httpauth.pm | 35 +++++++++++++++++++++++++++++++---- IkiWiki/Plugin/openid.pm | 2 +- debian/changelog | 4 ++++ doc/bugs/anonok_vs._httpauth.mdwn | 2 ++ doc/plugins/httpauth.mdwn | 9 +++++---- 5 files changed, 43 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index a18f8ca54..d0d4da0b7 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -11,6 +11,8 @@ sub import { hook(type => "auth", id => "httpauth", call => \&auth); hook(type => "canedit", id => "httpauth", call => \&canedit, last => 1); + hook(type => "formbuilder_setup", id => "httpauth", + call => \&formbuilder_setup); } sub getsetup () { @@ -27,6 +29,14 @@ sub getsetup () { rebuild => 0, }, } + +sub redir_cgiauthurl ($$) { + my $cgi=shift; + my $params=shift; + + IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params); + exit; +} sub auth ($$) { my $cgi=shift; @@ -43,14 +53,31 @@ sub canedit ($$$) { my $session=shift; if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) { - return sub { - IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string()); - exit; - }; + return sub { redir_cgiauthurl($cgi, $cgi->query_string()) }; } else { return undef; } } +sub formbuilder_setup (@) { + my %params=@_; + + my $form=$params{form}; + my $session=$params{session}; + my $cgi=$params{cgi}; + my $buttons=$params{buttons}; + + if ($form->title eq "signin" && + ! defined $cgi->remote_user() && defined $config{cgiauthurl}) { + my $button_text="Login with HTTP auth"; + push @$buttons, $button_text; + + if ($form->submitted && $form->submitted eq $button_text) { + redir_cgiauthurl($cgi, "do=postsignin"); + exit; + } + } +} + 1 diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index b60740c0e..382d8286f 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -56,7 +56,7 @@ sub formbuilder_setup (@) { # OpenID fieldset. $form->fieldsets("OpenID"); - $form->field( + $form->field( name => "openid_url", label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), fieldset => "OpenID", diff --git a/debian/changelog b/debian/changelog index 358a5dc5c..3dd68558e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,10 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * Fix color and format plugins to appear in the websetup interface. * amazon_s3: Fix to support the EU S3 datacenter, which is more picky about attempts to create already existing buckets. + * httpauth: When cgiauthurl is configured, httpauth can now be used + alongside other authentication methods (like openid or anonok). Rather + than always redirect to the cgiauthurl for authentication, there is now + a button on the login form to use it. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn index b738e3b6c..bff37e18b 100644 --- a/doc/bugs/anonok_vs._httpauth.mdwn +++ b/doc/bugs/anonok_vs._httpauth.mdwn @@ -114,3 +114,5 @@ index 127c321..a18f8ca 100644 >> time that httpauth is redirecting to the cgiauthurl. As mentioned above, >> the only way to deal with that would be to add a link to the signin page >> that does the httpauth signin. --[[Joey]] + +>>> That's dealt with in final version. [[done]] --[[Joey]] diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn index 77796a3d7..a7aac558b 100644 --- a/doc/plugins/httpauth.mdwn +++ b/doc/plugins/httpauth.mdwn @@ -14,10 +14,11 @@ signed into the wiki. This method is suitable only for private wikis. ## separate cgiauthurl To use httpauth for a wiki where the content is public, and where -the `ikiwiki.cgi` needs to be usable without authentication (for searching -and so on), you can configure a separate url that is used for -authentication, via the `cgiauthurl` option in the setup file. This -url will then be redirected to whenever authentication is needed. +the `ikiwiki.cgi` needs to be usable without authentication (for searching, +or logging in using other methods, and so on), you can configure a separate +url that is used for authentication, via the `cgiauthurl` option in the setup +file. This url will then be redirected to when a user chooses to log in using +httpauth. A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` into it. Then configure the web server to require authentication only for -- cgit v1.2.3 From e11876b7003c700fbc3717ca9c5af5aac3b72ac2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Feb 2010 18:25:10 -0500 Subject: httpauth: Add httpauth_pagespec setting that can be used to limit pages to only being edited via users authed with httpauth. --- IkiWiki.pm | 7 ++++- IkiWiki/Plugin/httpauth.pm | 75 +++++++++++++++++++++++++++++++++------------- debian/changelog | 2 ++ doc/plugins/httpauth.mdwn | 9 ++++++ 4 files changed, 72 insertions(+), 21 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 2a0132745..de7dbfc79 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -941,7 +941,12 @@ sub linkpage ($) { sub cgiurl (@) { my %params=@_; - return $config{cgiurl}."?". + my $cgiurl=$config{cgiurl}; + if (exists $params{cgiurl}) { + $cgiurl=$params{cgiurl}; + delete $params{cgiurl}; + } + return $cgiurl."?". join("&", map $_."=".uri_escape_utf8($params{$_}), keys %params); } diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index d0d4da0b7..202ca1153 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -9,10 +9,10 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "httpauth", call => \&getsetup); hook(type => "auth", id => "httpauth", call => \&auth); - hook(type => "canedit", id => "httpauth", call => \&canedit, - last => 1); hook(type => "formbuilder_setup", id => "httpauth", call => \&formbuilder_setup); + hook(type => "canedit", id => "httpauth", call => \&canedit); + hook(type => "pagetemplate", id => "httpauth", call => \&pagetemplate); } sub getsetup () { @@ -28,13 +28,20 @@ sub getsetup () { safe => 1, rebuild => 0, }, + httpauth_pagespec => { + type => "pagespec", + example => "!*/Discussion", + description => "PageSpec of pages where only httpauth will be used for authentication", + safe => 0, + rebuild => 0, + }, } -sub redir_cgiauthurl ($$) { +sub redir_cgiauthurl ($;@) { my $cgi=shift; - my $params=shift; - IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params); + IkiWiki::redirect($cgi, + IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_)); exit; } @@ -47,19 +54,6 @@ sub auth ($$) { } } -sub canedit ($$$) { - my $page=shift; - my $cgi=shift; - my $session=shift; - - if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) { - return sub { redir_cgiauthurl($cgi, $cgi->query_string()) }; - } - else { - return undef; - } -} - sub formbuilder_setup (@) { my %params=@_; @@ -74,10 +68,51 @@ sub formbuilder_setup (@) { push @$buttons, $button_text; if ($form->submitted && $form->submitted eq $button_text) { - redir_cgiauthurl($cgi, "do=postsignin"); - exit; + # bounce thru cgiauthurl and then back to + # the stored postsignin action + redir_cgiauthurl($cgi, do => "postsignin"); } } } +sub test_httpauth_pagespec ($) { + my $page=shift; + + return defined $config{httpauth_pagespec} && + length $config{httpauth_pagespec} && + defined $config{cgiauthurl} && + pagespec_match($page, $config{httpauth_pagespec}); +} + +sub canedit ($$$) { + my $page=shift; + my $cgi=shift; + my $session=shift; + + if (! defined $cgi->remote_user() && test_httpauth_pagespec($page)) { + return sub { + IkiWiki::redirect($cgi, + $config{cgiauthurl}.'?'.$cgi->query_string()); + exit; + }; + } + else { + return undef; + } +} + +sub pagetemplate (@_) { + my %params=@_; + my $template=$params{template}; + + if ($template->param("editurl") && + test_httpauth_pagespec($params{page})) { + # go directly to cgiauthurl when editing a page matching + # the pagespec + $template->param(editurl => IkiWiki::cgiurl( + cgiurl => $config{cgiauthurl}, + do => "edit", page => $params{page})); + } +} + 1 diff --git a/debian/changelog b/debian/changelog index 3dd68558e..14be7ec69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low alongside other authentication methods (like openid or anonok). Rather than always redirect to the cgiauthurl for authentication, there is now a button on the login form to use it. + * httpauth: Add httpauth_pagespec setting that can be used to limit + pages to only being edited via users authed with httpauth. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 diff --git a/doc/plugins/httpauth.mdwn b/doc/plugins/httpauth.mdwn index a7aac558b..0eda5554f 100644 --- a/doc/plugins/httpauth.mdwn +++ b/doc/plugins/httpauth.mdwn @@ -24,3 +24,12 @@ A typical setup is to make an `auth` subdirectory, and symlink `ikiwiki.cgi` into it. Then configure the web server to require authentication only for access to the `auth` subdirectory. Then `cgiauthurl` is pointed at this symlink. + +## using only httpauth for some pages + +If you want to only use httpauth for editing some pages, while allowing +other authentication methods to be used for other pages, you can +configure `httpauth_pagespec` in the setup file. This makes Edit +links on pages that match the [[ikiwiki/PageSpec]] automatically use +the `cgiauthurl`, and prevents matching pages from being edited by +users authentication via other methods. -- cgit v1.2.3 From c923e0ba3377f85107ccea1933a042aaec675c77 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Feb 2010 20:39:10 -0500 Subject: Allow globs to be used in user() pagespecs. --- IkiWiki.pm | 4 +++- debian/changelog | 1 + doc/ikiwiki/pagespec.mdwn | 3 ++- t/pagespec_match.t | 9 ++++++++- 4 files changed, 14 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index de7dbfc79..a96ff1236 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2266,11 +2266,13 @@ sub match_user ($$;@) { my $user=shift; my %params=@_; + my $regexp=IkiWiki::glob2re($user); + if (! exists $params{user}) { return IkiWiki::ErrorReason->new("no user specified"); } - if (defined $params{user} && lc $params{user} eq lc $user) { + if (defined $params{user} && $params{user}=~/^$regexp$/i) { return IkiWiki::SuccessReason->new("user is $user"); } elsif (! defined $params{user}) { diff --git a/debian/changelog b/debian/changelog index 14be7ec69..d74abd0f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low a button on the login form to use it. * httpauth: Add httpauth_pagespec setting that can be used to limit pages to only being edited via users authed with httpauth. + * Allow globs to be used in user() pagespecs. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 5f0f44e2e..8d8b1a507 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -44,7 +44,8 @@ Some more elaborate limits can be added to what matches using these functions: metadata, matching the specified glob. * "`user(username)`" - tests whether a modification is being made by a user with the specified username. If openid is enabled, an openid can also - be put here. + be put here. Glob patterns can be used in the username. For example, + to match all openid users, use `user(*://.*)` * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the diff --git a/t/pagespec_match.t b/t/pagespec_match.t index b96947407..197ff818b 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 => 64; +use Test::More tests => 70; BEGIN { use_ok("IkiWiki"); } @@ -40,6 +40,13 @@ ok(! pagespec_match("foo", "foo and bar"), "foo and bar"); ok(pagespec_match("{f}oo", "{*}*"), "curly match"); ok(! pagespec_match("foo", "{*}*"), "curly !match"); +ok(pagespec_match("somepage", "user(frodo)", user => "frodo")); +ok(pagespec_match("somepage", "user(frodo)", user => "Frodo")); +ok(! pagespec_match("somepage", "user(frodo)", user => "Sam")); +ok(pagespec_match("somepage", "user(*o)", user => "Bilbo")); +ok(pagespec_match("somepage", "user(*o)", user => "frodo")); +ok(! pagespec_match("somepage", "user(*o)", user => "Sam")); + # The link and backlink stuff needs this. $config{userdir}=""; $links{foo}=[qw{bar baz}]; -- cgit v1.2.3 From a63929f6cc7778ffc4ba57d784cdf2206ec650c7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Feb 2010 22:24:15 -0500 Subject: Group related plugins into sections in the setup file, and drop unused rcs plugins from the setup file. --- IkiWiki/Plugin/anonok.pm | 1 + IkiWiki/Plugin/blogspam.pm | 1 + IkiWiki/Plugin/bzr.pm | 1 + IkiWiki/Plugin/conditional.pm | 1 + IkiWiki/Plugin/cvs.pm | 1 + IkiWiki/Plugin/darcs.pm | 1 + IkiWiki/Plugin/editpage.pm | 1 + IkiWiki/Plugin/git.pm | 1 + IkiWiki/Plugin/htmlscrubber.pm | 1 + IkiWiki/Plugin/httpauth.pm | 1 + IkiWiki/Plugin/inline.pm | 1 + IkiWiki/Plugin/link.pm | 1 + IkiWiki/Plugin/lockedit.pm | 1 + IkiWiki/Plugin/mdwn.pm | 1 + IkiWiki/Plugin/mercurial.pm | 1 + IkiWiki/Plugin/meta.pm | 1 + IkiWiki/Plugin/moderatedcomments.pm | 1 + IkiWiki/Plugin/monotone.pm | 1 + IkiWiki/Plugin/opendiscussion.pm | 1 + IkiWiki/Plugin/openid.pm | 1 + IkiWiki/Plugin/parentlinks.pm | 1 + IkiWiki/Plugin/passwordauth.pm | 1 + IkiWiki/Plugin/recentchanges.pm | 1 + IkiWiki/Plugin/signinedit.pm | 1 + IkiWiki/Plugin/svn.pm | 1 + IkiWiki/Plugin/tla.pm | 1 + IkiWiki/Setup.pm | 32 ++++++++++++++++++++++++++------ IkiWiki/Setup/Standard.pm | 8 ++++++++ debian/changelog | 2 ++ doc/plugins/write.mdwn | 13 ++++++++----- 30 files changed, 70 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/anonok.pm b/IkiWiki/Plugin/anonok.pm index 243b98920..0e74cbfad 100644 --- a/IkiWiki/Plugin/anonok.pm +++ b/IkiWiki/Plugin/anonok.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, anonok_pagespec => { type => "pagespec", diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm index 626c8ec42..c4e5cf390 100644 --- a/IkiWiki/Plugin/blogspam.pm +++ b/IkiWiki/Plugin/blogspam.pm @@ -18,6 +18,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, blogspam_pagespec => { type => 'pagespec', diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm index 883007367..1ffdc2353 100644 --- a/IkiWiki/Plugin/bzr.pm +++ b/IkiWiki/Plugin/bzr.pm @@ -36,6 +36,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, bzr_wrapper => { type => "string", diff --git a/IkiWiki/Plugin/conditional.pm b/IkiWiki/Plugin/conditional.pm index aad617812..beeddc672 100644 --- a/IkiWiki/Plugin/conditional.pm +++ b/IkiWiki/Plugin/conditional.pm @@ -16,6 +16,7 @@ sub getsetup { plugin => { safe => 1, rebuild => undef, + section => "core", }, } diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm index f6db8bc98..26a3e9dd2 100644 --- a/IkiWiki/Plugin/cvs.pm +++ b/IkiWiki/Plugin/cvs.pm @@ -85,6 +85,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, cvsrepo => { type => "string", diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm index 0d68f27e5..1c9538e83 100644 --- a/IkiWiki/Plugin/darcs.pm +++ b/IkiWiki/Plugin/darcs.pm @@ -92,6 +92,7 @@ sub getsetup() { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, darcs_wrapper => { type => "string", diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index 9211cca89..44fe5514a 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -17,6 +17,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 1eec6aee6..b02f4a5ed 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -68,6 +68,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, git_wrapper => { type => "string", diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index a249cdf7a..ee284a45c 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -40,6 +40,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "core", }, htmlscrubber_skip => { type => "pagespec", diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index b2bb2701a..478f67446 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, cgiauthurl => { type => "string", diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 401852513..44919e58c 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -49,6 +49,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "core", }, rss => { type => "boolean", diff --git a/IkiWiki/Plugin/link.pm b/IkiWiki/Plugin/link.pm index 4c1add985..3838aec09 100644 --- a/IkiWiki/Plugin/link.pm +++ b/IkiWiki/Plugin/link.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm index 74ddbb153..1466e8337 100644 --- a/IkiWiki/Plugin/lockedit.pm +++ b/IkiWiki/Plugin/lockedit.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, locked_pages => { type => "pagespec", diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index 3de59ef3d..4ddf097ba 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, # format plugin + section => "core", }, multimarkdown => { type => "boolean", diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm index 11fdec529..ea00a3364 100644 --- a/IkiWiki/Plugin/mercurial.pm +++ b/IkiWiki/Plugin/mercurial.pm @@ -36,6 +36,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, mercurial_wrapper => { type => "string", diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 55c9ddbd1..5f046cb2a 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -20,6 +20,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => undef, + section => "core", }, } diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm index 2555927b7..afe1ceedf 100644 --- a/IkiWiki/Plugin/moderatedcomments.pm +++ b/IkiWiki/Plugin/moderatedcomments.pm @@ -15,6 +15,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, moderate_users => { type => 'boolean', diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index 9502804f1..c33cf7e3a 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -68,6 +68,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, mtn_wrapper => { type => "string", diff --git a/IkiWiki/Plugin/opendiscussion.pm b/IkiWiki/Plugin/opendiscussion.pm index 5a455940b..2805f60ef 100644 --- a/IkiWiki/Plugin/opendiscussion.pm +++ b/IkiWiki/Plugin/opendiscussion.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, } diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 382d8286f..bb99446b4 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -26,6 +26,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, openidsignup => { type => "string", diff --git a/IkiWiki/Plugin/parentlinks.pm b/IkiWiki/Plugin/parentlinks.pm index e678a057d..728bbc399 100644 --- a/IkiWiki/Plugin/parentlinks.pm +++ b/IkiWiki/Plugin/parentlinks.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, } diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index c07065b7d..4848b47bb 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -19,6 +19,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, account_creation_password => { type => "string", diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm index 5c7b71aaa..04219b721 100644 --- a/IkiWiki/Plugin/recentchanges.pm +++ b/IkiWiki/Plugin/recentchanges.pm @@ -22,6 +22,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 1, + section => "core", }, recentchangespage => { type => "string", diff --git a/IkiWiki/Plugin/signinedit.pm b/IkiWiki/Plugin/signinedit.pm index 8b44a68f7..31160c02f 100644 --- a/IkiWiki/Plugin/signinedit.pm +++ b/IkiWiki/Plugin/signinedit.pm @@ -16,6 +16,7 @@ sub getsetup () { plugin => { safe => 1, rebuild => 0, + section => "auth", }, } diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index 06b987f51..7d27ec842 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -44,6 +44,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, svnrepo => { type => "string", diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm index f4b20a6ec..16d73b136 100644 --- a/IkiWiki/Plugin/tla.pm +++ b/IkiWiki/Plugin/tla.pm @@ -34,6 +34,7 @@ sub getsetup () { plugin => { safe => 0, # rcs plugin rebuild => undef, + section => "rcs", }, tla_wrapper => { type => "string", diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 8a25ecc57..b21bd7bfe 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -77,7 +77,6 @@ sub merge ($) { sub getsetup () { # Gets all available setup data from all plugins. Returns an # ordered list of [plugin, setup] pairs. - my @ret; # disable logging to syslog while dumping, broken plugins may # whine when loaded @@ -85,27 +84,48 @@ sub getsetup () { $config{syslog}=undef; # Load all plugins, so that all setup options are available. - my @plugins=grep { $_ ne $config{rcs} } sort(IkiWiki::listplugins()); - unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st + my @plugins=IkiWiki::listplugins(); foreach my $plugin (@plugins) { eval { IkiWiki::loadplugin($plugin) }; if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) { my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() }; } } - + + my %sections; foreach my $plugin (@plugins) { if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) { # use an array rather than a hash, to preserve order my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() }; next unless @s; - push @ret, [ $plugin, \@s ], + + # set default section value (note use of shared + # hashref between array and hash) + my %s=@s; + if (! exists $s{plugin} || ! $s{plugin}->{section}) { + $s{plugin}->{section}="misc"; + } + + # only the selected rcs plugin is included + if ($config{rcs} && $plugin eq $config{rcs}) { + $s{plugin}->{section}="core"; + } + elsif ($s{plugin}->{section} eq "rcs") { + next; + } + + push @{$sections{$s{plugin}->{section}}}, [ $plugin, \@s ]; } } $config{syslog}=$syslog; - return @ret; + return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} } + sort { # core first, then alphabetical + ($b eq "core") <=> ($a eq "core") + || + $a cmp $b + } keys %sections; } sub dump ($) { diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 951bcfc56..c99dbb620 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -90,10 +90,18 @@ sub gendump ($) { # disable logging to syslog while dumping $config{syslog}=undef; + my $curr_section; push @ret, dumpvalues(\%setup, IkiWiki::getsetup()); foreach my $pair (IkiWiki::Setup::getsetup()) { my $plugin=$pair->[0]; my $setup=$pair->[1]; + my %s=@{$setup}; + my $section=$s{plugin}->{section}; + if (! defined $curr_section || $curr_section ne $section) { + $curr_section=$section; + push @ret, "", "\t#", "\t# $section plugins", "\t#"; + } + my @values=dumpvalues(\%setup, @{$setup}); if (@values) { push @ret, "", "\t# $plugin plugin", @values; diff --git a/debian/changelog b/debian/changelog index d74abd0f9..f24a453c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * httpauth: Add httpauth_pagespec setting that can be used to limit pages to only being edited via users authed with httpauth. * Allow globs to be used in user() pagespecs. + * Group related plugins into sections in the setup file, and drop + unused rcs plugins from the setup file. -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 082f0e38f..68454d56c 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -457,6 +457,12 @@ describing the option. There can also be an item named "plugin", which describes the plugin as a whole. For example: return + plugin => { + description => "description of this plugin", + safe => 1, + rebuild => 1, + section => "misc", + }, option_foo => { type => "boolean", description => "enable foo?", @@ -471,11 +477,6 @@ describes the plugin as a whole. For example: safe => 1, rebuild => 0, }, - plugin => { - description => "description of this plugin", - safe => 1, - rebuild => 1, - }, * `type` can be "boolean", "string", "integer", "pagespec", or "internal" (used for values that are not user-visible). The type is @@ -496,6 +497,8 @@ describes the plugin as a whole. For example: the plugin) will require a wiki rebuild, false if no rebuild is needed, and undef if a rebuild could be needed in some circumstances, but is not strictly required. +* `section` can optionally specify which section in the config file + the plugin fits in. ### genwrapper -- cgit v1.2.3 From 0b9b3f3e0a10a9617d6f83bcff63136f20072453 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Feb 2010 17:07:54 -0500 Subject: releasing version 3.20100212 --- debian/changelog | 4 +- debian/control | 2 +- ikiwiki.spec | 2 +- po/bg.po | 344 ++++++++++++++++++++++++++++--------------------------- po/cs.po | 344 ++++++++++++++++++++++++++++--------------------------- po/da.po | 344 ++++++++++++++++++++++++++++--------------------------- po/de.po | 344 ++++++++++++++++++++++++++++--------------------------- po/es.po | 344 ++++++++++++++++++++++++++++--------------------------- po/fr.po | 344 ++++++++++++++++++++++++++++--------------------------- po/gu.po | 344 ++++++++++++++++++++++++++++--------------------------- po/ikiwiki.pot | 344 ++++++++++++++++++++++++++++--------------------------- po/it.po | 344 ++++++++++++++++++++++++++++--------------------------- po/pl.po | 344 ++++++++++++++++++++++++++++--------------------------- po/sv.po | 344 ++++++++++++++++++++++++++++--------------------------- po/tr.po | 344 ++++++++++++++++++++++++++++--------------------------- po/vi.po | 344 ++++++++++++++++++++++++++++--------------------------- 16 files changed, 2305 insertions(+), 2175 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f24a453c8..c91feae0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100123) UNRELEASED; urgency=low +ikiwiki (3.20100212) unstable; urgency=low * template: Preprocess parameters before htmlizing. * img: Fix a bug that could taint @links with undef values. @@ -25,7 +25,7 @@ ikiwiki (3.20100123) UNRELEASED; urgency=low * Group related plugins into sections in the setup file, and drop unused rcs plugins from the setup file. - -- Joey Hess Tue, 26 Jan 2010 22:25:33 -0500 + -- Joey Hess Fri, 12 Feb 2010 16:45:50 -0500 ikiwiki (3.20100122) unstable; urgency=low diff --git a/debian/control b/debian/control index 172e1b23d..b20f4db55 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libfile-chdir-perl Maintainer: Joey Hess Uploaders: Josh Triplett -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki diff --git a/ikiwiki.spec b/ikiwiki.spec index 044c7c033..865c9a325 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100122 +Version: 3.20100212 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 810a16e95..a211b7685 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Грешка" @@ -146,35 +146,35 @@ msgstr "готово" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -182,7 +182,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,12 +197,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -210,7 +210,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -246,7 +246,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -262,133 +262,133 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,116 +398,116 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Когато се използва „--rss” или „--atom” трябва да се укаже и " "местоположението на уикито посредством параметъра „--url”" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Огледала" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Огледало" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -515,19 +515,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "функцията „getctime” не е реализирана" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Получаване на OpenID номер" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Всички страници имат връзки от други страници." @@ -536,31 +536,39 @@ msgstr "Всички страници имат връзки от други ст msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Акаунтът е създаден. Можете да влезете." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Грешка при създаване на акаунта." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -591,119 +599,119 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "гласуване" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Общо гласове:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "не е инсталиран polygen" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -771,12 +779,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -784,83 +792,83 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -875,21 +883,21 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "препратката няма указани параметрите „name” или „url”" @@ -897,7 +905,7 @@ msgstr "препратката няма указани параметрите #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "препратката „%s” сочи към „%s”" @@ -907,121 +915,123 @@ msgstr "препратката „%s” сочи към „%s”" msgid "failed to parse any smileys" msgstr "няма разпознати усмивки; изключване на приставката „smiley”" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1095,20 +1105,20 @@ msgstr "ikiwiki: неуспех при обновяване на страниц msgid "cannot read %s: %s" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1181,25 +1191,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 399111069..d3cf3f5b9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Chyba" @@ -145,32 +145,32 @@ msgstr "hotovo" msgid "Must specify %s" msgstr "Musíte zadat %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Nepodařilo se vytvořit S3 bucket:" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Nepodařilo se uložit soubor na S3:" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Nelze smazat soubor z S3:" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "stránka nazvaná %s již existuje" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "zakázáno proměnnou allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "chybné jméno souboru s přílohou" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "příloha nahrána" @@ -178,7 +178,7 @@ msgstr "příloha nahrána" msgid "automatic index generation" msgstr "automatické vytváření indexu" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -195,12 +195,12 @@ msgstr "%s z %s" msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "komentář musí mít obsah" @@ -208,7 +208,7 @@ msgstr "komentář musí mít obsah" msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "chybný název stránky" @@ -244,7 +244,7 @@ msgstr "Přidán komentář" msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" @@ -260,127 +260,127 @@ msgstr "schvalování komentářů" msgid "Comments" msgstr "Komentáře" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametr %s je povinný" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "na této stránce nebyl zkopírován žádný text" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "na této stránce nebyl zkopírován žádný text s id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "odstraňuji starý náhled %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "upravuji %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "nebyl zadán parametr template" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "nepodařilo se zpracovat" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "musíte zadat formát a text" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune selhal" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "chybějící stránka" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Stránka %s neexistuje." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "není stránkou" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" @@ -389,105 +389,105 @@ msgstr "varování: perlový modul highlight není dostupný; pokračuji bez ně msgid "htmltidy failed to parse this html" msgstr "htmltidy se nepodařilo zpracovat toto html" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick není nainstalován" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "nelze číst %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Při používání --rss nebo --atom musíte pomocí --url zadat url k wiki" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "úprava stránky není povolena" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "chybí parametr pages" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "parametry %s a %s nelze použít zároveň" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Přidat nový příspěvek nazvaný:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "neexistující šablona %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "nepodařilo se spustit dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "Stránka %s je zamknutá a nelze ji měnit" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "je povolen multimarkdown, ale Text::MultiMarkdown není nainstalován" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format 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:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Zrcadla" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Zrcadlo" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "schvalování komentářů" @@ -496,19 +496,19 @@ msgstr "schvalování komentářů" msgid "more" msgstr "více" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime není implementováno" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Přihlásit pomocí" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Získat OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Na každou stránku vede odkaz z jiné stránky." @@ -516,31 +516,39 @@ msgstr "Na každou stránku vede odkaz z jiné stránky." msgid "bad or missing template" msgstr "chybná nebo chybějící šablona" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Chyba při vytváření účtu." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "Bez e-mailové adresy nelze zaslat postup na resetování hesla." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Nepodařilo se odeslat email." -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Postup na resetování hesla vám byl odeslán na e-mail." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "chybné URL pro resetování hesla" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "resetování hesla bylo zamítnuto" @@ -570,40 +578,40 @@ msgstr "LWP nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -611,7 +619,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -619,76 +627,76 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " "stránku" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "hlasovat" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Celkem hlasů:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen není nainstalován" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "příkaz selhal" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "chybí vzorec" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "neznámý vzorec" @@ -756,12 +764,12 @@ msgstr "o půlnoci" msgid "at noon on %A" msgstr "%A o poledni" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "neplatná procentuální hodnota %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" @@ -769,81 +777,81 @@ msgstr "potřebuji buď parametr `percent`, nebo `totalpages` a `donepages`" msgid "(Diff truncated)" msgstr "(Diff oříznut)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s neexistuje" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s není souborem" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "potvrďte odstranění %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "odstraněno" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s není ve zdrojovém adresáři a proto nelze přejmenovat" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "jméno souboru nebylo změněno" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "neplatné jméno" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s již existuje" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s již na disku existuje" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "přejmenování %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Také přejmenovat podstránky a přílohy" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Najednou lze přejmenovat pouze jednu přílohu." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Vyberte přílohu, kterou chcete přejmenovat." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -858,28 +866,28 @@ msgstr "nepodařilo se přečíst %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "pro indexování %s je potřeba Digest::SHA1" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "hledání" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "Modul shortcut nebude pracovat bez %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "chybí parametr jméno nebo url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "zkratka %s odkazuje na %s" @@ -888,107 +896,109 @@ msgstr "zkratka %s odkazuje na %s" msgid "failed to parse any smileys" msgstr "nepodařilo se rozpoznat žádné smajlíky" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "chyba syntaktického rozboru" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "chybný průměr zvýrazněného bodu" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "chybné umístění zvýrazněného bodu" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "chybná výška" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "chybí parametr šířka (width)" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "chybná šířka" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "nepodařilo se spustit php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "nemohu najít soubor" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "neznámý formát dat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "prázdná data" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Stáhnout zdrojová data" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "zpracovávání selhalo na řádku %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "chybí parametr id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "šablona %s nebyla nalezena" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "chybí TeXový kód" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "z kódu se nepodařilo vygenerovat obrázek" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "modul" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "moduly" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "moduly" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -996,7 +1006,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1074,20 +1084,20 @@ msgstr "ikiwiki: nelze sestavit %s" msgid "cannot read %s: %s" msgstr "nemohu číst %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "nepodporovaný systém pro správu verzí: %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" @@ -1158,25 +1168,25 @@ msgstr "nelze použít několik rcs modulů" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index 4bff9254c..b30730aa4 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Fejl" @@ -149,35 +149,35 @@ msgstr "færdig" msgid "Must specify %s" msgstr "Skal angive %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Oprettelse af bundt i S3 mislykkedes: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Arkivering af fil i S3 mislykkedes: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "Sletning af fil fra S3 mislykkedes: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "der er allerede en side ved navn %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "vedhæftningsoplægning" @@ -185,7 +185,7 @@ msgstr "vedhæftningsoplægning" msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -202,12 +202,12 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "kommentar skal have indhold" @@ -215,7 +215,7 @@ msgstr "kommentar skal have indhold" msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dårligt sidenavn" @@ -251,7 +251,7 @@ msgstr "Tilføjede en kommentar" msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" @@ -267,128 +267,128 @@ msgstr "kommentarkoderering" msgid "Comments" msgstr "Kommentarer" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametren %s er krævet" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "ingen tekst blev kopieret i denne side" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "ingen tekst blev kopieret i denne side med id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "fjerner gammelt smugkig %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "redigerer %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "skabelon %s ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "dannelsen mislykkedes" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "skal angive format og tekst" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "kan ikke få sider til at passe sammen: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -400,107 +400,107 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick ikke installeret" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "læsning af %s mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Skal angive url til wiki med --url når --rss eller --atom anvendes" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "sideredigering er ikke tilladt" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "mangler pages-parametren" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Tilføj nyt indlæg med følgende titel:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "ikke-eksisterende skabelon: %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "dot-kørsel mislykkedes" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s er låst og kan ikke redigeres" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown er aktiveret, men Text::MultiMarkdown er ikke installeret" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Spejle" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spejl" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "kommentarkoderering" @@ -509,19 +509,19 @@ msgstr "kommentarkoderering" msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime ikke implementeret" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Log på med" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Skaf en OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Alle sider har henvisninger fra andre sider." @@ -529,32 +529,40 @@ msgstr "Alle sider har henvisninger fra andre sider." msgid "bad or missing template" msgstr "dårlig eller manglende skabelon" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Konto korrekt oprettet. Nu kan du logge på." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Fejl ved kontooprettelse." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Afsendelse af mail mislykkedes" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "Ukorrekt adgangskodenumstillings-URL" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "adgangskodenulstilling afvist" @@ -584,12 +592,12 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -597,7 +605,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -605,21 +613,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -627,7 +635,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -635,75 +643,75 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "stem" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Samlede stemmer:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen ikke installeret" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "kommando fejlede" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "manglende formular" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "ukendt formular" @@ -771,12 +779,12 @@ msgstr "ved midnat" msgid "at noon on %A" msgstr "midt på dagen %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "ugyldig procentværdi %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" @@ -784,81 +792,81 @@ msgstr "Kræver enten parametre `percent` eller `totalpages og `donepages`" msgid "(Diff truncated)" msgstr "(Diff trunkeret)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s eksisterer ikke" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s er ikke i srcdir, så kan ikke blive slettet" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s er ikke en fil" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "bekræft at %s bliver fjernet" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "fjernet" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s er ikke i srcdir, så kan ikke blive omdøbt" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "ingen ændring til filnavnet blev angivet" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "ugyldigt navn" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s eksisterer allerede" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s eksisterer allerede på disken" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "omdøb %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Omdøb også UnderSider og vedhæftninger" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Kun en vedhæftning kan blive omdøbt ad gangen." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Vælg vedhæftningen som skal omdøbes." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -873,28 +881,28 @@ msgstr "læsning af %s mislykkedes" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "søg" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "genvejsudvidelsen vil ikke fungere uden %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "manglende navn eller url parameter" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "genvej %s viser til %s" @@ -903,109 +911,111 @@ msgstr "genvej %s viser til %s" msgid "failed to parse any smileys" msgstr "afkodning af smileys mislykkedes" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "afkodningsfejl" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "forkert featurepoint-parameter diameter" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "forkert featurepoint-parameter location" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "manglende værdier" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "forkert højdeværdi" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "manglende breddeparameter" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "forkert breddeværdi" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "php-kørsel mislykkedes" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "kan ikke finde fil" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "ukendt dataformat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "blanke data" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Direkte datanedlastning" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "afkodningsfejl på linje %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "manglende id-parameter" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "dannelsen mislykkedes:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "manglende tex-kode" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "billedopbygning fra kode mislykkedes" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "udvidelse" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "udvidelser" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "udvidelser" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1013,7 +1023,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1089,20 +1099,20 @@ msgstr "ikiwiki: kan ikke danne %s" msgid "cannot read %s: %s" msgstr "kan ikke læse %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "revisionskontrolsystem %s ikke understøttet" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" @@ -1174,25 +1184,25 @@ msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index 53d0db850..b024e3be7 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Fehler" @@ -146,35 +146,35 @@ msgstr "fertig" msgid "Must specify %s" msgstr "%s muss angegeben werden" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Konnte die Datei nicht in S3 speichern: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "Konnte die Datei nicht in S3 löschen: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "eine Seite mit dem Namen %s existiert bereits" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "durch allowed_attachements verboten" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "fehlerhafter Dateiname für Anhang" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "Anhang hochladen" @@ -182,7 +182,7 @@ msgstr "Anhang hochladen" msgid "automatic index generation" msgstr "automatische Index-Erstellung" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,12 +199,12 @@ msgstr "%s von %s" msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "ein Kommentar sollte Inhalt haben" @@ -212,7 +212,7 @@ msgstr "ein Kommentar sollte Inhalt haben" msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "fehlerhafter Seitenname" @@ -249,7 +249,7 @@ msgstr "Kommentar hinzugefügt" msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" @@ -265,128 +265,128 @@ msgstr "Kommentar-Moderation" msgid "Comments" msgstr "Kommentare" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "der Parameter %s wird benötigt" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "es wurde kein Text in diese Seite kopiert" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "es wurde kein Text in diese Seite mit der id %s kopiert" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "entferne alte Vorschau %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "bearbeite %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "Vorlage nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "Ablauf fehlgeschlagen" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "Format und Text müssen spezifiziert werden" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune fehlgeschlagen" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "Kann die Seiten nicht zuordnen: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,110 +398,110 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick ist nicht installiert" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "Lesen von %s fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Die URL zum Wiki muss mit --url angegeben werden, wenn --rss oder --atom " "genutzt wird" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "bearbeiten der Seiten nicht erlaubt" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "fehlender Seitenparameter" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Füge einen neuen Beitrag hinzu. Titel:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "nicht-vorhandene Vorlage %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "dot konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s ist gesperrt und kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown ist eingeschaltet, aber Text::MultiMarkdown ist nicht " "installiert" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Spiegel" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spiegel" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "Kommentar-Moderation" @@ -510,19 +510,19 @@ msgstr "Kommentar-Moderation" msgid "more" msgstr "mehr" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime ist nicht implementiert" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Anmelden mit" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Eine OpenID anfordern" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." @@ -531,33 +531,41 @@ msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." msgid "bad or missing template" msgstr "fehlerhafte oder fehlende Vorlage" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Konto konnte nicht erstellt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "es gibt keine E-Mail Adresse, deshalb kann keine Anweisung zum Zurücksetzen " "des Passwortes zugeschickt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Es konnte keine E-Mail versandt werden" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "fehlerhafte URL zum Zurücksetzen des Passworts" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "zurücksetzen des Passworts abgelehnt" @@ -587,12 +595,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -600,7 +608,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -608,21 +616,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -630,7 +638,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -638,76 +646,76 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " "arbeiten" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "abstimmen" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Alle Stimmen:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen ist nicht installiert" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "Befehl fehlgeschlagen" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "fehlende Formel" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "unbekannte Formel" @@ -775,12 +783,12 @@ msgstr "um Mitternacht" msgid "at noon on %A" msgstr "am Nachmittag des %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "unzulässiger Prozentwert %s" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "es werden entweder `percent` oder `totalpages` und `donepages` Parameter " @@ -790,81 +798,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "(Diff wurde gekürzt)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s existiert nicht" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s ist keine Datei" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "bestätigen Sie die Entfernung von %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "entfernt" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s ist nicht im srcdir und kann deshalb nicht umbenannt werden" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "es wurde keine Änderung des Dateinamens angegeben" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "unzulässiger Name" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s existiert bereits" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s existiert bereits auf der Festplatte" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "benenne %s um" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Auch Unterseiten (SubPages) und Anhänge umbenennen" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Es kann immer nur ein Anhang gleichzeitig umbenannt werden." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" @@ -879,28 +887,28 @@ msgstr "lesen von %s fehlgeschlagen" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "suchen" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "die shortcut Erweiterung wird ohne %s nicht funktionieren" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "fehlender Name oder URL-Parameter" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "Tastenkürzel %s verweist nach %s" @@ -909,109 +917,111 @@ msgstr "Tastenkürzel %s verweist nach %s" msgid "failed to parse any smileys" msgstr "Smileys konnten nicht ausgewertet werden" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "Auswertungsfehler" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "ungültiger featurepoint diameter" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "ungültige featurepoint location" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "fehlende Werte" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "ungültige Wert für height" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "fehlender Parameter für width" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "ungültige Wert für width" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "konnte PHP nicht ausführen" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "konnte Datei nicht finden" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "unbekanntes Datenformat" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "keine Daten" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Direkter Daten-Download" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "Auswertungsfehler in Zeile %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "fehlender Parameter id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "Vorlage %s nicht gefunden" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "fehlender TeX-Code" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "Erweiterung" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "Erweiterungen" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "Erweiterungen" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1019,7 +1029,7 @@ msgstr "" "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1098,21 +1108,21 @@ msgstr "ikiwiki: kann %s nicht erzeugen" msgid "cannot read %s: %s" msgstr "kann %s nicht lesen: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "nicht unterstütztes Versionskontrollsystem %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1188,25 +1198,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index de85edbdf..2923ac199 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Error" @@ -151,35 +151,35 @@ msgstr "completado" msgid "Must specify %s" msgstr "Debe especificar %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Creación de directorio en S3 fallida: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "No puedo guardar el archivo en S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "No puedo borrar archivo en S3: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "ya existe una página de nombre %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "prohibido por la claúsula allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "enviado el adjunto" @@ -187,7 +187,7 @@ msgstr "enviado el adjunto" msgid "automatic index generation" msgstr "creación de índice automática" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -204,12 +204,12 @@ msgstr "%s desde la página %s" msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "Un comentario debe tener algún contenido" @@ -217,7 +217,7 @@ msgstr "Un comentario debe tener algún contenido" msgid "Anonymous" msgstr "Anónimo" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nombre de página erróneo" @@ -253,7 +253,7 @@ msgstr "Añadir un comentario" msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" @@ -269,128 +269,128 @@ msgstr "aprobación de comentarios" msgid "Comments" msgstr "Comentarios" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "el parámetro %s es obligatorio" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "no se ha copiado ningún texto en esta página" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "no se ha copiado ningún texto con el identificador %s en esta pagina" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "eliminando la antigua previsualización %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "falta indicar la plantilla (template)" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "fallo en el proceso" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "se deben especificar tanto el formato como el texto" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "el programa fortune ha fallado" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "no encuentro páginas coincidentes: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -402,109 +402,109 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "El complemento Image::Magick no ha sido instalado" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "no puedo leer de %s: %s " -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Es obligatorio indicar un url al wiki cuando se usan los parámetros --rss ó " "--atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "no está permitida la modificación de páginas" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "falta el parámetro pages" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Añadir una entrada nueva titulada:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "la plantilla %s no existe " -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "La página %s está bloqueada y no puede modificarse" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" 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:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Réplicas" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Réplica" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "aprobación de comentarios" @@ -513,19 +513,19 @@ msgstr "aprobación de comentarios" msgid "more" msgstr "ver más" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "la funcionalidad getctime no está incluida" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Identificarse mediante " -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Consiga un identificador OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Todas las páginas están referenciadas entre sí." @@ -534,35 +534,43 @@ msgstr "Todas las páginas están referenciadas entre sí." msgid "bad or missing template" msgstr "plantilla errónea ó no existente" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Error creando la cuenta de usuario." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "No tengo dirección de correo electrónica, así que no puedo enviar " "instrucciones para reiniciar la contraseña" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "No he podido enviar el mensaje de correo electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Las instrucciones para reiniciar la contraseña se le han enviado por correo " "electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "el url para reiniciar la contraseña es incorrecto" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "reinicio de contraseña denegado" @@ -592,118 +600,118 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Votar" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Recuento de votos:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "El complemento polygen no ha sido instalado" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "la ejecución del programa ha fallado" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "falta la fórmula" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "fórmula desconocida " @@ -771,12 +779,12 @@ msgstr "a medianoche" msgid "at noon on %A" msgstr "el %A a media tarde" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "%s es un valor erróneo para un porcentaje" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" @@ -784,81 +792,81 @@ msgstr "son necesarios los parámetros 'donepages' y 'percent' ó 'totalpages'" msgid "(Diff truncated)" msgstr "(Lista de diferencias truncada)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "borrado" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s no está en el directorio fuente por lo que no puede ser renombrado" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "no se ha indicado cambio alguno en el nombre del archivo" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "nombre no válido" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s ya existe" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s ya existe en el disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "cambiando de nombre %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "También cambia de nombre las subpáginas y los adjuntos" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Únicamente un adjunto puede ser renombrado a la vez." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -873,28 +881,28 @@ msgstr "no puedo leer de %s: %s " msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "se necesita la instalación de Digest::SHA1 para indexar %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "buscar" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "el complemento shortcut no funcionará si no existe la página %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "shortcut necesita el parámetro 'name' ó el parámetro 'url'" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "El atajo %s apunta a %s" @@ -903,113 +911,115 @@ msgstr "El atajo %s apunta a %s" msgid "failed to parse any smileys" msgstr "Algunos emoticonos tienen errores" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "error de análisis " -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "diámetro inválido " -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "localización errónea " -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "faltan valores" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "valor incorrecto para la altura" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "falta el parámetro que indica el ancho" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "valor incorrecto para el ancho" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "error fatal invocando el programa php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "no puedo encontrar el archivo" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "formato de datos desconocido" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "sin datos" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Enlace directo para descarga" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "error de análisis en la línea %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "falta el parámetro \"id\"" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "no he encontrado la plantilla %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "falta el código tex" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "no he podido crear la imagen desde el código" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "complemento" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "complementos" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "complementos" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1027,7 @@ msgstr "" "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1097,20 +1107,20 @@ msgstr "ikiwiki: no puedo convertir la página %s" msgid "cannot read %s: %s" msgstr "no puedo leer el archivo %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "el sistema de control de versiones %s no está soportado" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1185,29 +1195,29 @@ msgstr "no puedo emplear varios complementos rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 5ba71d6cf..573168d51 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Erreur" @@ -147,32 +147,32 @@ msgstr "Terminé" msgid "Must specify %s" msgstr "Vous devez spécifier %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Impossible de créer un compartiment S3 :" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Impossible de sauvegarder le fichier dans le compartiment S3 :" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Échec lors de la suppression du fichier sur S3 :" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "Il existe déjà une page nommée %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "Action interdite par allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "Envoi de la pièce jointe" @@ -180,7 +180,7 @@ msgstr "Envoi de la pièce jointe" msgid "automatic index generation" msgstr "Génération de l'index automatique" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,12 +197,12 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." @@ -210,7 +210,7 @@ msgstr "Un commentaire doit avoir un contenu." msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "Nom de page incorrect" @@ -246,7 +246,7 @@ msgstr "Commentaire ajouté" msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" @@ -262,127 +262,127 @@ msgstr "modération du commentaire" msgid "Comments" msgstr "Commentaires" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "Le paramètre %s est obligatoire" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "Aucun texte n'a été copié dans cette page" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "Aucun texte n'a été copié dans cette page avec l'identifiant %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "Suppression de l'ancienne prévisualisation %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "Édition de %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "modèle (« template ») non indiqué" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "Échec du traitement" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "le format et le texte doivent être indiqués" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "Échec du lancement de « fortune »" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "Ce n'est pas une page." -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -394,108 +394,108 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick n'est pas installé" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "Échec de la lecture de %s : %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --rss " "ou --atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "Modification de page interdite" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "Paramètre « pages » manquant" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s est verrouillé et ne peut être modifié" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "mulitmarkdown est activé mais Text::Multimarkdown n'est pas installé" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Miroirs" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Miroir" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "modération du commentaire" @@ -504,19 +504,19 @@ msgstr "modération du commentaire" msgid "more" msgstr "lire la suite" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime n'est pas implémenté" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "S'identifier en tant que" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Obtenir un compte OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Toutes les pages sont liées à d'autres pages." @@ -524,35 +524,43 @@ msgstr "Toutes les pages sont liées à d'autres pages." msgid "bad or missing template" msgstr "Modèle de page incorrect ou manquant" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Erreur lors de la création du compte." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Aucune adresse indiquée. Impossible d'envoyer les instructions pour " "réinitialiser le mot de passe." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Impossible d'envoyer un courriel" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Vous avez reçu un message contenant les instructions pour réinitialiser le " "mot de passe" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "Adresse pour la réinitialisation du mot de passe incorrecte" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "réinitialisation du mot de passe refusée" @@ -584,12 +592,12 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -597,7 +605,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -605,23 +613,23 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -629,7 +637,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -637,76 +645,76 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " "des modifications." -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "Voter" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Total des suffrages :" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen n'est pas installé" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "Échec de la commande" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "formule manquante" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "formule inconnue" @@ -774,12 +782,12 @@ msgstr "à minuit" msgid "at noon on %A" msgstr "%A, à midi" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "pourcentage %s illégal" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire." @@ -788,81 +796,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "(fichier de différences tronqué)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s n'existe pas" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "supprimé" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s n'est pas dans srcdir. Impossible de le renommer" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "Aucun changement dans le nom du fichier n'a été spécifié" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "Appellation interdite" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s existe déjà" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -877,28 +885,28 @@ msgstr "Impossible de lire %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "recherche" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "Le greffon « shortcut » ne fonctionnera pas sans %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "Il manque le paramètre nom ou URL." #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "Le raccourci %s pointe vers %s" @@ -907,109 +915,111 @@ msgstr "Le raccourci %s pointe vers %s" msgid "failed to parse any smileys" msgstr "Aucun smiley n'a pu être analysé" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "Erreur d'analyse" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "Diamètre du point incorrect" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "Emplacement du point incorrect" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "Il manque des valeurs" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "Hauteur incorrecte" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "Le paramètre largeur manque" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "Largeur incorrecte" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "Échec du lancement de php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "Fichier introuvable" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "Format de données inconnu" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "Pas de données" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Téléchargement direct des données" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "Modèle de page %s introuvable" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "Échec du traitement :" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" msgstr "greffon" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" +msgstr "Greffons" + +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "Greffons" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1017,7 +1027,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1094,22 +1104,22 @@ msgstr "ikiwiki : impossible de reconstruire %s" msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1184,25 +1194,25 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff --git a/po/gu.po b/po/gu.po index 83afdef4c..3cb505efe 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "ક્ષતિ" @@ -144,35 +144,35 @@ msgstr "સંપૂર્ણ" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -180,7 +180,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -195,12 +195,12 @@ msgstr "" msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -208,7 +208,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -244,7 +244,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -260,132 +260,132 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "\"test\" અને \"then\" વિકલ્પો જરૂરી છે" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -395,109 +395,109 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "%s વાંચવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "--rss અથવા --atom ઉપયોગ કરતી વખતે વીકીમાં --url ઉપયોગ કરવું જ પડશે" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "આ શિર્ષકથી નવું પોસ્ટ ઉમેરો:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "અસ્તિત્વમાં ન હોય તેવું ટેમ્પલેટ %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format 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:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "મિરરો" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "મિરર" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -505,19 +505,19 @@ msgstr "" msgid "more" msgstr "વધુ" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime અમલમાં મૂકાયેલ નથી" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "ઓપનઆઇડી મેળવો" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે જોડાયેલ છે." @@ -526,31 +526,39 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "ખાતું બનાવવામાં ક્ષતિ." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -581,119 +589,119 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "મત" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "કુલ મત:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "પોલિગોન સ્થાપિત નથી" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "ખોવાયેલ સૂત્ર" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "અજાણ્યું સૂત્ર" @@ -762,12 +770,12 @@ msgstr "મધ્યરાત્રે" msgid "at noon on %A" msgstr "બપોરે %A પર" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -775,82 +783,82 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, fuzzy, perl-format msgid "%s is not a file" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -865,28 +873,28 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "ખોવાયેલ નામ અથવા યુઆરએલ વિકલ્પ" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "ટુંકોરસ્તો %s એ %s નો નિર્દેશ કરે છે" @@ -895,119 +903,121 @@ msgstr "ટુંકોરસ્તો %s એ %s નો નિર્દ msgid "failed to parse any smileys" msgstr "કોઇપણ સ્માઇલીઓ ઉકેલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "ઉકેલવામાં ક્ષતિ" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "ખરાબ લાક્ષણિકબિંદુ વ્યાસ" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "ખરાબ લાક્ષણિકબિંદુ સ્થિતિ" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "ખરાબ ઉંચાઇ કિંમત" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "ખોવાયેલ પહોળાઇ વિકલ્પ" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "ખરાબ પહોળાઇ કિંમત" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "php ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "ફાઇલ મળી શકી નહી" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "અજાણ્યો માહિતી પ્રકાર" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "ખાલી માહિતી" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "સીધી માહિતી ડાઉનલોડ" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "ખોવાયેલ આઇડી વિકલ્પ" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 #, fuzzy msgid "missing tex code" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1081,20 +1091,20 @@ msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" msgid "cannot read %s: %s" msgstr "વાંચી શકાતી નથી %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1165,25 +1175,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index f4749b841..4f44e7c74 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "" @@ -144,32 +144,32 @@ msgstr "" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -177,7 +177,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -192,12 +192,12 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -205,7 +205,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -241,7 +241,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -257,127 +257,127 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -386,104 +386,104 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -491,19 +491,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "" @@ -511,31 +511,39 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -565,117 +573,117 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -743,12 +751,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -756,81 +764,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -845,28 +853,28 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "" @@ -875,113 +883,115 @@ msgstr "" msgid "failed to parse any smileys" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1055,20 +1065,20 @@ msgstr "" msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1139,25 +1149,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 3b0f45348..cc24cccd5 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -53,7 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Errore" @@ -144,32 +144,32 @@ msgstr "fatto" msgid "Must specify %s" msgstr "Occorre specificare %s" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "Impossibile creare il contenitore S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "Impossibile salvare il file sul S3: " -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "Impossibile eliminare il file dal S3: " -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "esiste già una pagina chiamata %s" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "non permesso da allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "nome file dell'allegato non valido" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "carica allegato" @@ -177,7 +177,7 @@ msgstr "carica allegato" msgid "automatic index generation" msgstr "generazione automatica dell'indice" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -194,12 +194,12 @@ msgstr "%s da %s" msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "i commenti devono avere un contenuto" @@ -207,7 +207,7 @@ msgstr "i commenti devono avere un contenuto" msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nome pagina non valido" @@ -243,7 +243,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -259,127 +259,127 @@ msgstr "moderazione commento" msgid "Comments" msgstr "Commenti" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "parametro %s necessario" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "nessun testo è stato copiato in questa pagina" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "nessun testo è stato copiato in questa pagina con l'id %s" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "rimozione vecchia anteprima %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "%s non è una pagina modificabile" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "modifica %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "modello non specificato" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "errore nell'elaborazione" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "occorre specificare formato e testo" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "non è una pagina" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "errore nell'eseguire graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -390,107 +390,107 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "Image::Magick non è installato" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "impossibile determinare la dimensione dell'immagine %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "modifica della pagina non ammessa" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "parametro pagine mancante" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "i parametri %s e %s non possono essere usati insieme" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "impossibile eseguire dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s è bloccata e non può essere modificata" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Mirror" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Mirror" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 #, fuzzy msgid "comment needs moderation" msgstr "moderazione commento" @@ -499,19 +499,19 @@ msgstr "moderazione commento" msgid "more" msgstr "altro" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime non implementata" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "Accedi tramite" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Ottieni un OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." @@ -519,34 +519,42 @@ msgstr "Tutte le pagine hanno collegamenti in entrata da altre pagine." msgid "bad or missing template" msgstr "modello errato o mancante" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Account creato con successo. È ora possibile effettuare l'accesso." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Errore nella creazione dell'account." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" "Nessun indirizzo email, impossibile inviare per email le istruzioni per " "reimpostare la password." -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Impossibile spedire il messaggio" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" "Il messaggio con le istruzioni per reimpostare la password è stato inviato." -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "url per il reset della password non corretto" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "reset della password non permesso" @@ -578,19 +586,19 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -598,21 +606,21 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -620,7 +628,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -628,76 +636,76 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " "modifiche" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "voto" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Voti totali:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen non è installato" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "errore nel comando" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "formula mancante" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "formula sconosciuta" @@ -765,12 +773,12 @@ msgstr "a mezzanotte" msgid "at noon on %A" msgstr "%A a mezzogiorno" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "valore percentuale %s non ammesso" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " @@ -780,81 +788,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "(Diff troncato)" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "%s non esiste" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s non è in src, quindi non può essere eliminato" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "%s non è un file" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "conferma rimozione di %s" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "rimosso" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "%s non è in src, quindi non può essere rinominato" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "non è stata specificata nessuna modifica al nome del file" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "nome non valido" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "%s esiste già" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "%s già presente su disco" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "rinomina di %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "Rinomina anche SottoPagine e allegati" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "Si può rinominare un solo allegato alla volta." -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "Selezionare l'allegato da rinominare." -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -869,28 +877,28 @@ msgstr "impossibile leggere %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "è necessario Digest::SHA1 per l'indice di %s" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "cerca" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "il plugin scorciatoia non può funzionare senza %s" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "parametro nome o url mancante" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "la scorciatoia %s punta a %s" @@ -899,109 +907,111 @@ msgstr "la scorciatoia %s punta a %s" msgid "failed to parse any smileys" msgstr "impossibile interpretare gli smile" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "errore nell'interpretazione" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "Diametro featurepoint non valido" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "Posizione featurepoint non valida" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "valori mancanti" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "valore altezza non valido" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "parametro larghezza mancante" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "valore larghezza non valido" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "impossibile eseguire php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "impossibile trovare il file" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "formato dati sconosiuto" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "nessun dato" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Scaricamento diretto dei dati" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "errore di interpretazione alla riga %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "parametro id mancante" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "modello %s non trovato" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "codice tex mancante" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "impossibile generare l'immagine dal codice" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, fuzzy, perl-format +msgid "%s plugin:" +msgstr "plugin" + +#: ../IkiWiki/Plugin/websetup.pm:107 +#, fuzzy, perl-format +msgid "%s plugins" msgstr "plugin" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:244 +#: ../IkiWiki/Plugin/websetup.pm:260 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:276 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" -msgstr "plugin" - -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1009,7 +1019,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1085,20 +1095,20 @@ msgstr "ikiwiki: impossibile compilare %s" msgid "cannot read %s: %s" msgstr "impossibile leggere %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "sistema di controllo di revisione %s non supportato" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "impossibile creare un repository tramite ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1170,25 +1180,25 @@ msgstr "impossibile usare più plugin rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index 203155cfb..5c8fc1390 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Błąd" @@ -148,35 +148,35 @@ msgstr "gotowe" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -184,7 +184,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,12 +199,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -212,7 +212,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -248,7 +248,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -264,133 +264,133 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, fuzzy, perl-format msgid "%s parameter is required" msgstr "Parametry \"test\" i \"then\" są wymagane" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, fuzzy, perl-format msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "awaria w trakcie uruchamiania wtyczki graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -400,117 +400,117 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za " "pomocą parametru --url" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "Tytuł nowego wpisu" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "brakujący szablon %s" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "" "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " "teraz edytowana" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Kopie lustrzane" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Kopia lustrzana" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -518,19 +518,19 @@ msgstr "" msgid "more" msgstr "więcej" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "niedostępna funkcja getctime" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Pobierz OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Dla każdej strony istnieje odnośnik z innej strony" @@ -539,31 +539,39 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Konto założone pomyślnie. Teraz można zalogować się." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Błąd w trakcie zakładania konta." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -594,119 +602,119 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "głosuj" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Oddane głosy:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "wtyczka polygen nie jest zainstalowana" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "brakująca reguła" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "nieznana reguła" @@ -775,12 +783,12 @@ msgstr "o północy" msgid "at noon on %A" msgstr "w południe w %A" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -788,84 +796,84 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " "teraz edytowana" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, fuzzy, perl-format msgid "%s is not a file" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "renderowanie %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -880,21 +888,21 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "brakujący parametr name lub url" @@ -902,7 +910,7 @@ msgstr "brakujący parametr name lub url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "skrót %s wskazuje na adres %s" @@ -912,124 +920,126 @@ msgstr "skrót %s wskazuje na adres %s" msgid "failed to parse any smileys" msgstr "awaria w trakcie przetwarzania emitoikonki" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "błąd w trakcie przetwarzania" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 #, fuzzy msgid "invalid featurepoint diameter" msgstr "nieprawidłowa średnica dla featurepoint" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 #, fuzzy msgid "invalid featurepoint location" msgstr "nieprawidłowe położenie dla featurepoint" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "nieprawidłowa wysokość" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "brakujący parametr width" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "nieprawidłowa szerokość" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "awaria w trakcie uruchamiania php" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "nie można znaleźć pliku" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "nieznany format danych" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "brak danych" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "Bezpośrednie pobieranie danych" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "awaria w trakcie przetwarzania linii %d: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "brakujący parametr id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 #, fuzzy msgid "missing tex code" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1103,20 +1113,20 @@ msgstr "ikiwiki: awaria w trakcie tworzenia %s" msgid "cannot read %s: %s" msgstr "awaria w trakcie odczytu %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1189,25 +1199,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 49518e2a8..62b9d6905 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Fel" @@ -145,35 +145,35 @@ msgstr "klar" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -181,7 +181,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -196,12 +196,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -209,7 +209,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -245,7 +245,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -261,133 +261,133 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -397,113 +397,113 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "Måste ange url till wiki med --url när --rss eller --atom används" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s är låst av %s och kan inte redigeras" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Speglar" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Spegel" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -511,19 +511,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "getctime inte implementerad" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Skaffa ett OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Alla sidor länkas till av andra sidor." @@ -532,31 +532,39 @@ msgstr "Alla sidor länkas till av andra sidor." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Kontot har skapats. Du kan nu logga in." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Fel vid skapandet av konto." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -587,119 +595,119 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "röst" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Antal röster:" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "polygen inte installerad" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -767,12 +775,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -780,82 +788,82 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s är låst av %s och kan inte redigeras" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "ritar upp %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -870,21 +878,21 @@ msgstr "misslyckades med att skriva %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "genväg saknar parameter för namn eller url" @@ -892,7 +900,7 @@ msgstr "genväg saknar parameter för namn eller url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "genvägen %s pekar på %s" @@ -902,121 +910,123 @@ msgstr "genvägen %s pekar på %s" msgid "failed to parse any smileys" msgstr "misslyckades med att tolka smilisar, inaktiverar instick" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1090,20 +1100,20 @@ msgstr "ikiwiki: kan inte rita upp %s" msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1174,25 +1184,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index 113427f9b..94ad12e9e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi." msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Hata" @@ -141,32 +141,32 @@ msgstr "" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 msgid "Failed to create S3 bucket: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 msgid "Failed to save file to S3: " msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 msgid "Failed to delete file from S3: " msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -174,7 +174,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -189,12 +189,12 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -202,7 +202,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -238,7 +238,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -254,127 +254,127 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, perl-format msgid "removing old preview %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 msgid "template not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 msgid "not a page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -383,104 +383,104 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" msgstr "" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, perl-format msgid "failed to read %s: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, perl-format msgid "failed to resize: %s" msgstr "" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, perl-format msgid "failed to determine size of image %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 msgid "page editing not allowed" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 msgid "missing pages parameter" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 msgid "RPC::XML::Client not found, not pinging" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 msgid "failed to run dot" msgstr "" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format msgid "%s is locked and cannot be edited" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:161 +#: ../IkiWiki/Plugin/meta.pm:162 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -488,19 +488,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." msgstr "" @@ -508,31 +508,39 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -562,117 +570,117 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 msgid "command failed" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -740,12 +748,12 @@ msgstr "geceyarısında" msgid "at noon on %A" msgstr "%A öğleyin" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -753,81 +761,81 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -842,28 +850,28 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 msgid "missing name or url parameter" msgstr "" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, perl-format msgid "shortcut %s points to %s" msgstr "" @@ -872,113 +880,115 @@ msgstr "" msgid "failed to parse any smileys" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 msgid "parse error" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 msgid "invalid height value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 msgid "missing width parameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 msgid "invalid width value" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 msgid "failed to run php" msgstr "" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, perl-format msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 msgid "missing id parameter" msgstr "" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 msgid "failed to process:" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 msgid "failed to generate image from code" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1052,20 +1062,20 @@ msgstr "" msgid "cannot read %s: %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1136,25 +1146,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index 9fccf87b5..9326f2975 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-22 16:04-0500\n" +"POT-Creation-Date: 2010-02-12 16:48-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1281 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 msgid "Error" msgstr "Lỗi" @@ -146,35 +146,35 @@ msgstr "xong" msgid "Must specify %s" msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:136 +#: ../IkiWiki/Plugin/amazon_s3.pm:140 #, fuzzy msgid "Failed to create S3 bucket: " msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/amazon_s3.pm:221 +#: ../IkiWiki/Plugin/amazon_s3.pm:225 #, fuzzy msgid "Failed to save file to S3: " msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/amazon_s3.pm:243 +#: ../IkiWiki/Plugin/amazon_s3.pm:247 #, fuzzy msgid "Failed to delete file from S3: " msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/attachment.pm:49 +#: ../IkiWiki/Plugin/attachment.pm:50 #, perl-format msgid "there is already a page named %s" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:65 +#: ../IkiWiki/Plugin/attachment.pm:66 msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:140 +#: ../IkiWiki/Plugin/attachment.pm:141 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:182 +#: ../IkiWiki/Plugin/attachment.pm:183 msgid "attachment upload" msgstr "" @@ -182,7 +182,7 @@ msgstr "" msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:108 +#: ../IkiWiki/Plugin/blogspam.pm:109 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,12 +197,12 @@ msgstr "" msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:130 msgid "comment must have content" msgstr "" @@ -210,7 +210,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" @@ -246,7 +246,7 @@ msgstr "" msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:240 +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 msgid "you are not logged in as an admin" msgstr "" @@ -262,133 +262,133 @@ msgstr "" msgid "Comments" msgstr "" -#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 +#: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:66 +#: ../IkiWiki/Plugin/cutpaste.pm:67 msgid "no text was copied in this page" msgstr "" -#: ../IkiWiki/Plugin/cutpaste.pm:69 +#: ../IkiWiki/Plugin/cutpaste.pm:70 #, perl-format msgid "no text was copied in this page with id %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:40 +#: ../IkiWiki/Plugin/editpage.pm:41 #, fuzzy, perl-format msgid "removing old preview %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Plugin/editpage.pm:113 +#: ../IkiWiki/Plugin/editpage.pm:114 #, perl-format msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:292 +#: ../IkiWiki/Plugin/editpage.pm:296 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 -#: ../IkiWiki/Plugin/editpage.pm:422 +#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 +#: ../IkiWiki/Plugin/editpage.pm:426 #, perl-format msgid "editing %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/edittemplate.pm:51 +#: ../IkiWiki/Plugin/edittemplate.pm:52 #, fuzzy msgid "template not specified" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/edittemplate.pm:54 +#: ../IkiWiki/Plugin/edittemplate.pm:55 #, fuzzy msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:63 +#: ../IkiWiki/Plugin/edittemplate.pm:64 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:137 +#: ../IkiWiki/Plugin/edittemplate.pm:138 #, fuzzy msgid "failed to process" msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/format.pm:20 +#: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/fortune.pm:27 +#: ../IkiWiki/Plugin/fortune.pm:28 msgid "fortune failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/getsource.pm:63 ../IkiWiki/Plugin/goto.pm:56 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/getsource.pm:65 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 #, perl-format msgid "The page %s does not exist." msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:74 +#: ../IkiWiki/Plugin/getsource.pm:75 #, fuzzy msgid "not a page" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Plugin/getsource.pm:76 +#: ../IkiWiki/Plugin/getsource.pm:77 #, perl-format msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:657 ../IkiWiki/Plugin/git.pm:675 +#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:697 +#: ../IkiWiki/Plugin/git.pm:698 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:701 +#: ../IkiWiki/Plugin/git.pm:702 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:25 ../IkiWiki/Plugin/po.pm:131 -#: ../IkiWiki/Plugin/search.pm:36 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" -#: ../IkiWiki/Plugin/graphviz.pm:67 +#: ../IkiWiki/Plugin/graphviz.pm:68 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/graphviz.pm:94 +#: ../IkiWiki/Plugin/graphviz.pm:95 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:47 +#: ../IkiWiki/Plugin/highlight.pm:48 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:58 +#: ../IkiWiki/Plugin/highlight.pm:59 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:123 +#: ../IkiWiki/Plugin/highlight.pm:124 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -398,113 +398,113 @@ msgstr "" msgid "htmltidy failed to parse this html" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/img.pm:64 +#: ../IkiWiki/Plugin/img.pm:69 #, fuzzy msgid "Image::Magick is not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/img.pm:68 ../IkiWiki/Plugin/img.pm:112 +#: ../IkiWiki/Plugin/img.pm:73 ../IkiWiki/Plugin/img.pm:117 #, fuzzy, perl-format msgid "failed to read %s: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:74 +#: ../IkiWiki/Plugin/img.pm:79 #, perl-format msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:120 +#: ../IkiWiki/Plugin/img.pm:125 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/img.pm:140 +#: ../IkiWiki/Plugin/img.pm:145 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/inline.pm:92 +#: ../IkiWiki/Plugin/inline.pm:93 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --" "atom »" -#: ../IkiWiki/Plugin/inline.pm:138 +#: ../IkiWiki/Plugin/inline.pm:139 #, fuzzy msgid "page editing not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/inline.pm:155 +#: ../IkiWiki/Plugin/inline.pm:156 #, fuzzy msgid "missing pages parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/inline.pm:191 +#: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:312 +#: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:332 +#: ../IkiWiki/Plugin/inline.pm:333 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:624 +#: ../IkiWiki/Plugin/inline.pm:625 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" -#: ../IkiWiki/Plugin/linkmap.pm:80 ../IkiWiki/Plugin/linkmap.pm:87 -#: ../IkiWiki/Plugin/linkmap.pm:91 ../IkiWiki/Plugin/linkmap.pm:94 +#: ../IkiWiki/Plugin/linkmap.pm:81 ../IkiWiki/Plugin/linkmap.pm:88 +#: ../IkiWiki/Plugin/linkmap.pm:92 ../IkiWiki/Plugin/linkmap.pm:95 #, fuzzy msgid "failed to run dot" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/linkmap.pm:84 +#: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" msgstr "" -#: ../IkiWiki/Plugin/lockedit.pm:48 +#: ../IkiWiki/Plugin/lockedit.pm:49 #, fuzzy, perl-format msgid "%s is locked and cannot be edited" msgstr "%s bị %s khoá nên không thể sửa được" -#: ../IkiWiki/Plugin/mdwn.pm:44 +#: ../IkiWiki/Plugin/mdwn.pm:45 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgstr "" -#: ../IkiWiki/Plugin/mdwn.pm:69 +#: ../IkiWiki/Plugin/mdwn.pm:70 #, perl-format 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:161 +#: ../IkiWiki/Plugin/meta.pm:162 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:199 +#: ../IkiWiki/Plugin/meta.pm:200 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:213 +#: ../IkiWiki/Plugin/meta.pm:214 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/mirrorlist.pm:43 +#: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirror" msgstr "Nhân bản" -#: ../IkiWiki/Plugin/moderatedcomments.pm:41 +#: ../IkiWiki/Plugin/moderatedcomments.pm:42 msgid "comment needs moderation" msgstr "" @@ -512,19 +512,19 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:65 +#: ../IkiWiki/Plugin/norcs.pm:66 msgid "getctime not implemented" msgstr "chưa thực hiện getctime" -#: ../IkiWiki/Plugin/openid.pm:61 +#: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:64 +#: ../IkiWiki/Plugin/openid.pm:65 msgid "Get an OpenID" msgstr "Lấy OpenID" -#: ../IkiWiki/Plugin/orphans.pm:55 +#: ../IkiWiki/Plugin/orphans.pm:56 #, fuzzy msgid "All pages have other pages linking to them." msgstr "Mọi trang được liên kết với trang khác." @@ -533,31 +533,39 @@ msgstr "Mọi trang được liên kết với trang khác." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:248 +#: ../IkiWiki/Plugin/passwordauth.pm:229 +msgid "Your user page: " +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:236 +msgid "Create your user page" +msgstr "" + +#: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." -#: ../IkiWiki/Plugin/passwordauth.pm:251 +#: ../IkiWiki/Plugin/passwordauth.pm:267 msgid "Error creating account." msgstr "Gặp lỗi khi tạo tài khoản." -#: ../IkiWiki/Plugin/passwordauth.pm:258 +#: ../IkiWiki/Plugin/passwordauth.pm:274 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:292 +#: ../IkiWiki/Plugin/passwordauth.pm:308 msgid "Failed to send mail" msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/passwordauth.pm:294 +#: ../IkiWiki/Plugin/passwordauth.pm:310 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:329 +#: ../IkiWiki/Plugin/passwordauth.pm:345 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:332 +#: ../IkiWiki/Plugin/passwordauth.pm:348 msgid "password reset denied" msgstr "" @@ -588,119 +596,119 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:138 +#: ../IkiWiki/Plugin/po.pm:139 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:150 +#: ../IkiWiki/Plugin/po.pm:151 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:155 +#: ../IkiWiki/Plugin/po.pm:156 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:385 +#: ../IkiWiki/Plugin/po.pm:386 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:389 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:427 +#: ../IkiWiki/Plugin/po.pm:428 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:451 +#: ../IkiWiki/Plugin/po.pm:452 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:471 +#: ../IkiWiki/Plugin/po.pm:472 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:870 +#: ../IkiWiki/Plugin/po.pm:871 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:884 +#: ../IkiWiki/Plugin/po.pm:885 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:893 +#: ../IkiWiki/Plugin/po.pm:894 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:900 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:935 +#: ../IkiWiki/Plugin/po.pm:936 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:948 +#: ../IkiWiki/Plugin/po.pm:949 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1032 +#: ../IkiWiki/Plugin/po.pm:1033 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1088 ../IkiWiki/Plugin/po.pm:1102 -#: ../IkiWiki/Plugin/po.pm:1141 +#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1142 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1100 +#: ../IkiWiki/Plugin/po.pm:1101 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1153 +#: ../IkiWiki/Plugin/po.pm:1154 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/poll.pm:69 +#: ../IkiWiki/Plugin/poll.pm:70 msgid "vote" msgstr "bỏ phiếu" -#: ../IkiWiki/Plugin/poll.pm:77 +#: ../IkiWiki/Plugin/poll.pm:78 msgid "Total votes:" msgstr "Tổng số phiếu :" -#: ../IkiWiki/Plugin/polygen.pm:41 +#: ../IkiWiki/Plugin/polygen.pm:42 msgid "polygen not installed" msgstr "chưa cài đặt polygen" -#: ../IkiWiki/Plugin/polygen.pm:60 +#: ../IkiWiki/Plugin/polygen.pm:61 #, fuzzy msgid "command failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/postsparkline.pm:46 +#: ../IkiWiki/Plugin/postsparkline.pm:47 msgid "missing formula" msgstr "" -#: ../IkiWiki/Plugin/postsparkline.pm:53 +#: ../IkiWiki/Plugin/postsparkline.pm:54 msgid "unknown formula" msgstr "" @@ -768,12 +776,12 @@ msgstr "" msgid "at noon on %A" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:34 +#: ../IkiWiki/Plugin/progress.pm:35 #, perl-format msgid "illegal percent value %s" msgstr "" -#: ../IkiWiki/Plugin/progress.pm:55 +#: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" @@ -781,82 +789,82 @@ msgstr "" msgid "(Diff truncated)" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:32 ../IkiWiki/Plugin/rename.pm:37 #, perl-format msgid "%s does not exist" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:38 +#: ../IkiWiki/Plugin/remove.pm:39 #, fuzzy, perl-format msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s bị %s khoá nên không thể sửa được" -#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:42 ../IkiWiki/Plugin/rename.pm:46 #, perl-format msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:134 +#: ../IkiWiki/Plugin/remove.pm:135 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:171 +#: ../IkiWiki/Plugin/remove.pm:172 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:211 +#: ../IkiWiki/Plugin/remove.pm:212 msgid "removed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:42 +#: ../IkiWiki/Plugin/rename.pm:43 #, perl-format msgid "%s is not in the srcdir, so it cannot be renamed" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:62 +#: ../IkiWiki/Plugin/rename.pm:63 #, fuzzy msgid "no change to the file name was specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/rename.pm:68 +#: ../IkiWiki/Plugin/rename.pm:69 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:73 +#: ../IkiWiki/Plugin/rename.pm:74 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:79 +#: ../IkiWiki/Plugin/rename.pm:80 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:122 +#: ../IkiWiki/Plugin/rename.pm:123 #, fuzzy, perl-format msgid "rename %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Plugin/rename.pm:161 +#: ../IkiWiki/Plugin/rename.pm:162 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:248 +#: ../IkiWiki/Plugin/rename.pm:249 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:251 +#: ../IkiWiki/Plugin/rename.pm:252 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:348 +#: ../IkiWiki/Plugin/rename.pm:349 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:572 +#: ../IkiWiki/Plugin/rename.pm:573 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -871,21 +879,21 @@ msgstr "lỗi ghi %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:182 +#: ../IkiWiki/Plugin/search.pm:183 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:217 +#: ../IkiWiki/Plugin/search.pm:218 msgid "search" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:31 +#: ../IkiWiki/Plugin/shortcut.pm:32 #, perl-format msgid "shortcut plugin will not work without %s" msgstr "" -#: ../IkiWiki/Plugin/shortcut.pm:44 +#: ../IkiWiki/Plugin/shortcut.pm:45 #, fuzzy msgid "missing name or url parameter" msgstr "lối tắt thiếu tên hay tham số url" @@ -893,7 +901,7 @@ msgstr "lối tắt thiếu tên hay tham số url" #. translators: This is used to display what shortcuts are defined. #. translators: First parameter is the name of the shortcut, the second #. translators: is an URL. -#: ../IkiWiki/Plugin/shortcut.pm:54 +#: ../IkiWiki/Plugin/shortcut.pm:55 #, fuzzy, perl-format msgid "shortcut %s points to %s" msgstr "lối tắt %s chỉ tới %s" @@ -903,121 +911,123 @@ msgstr "lối tắt %s chỉ tới %s" msgid "failed to parse any smileys" msgstr "lỗi phân tách hình cười nào nên tắt bổ sung" -#: ../IkiWiki/Plugin/sparkline.pm:72 +#: ../IkiWiki/Plugin/sparkline.pm:73 #, fuzzy msgid "parse error" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:78 +#: ../IkiWiki/Plugin/sparkline.pm:79 msgid "invalid featurepoint diameter" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:88 +#: ../IkiWiki/Plugin/sparkline.pm:89 msgid "invalid featurepoint location" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:99 +#: ../IkiWiki/Plugin/sparkline.pm:100 msgid "missing values" msgstr "" -#: ../IkiWiki/Plugin/sparkline.pm:104 +#: ../IkiWiki/Plugin/sparkline.pm:105 #, fuzzy msgid "invalid height value" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:111 +#: ../IkiWiki/Plugin/sparkline.pm:112 #, fuzzy msgid "missing width parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/sparkline.pm:115 +#: ../IkiWiki/Plugin/sparkline.pm:116 #, fuzzy msgid "invalid width value" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/sparkline.pm:153 +#: ../IkiWiki/Plugin/sparkline.pm:154 #, fuzzy msgid "failed to run php" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/table.pm:31 +#: ../IkiWiki/Plugin/table.pm:32 msgid "cannot find file" msgstr "" -#: ../IkiWiki/Plugin/table.pm:87 +#: ../IkiWiki/Plugin/table.pm:88 msgid "unknown data format" msgstr "" -#: ../IkiWiki/Plugin/table.pm:95 +#: ../IkiWiki/Plugin/table.pm:96 msgid "empty data" msgstr "" -#: ../IkiWiki/Plugin/table.pm:114 +#: ../IkiWiki/Plugin/table.pm:115 msgid "Direct data download" msgstr "" -#: ../IkiWiki/Plugin/table.pm:148 +#: ../IkiWiki/Plugin/table.pm:149 #, fuzzy, perl-format msgid "parse fail at line %d: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/template.pm:29 +#: ../IkiWiki/Plugin/template.pm:34 #, fuzzy msgid "missing id parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/template.pm:36 +#: ../IkiWiki/Plugin/template.pm:41 #, perl-format msgid "template %s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/template.pm:55 +#: ../IkiWiki/Plugin/template.pm:60 #, fuzzy msgid "failed to process:" msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/teximg.pm:70 +#: ../IkiWiki/Plugin/teximg.pm:71 msgid "missing tex code" msgstr "" -#: ../IkiWiki/Plugin/teximg.pm:122 +#: ../IkiWiki/Plugin/teximg.pm:123 #, fuzzy msgid "failed to generate image from code" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/websetup.pm:89 -msgid "plugin" +#: ../IkiWiki/Plugin/websetup.pm:91 +#, perl-format +msgid "%s plugin:" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:108 +#: ../IkiWiki/Plugin/websetup.pm:107 #, perl-format -msgid "enable %s?" +msgid "%s plugins" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:244 -msgid "setup file for this wiki is not known" +#: ../IkiWiki/Plugin/websetup.pm:121 +#, perl-format +msgid "enable %s?" msgstr "" #: ../IkiWiki/Plugin/websetup.pm:260 -msgid "main" +msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:261 -msgid "plugins" +#: ../IkiWiki/Plugin/websetup.pm:276 +msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:404 +#: ../IkiWiki/Plugin/websetup.pm:419 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:408 +#: ../IkiWiki/Plugin/websetup.pm:423 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:445 +#: ../IkiWiki/Plugin/websetup.pm:460 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1091,20 +1101,20 @@ msgstr "ikiwiki: không thể vẽ %s" msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: ../IkiWiki/Setup/Automator.pm:33 +#: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:79 +#: ../IkiWiki/Setup/Automator.pm:80 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:105 +#: ../IkiWiki/Setup/Automator.pm:106 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:123 +#: ../IkiWiki/Setup/Automator.pm:124 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1175,25 +1185,25 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1263 +#: ../IkiWiki.pm:1255 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1862 +#: ../IkiWiki.pm:1854 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2005 +#: ../IkiWiki.pm:1997 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2016 +#: ../IkiWiki.pm:2008 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2035 +#: ../IkiWiki.pm:2027 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From c21eb47e627de2dfd5409b459b2e11498c534f3c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Feb 2010 18:27:47 -0500 Subject: comments: Display number of comments in comment action link. This was not doable before, but when I added transitive dependency handling in the big dependency rewrite, it became possible to include a comment count when inlining. This also improves the action link when a page has no comments. It will link direct to the cgi to allow posting the first comment. And if the page is locked to prevent posting new comments, the link is no longer shown. --- IkiWiki/Plugin/comments.pm | 36 +++++++++++++++++++++++++----------- debian/changelog | 8 ++++++++ 2 files changed, 33 insertions(+), 11 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 5bcf4a981..8f8472f07 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -736,9 +736,7 @@ sub pagetemplate (@) { } if ($shown && commentsopen($page)) { - my $addcommenturl = IkiWiki::cgiurl(do => 'comment', - page => $page); - $template->param(addcommenturl => $addcommenturl); + $template->param(addcommenturl => addcommenturl($page)); } } @@ -755,16 +753,26 @@ sub pagetemplate (@) { urlto($page, undef, 1).'comments.atom'); } - # XXX Would be nice to say how many comments there are in - # the link. But, to update the number, blog pages - # would have to update whenever comments of any inlines - # page are added, which is not currently done. if ($template->query(name => 'commentslink')) { - $template->param(commentslink => - htmllink($page, $params{destpage}, $page, - linktext => gettext("Comments"), + my $num=num_comments($page, $config{srcdir}); + my $link; + if ($num > 0) { + $link = htmllink($page, $params{destpage}, $page, + linktext => sprintf(ngettext("%i comment", "%i comments", $num), $num), anchor => "comments", - noimageinline => 1)); + noimageinline => 1 + ); + } + elsif (commentsopen($page)) { + $link = "". + #translators: Here "Comment" is a verb; + #translators: the user clicks on it to + #translators: post a comment. + gettext("Comment"). + ""; + } + $template->param(commentslink => $link) + if defined $link; } } @@ -812,6 +820,12 @@ sub pagetemplate (@) { } } +sub addcommenturl ($) { + my $page=shift; + + return IkiWiki::cgiurl(do => 'comment', page => $page); +} + sub num_comments ($$) { my $page=shift; my $dir=shift; diff --git a/debian/changelog b/debian/changelog index c91feae0d..e3ec89eed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20100213) UNRELEASED; urgency=low + + * comments: Display number of comments in comment action link. + * Rebuild wikis on upgrade to this version to get the comment counts + added to existing pages. + + -- Joey Hess Sun, 14 Feb 2010 17:02:10 -0500 + ikiwiki (3.20100212) unstable; urgency=low * template: Preprocess parameters before htmlizing. -- cgit v1.2.3 From b3c3c42b269c102123dcd80979cb9c49ce13bca7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 26 Feb 2010 11:49:51 -0500 Subject: Loosen regexp, to allow empty quoted parameters in directives. --- IkiWiki.pm | 6 +++--- debian/changelog | 1 + t/preprocess.t | 12 +++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index b9a419d1d..9df6c90d6 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1220,7 +1220,7 @@ sub preprocess ($$$;$$) { (?: """(.*?)""" # 2: triple-quoted value | - "([^"]+)" # 3: single-quoted value + "([^"]*?)" # 3: single-quoted value | (\S+) # 4: unquoted value ) @@ -1306,7 +1306,7 @@ sub preprocess ($$$;$$) { (?: """.*?""" # triple-quoted value | - "[^"]+" # single-quoted value + "[^"]*?" # single-quoted value | [^"\s\]]+ # unquoted value ) @@ -1329,7 +1329,7 @@ sub preprocess ($$$;$$) { (?: """.*?""" # triple-quoted value | - "[^"]+" # single-quoted value + "[^"]*?" # single-quoted value | [^"\s\]]+ # unquoted value ) diff --git a/debian/changelog b/debian/changelog index e3ec89eed..1960a1226 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low * comments: Display number of comments in comment action link. * Rebuild wikis on upgrade to this version to get the comment counts added to existing pages. + * Loosen regexp, to allow empty quoted parameters in directives. -- Joey Hess Sun, 14 Feb 2010 17:02:10 -0500 diff --git a/t/preprocess.t b/t/preprocess.t index e5026ed64..7bb9878d0 100755 --- a/t/preprocess.t +++ b/t/preprocess.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 21; +use Test::More tests => 31; BEGIN { use_ok("IkiWiki"); } @@ -26,6 +26,16 @@ is(IkiWiki::preprocess("foo", "foo", "[[foo ]]", 0, 0), "foo()", "simple"); is(IkiWiki::preprocess("foo", "foo", "[[!foo ]]", 0, 0), "foo()", "prefixed"); is(IkiWiki::preprocess("foo", "foo", "[[!foo]]", 0, 0), "[[!foo]]", "prefixed, no space"); is(IkiWiki::preprocess("foo", "foo", "[[foo a=1]]", 0, 0), "foo(a => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="1"]]}, 0, 0), "foo(a => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""1"""]]}, 0, 0), "foo(a => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a=""]]}, 0, 0), "foo(a)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b="1"]]}, 0, 0), "foo(a, b => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a=""""""]]}, 0, 0), "foo(a)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b="1"]]}, 0, 0), "foo(a, b => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b="""1"""]]}, 0, 0), "foo(a, b => 1)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="""""" b=""""""]]}, 0, 0), "foo(a, b)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b=""""""]]}, 0, 0), "foo(a, b)"); +is(IkiWiki::preprocess("foo", "foo", q{[[foo a="" b="""1"""]]}, 0, 0), "foo(a, b => 1)"); is(IkiWiki::preprocess("foo", "foo", "[[foo a=\"1 2 3 4\"]]", 0, 0), "foo(a => 1 2 3 4)"); is(IkiWiki::preprocess("foo", "foo", "[[foo ]] then [[foo a=2]]", 0, 0), "foo() then foo(a => 2)"); -- cgit v1.2.3 From a12c386c86d000971125d70bf22213fd9595ed45 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 27 Feb 2010 16:26:13 -0500 Subject: Add force_overwrite setting to make setup automator overwrite existing files/directories. This can be useful if you're driving the setup automator from another program. --- IkiWiki/Setup/Automator.pm | 22 ++++++++++++---------- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 9fee4dcb7..79a610e20 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -40,17 +40,19 @@ sub import (@) { my $this=shift; IkiWiki::Setup::merge({@_}); - # Avoid overwriting any existing files. - foreach my $key (qw{srcdir destdir repository dumpsetup}) { - next unless exists $config{$key}; - my $add=""; - my $dir=IkiWiki::dirname($config{$key})."/"; - my $base=IkiWiki::basename($config{$key}); - while (-e $dir.$add.$base) { - $add=1 if ! $add; - $add++; + if (! $config{force_overwrite}) { + # Avoid overwriting any existing files. + foreach my $key (qw{srcdir destdir repository dumpsetup}) { + next unless exists $config{$key}; + my $add=""; + my $dir=IkiWiki::dirname($config{$key})."/"; + my $base=IkiWiki::basename($config{$key}); + while (-e $dir.$add.$base) { + $add=1 if ! $add; + $add++; + } + $config{$key}=$dir.$add.$base; } - $config{$key}=$dir.$add.$base; } # Set up wrapper diff --git a/debian/changelog b/debian/changelog index 1960a1226..bdbd818e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low * Rebuild wikis on upgrade to this version to get the comment counts added to existing pages. * Loosen regexp, to allow empty quoted parameters in directives. + * Add force_overwrite setting to make setup automator overwrite existing + files/directories. -- Joey Hess Sun, 14 Feb 2010 17:02:10 -0500 -- cgit v1.2.3 From 6aaa6e0d245e450315a073f62e27c233cefbe9ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 27 Feb 2010 16:36:57 -0500 Subject: Fix admin openid detection in setup automator, and avoid prompting for a password. --- IkiWiki/Setup/Automator.pm | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 79a610e20..9da594e99 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -144,7 +144,7 @@ sub import (@) { # Create admin user(s). foreach my $admin (@{$config{adminuser}}) { - next if $admin=~/^http\?:\/\//; # openid + next if defined IkiWiki::openiduser($admin); # Prompt for password w/o echo. my ($password, $password2); diff --git a/debian/changelog b/debian/changelog index bdbd818e1..832bbaa85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low * Loosen regexp, to allow empty quoted parameters in directives. * Add force_overwrite setting to make setup automator overwrite existing files/directories. + * Fix admin openid detection in setup automator, and avoid prompting + for a password. -- Joey Hess Sun, 14 Feb 2010 17:02:10 -0500 -- cgit v1.2.3 From 60d2dd318f66563c3ee3bde950d7f53426530acc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 28 Feb 2010 00:12:47 -0500 Subject: Add new --clean option; this makes ikiwiki remove all built files in the destdir, as well as wrappers and the .ikiwiki directory. --- IkiWiki.pm | 7 +++++++ IkiWiki/Render.pm | 11 +++++++++++ Makefile.PL | 2 +- debian/changelog | 4 +++- doc/usage.mdwn | 8 ++++++++ ikiwiki.in | 12 +++++++++++- ikiwiki.spec | 2 +- 7 files changed, 42 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 9df6c90d6..00eadfd98 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -409,6 +409,13 @@ sub getsetup () { safe => 0, rebuild => 0, }, + clean => { + type => "internal", + default => 0, + description => "running in clean mode", + safe => 0, + rebuild => 0, + }, refresh => { type => "internal", default => 0, diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 3ebb1a324..af24df155 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -683,6 +683,17 @@ sub refresh () { } } +sub clean_rendered { + lockwiki(); + loadindex(); + remove_unrendered(); + foreach my $page (keys %oldrenderedfiles) { + foreach my $file (@{$oldrenderedfiles{$page}}) { + prune($config{destdir}."/".$file); + } + } +} + sub commandline_render () { lockwiki(); loadindex(); diff --git a/Makefile.PL b/Makefile.PL index 462f7364d..52421a711 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -51,7 +51,7 @@ docwiki: ikiwiki.out $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh extra_clean: - rm -rf html doc/.ikiwiki + $(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc $(MAKE) -C po clean diff --git a/debian/changelog b/debian/changelog index 832bbaa85..3b92c598d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100213) UNRELEASED; urgency=low +ikiwiki (3.20100228) UNRELEASED; urgency=low * comments: Display number of comments in comment action link. * Rebuild wikis on upgrade to this version to get the comment counts @@ -8,6 +8,8 @@ ikiwiki (3.20100213) UNRELEASED; urgency=low files/directories. * Fix admin openid detection in setup automator, and avoid prompting for a password. + * Add new --clean option; this makes ikiwiki remove all built + files in the destdir, as well as wrappers and the .ikiwiki directory. -- Joey Hess Sun, 14 Feb 2010 17:02:10 -0500 diff --git a/doc/usage.mdwn b/doc/usage.mdwn index e4808d4c2..a105d7e59 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -50,6 +50,14 @@ These options control the mode that ikiwiki operates in. If used with --setup --refresh, this makes it also update any configured wrappers. +* --clean + + This makes ikiwiki clean up by removing any files it denerated in the + `destination` directory, as well as any configured wrappers, and the + `.ikiwiki` state directory. This is mostly useful if you're running + ikiwiki in a Makefile to build documentation and want a corresponding + `clean` target. + * --cgi Enable [[CGI]] mode. In cgi mode ikiwiki runs as a cgi script, and diff --git a/ikiwiki.in b/ikiwiki.in index b8581d880..ae1251ff6 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -37,6 +37,7 @@ sub getconfig () { "syslog!" => \$config{syslog}, "rebuild!" => \$config{rebuild}, "refresh!" => \$config{refresh}, + "clean!" => \$config{clean}, "post-commit" => \$config{post_commit}, "render=s" => \$config{render}, "wrappers!" => \$config{genwrappers}, @@ -135,6 +136,7 @@ sub main () { if (@{$config{wrappers}} && ! $config{render} && ! $config{dumpsetup} && + ! $config{clean} && ((! $config{refresh} && ! $config{post_commit}) || $config{genwrappers})) { debug(gettext("generating wrappers..")); @@ -159,7 +161,7 @@ sub main () { # setup implies a wiki rebuild by default if (! $config{refresh} && ! $config{render} && - ! $config{post_commit}) { + ! $config{post_commit} && ! $config{clean}) { $config{rebuild}=1; } } @@ -190,6 +192,14 @@ sub main () { elsif ($config{post_commit} && ! commit_hook_enabled()) { # do nothing } + elsif ($config{clean}) { + require IkiWiki::Render; + foreach my $wrapper (@{$config{wrappers}}) { + prune($wrapper->{wrapper}); + } + clean_rendered(); + system("rm", "-rf", $config{wikistatedir}); + } else { if ($config{rebuild}) { debug(gettext("rebuilding wiki..")); diff --git a/ikiwiki.spec b/ikiwiki.spec index 865c9a325..1dba9f463 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100212 +Version: 3.20100228 Release: 1%{?dist} Summary: A wiki compiler -- cgit v1.2.3 From 0385e4080dea208e6683492c9b8f52ff37b5b173 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 2 Mar 2010 22:23:07 -0500 Subject: releasing version 3.20100302 --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- po/bg.po | 52 +++++++++++++++++++++++++++++++--------------------- po/cs.po | 53 ++++++++++++++++++++++++++++++++--------------------- po/da.po | 53 ++++++++++++++++++++++++++++++++--------------------- po/de.po | 53 ++++++++++++++++++++++++++++++++--------------------- po/es.po | 53 ++++++++++++++++++++++++++++++++--------------------- po/fr.po | 53 ++++++++++++++++++++++++++++++++--------------------- po/gu.po | 52 +++++++++++++++++++++++++++++++--------------------- po/ikiwiki.pot | 53 ++++++++++++++++++++++++++++++++--------------------- po/it.po | 53 ++++++++++++++++++++++++++++++++--------------------- po/pl.po | 52 +++++++++++++++++++++++++++++++--------------------- po/sv.po | 52 +++++++++++++++++++++++++++++++--------------------- po/tr.po | 52 +++++++++++++++++++++++++++++++--------------------- po/vi.po | 51 ++++++++++++++++++++++++++++++--------------------- 15 files changed, 412 insertions(+), 276 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b92c598d..c0f99291f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100228) UNRELEASED; urgency=low +ikiwiki (3.20100302) unstable; urgency=low * comments: Display number of comments in comment action link. * Rebuild wikis on upgrade to this version to get the comment counts @@ -11,7 +11,7 @@ ikiwiki (3.20100228) UNRELEASED; urgency=low * Add new --clean option; this makes ikiwiki remove all built files in the destdir, as well as wrappers and the .ikiwiki directory. - -- Joey Hess Sun, 14 Feb 2010 17:02:10 -0500 + -- Joey Hess Tue, 02 Mar 2010 22:17:30 -0500 ikiwiki (3.20100212) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 1dba9f463..73ea7a9c6 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100228 +Version: 3.20100302 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index a211b7685..0e2108597 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Грешка" @@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "готово" @@ -258,8 +258,18 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1093,7 +1103,7 @@ msgstr "обновяване на страницата „%s”, зависещ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1109,16 +1119,16 @@ msgstr "грешка при четене на „%s”: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1156,19 +1166,19 @@ msgstr "формат: ikiwiki [опции] източник местоназна msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "генериране на обвивки..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." @@ -1176,40 +1186,40 @@ msgstr "осъвременяване на уики..." msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index d3cf3f5b9..09d411e98 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Chyba" @@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "hotovo" @@ -256,8 +256,19 @@ msgstr "Schvalování komentářů" msgid "comment moderation" msgstr "schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Komentáře" +msgstr[1] "Komentáře" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Komentáře" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1072,7 +1083,7 @@ msgstr "sestavuji %s, která závisí na %s" msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1088,16 +1099,16 @@ msgstr "nemohu číst %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "nepodporovaný systém pro správu verzí: %s" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" @@ -1135,19 +1146,19 @@ msgstr "použití: ikiwiki [volby] zdroj cíl" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup konfigurační.soubor" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "generuji obaly..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "obnovuji wiki..." @@ -1155,38 +1166,38 @@ msgstr "obnovuji wiki..." msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 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:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index b30730aa4..13d1dca59 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Fejl" @@ -140,7 +140,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "færdig" @@ -263,8 +263,19 @@ msgstr "Kommentarmoderering" msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Kommentarer" +msgstr[1] "Kommentarer" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Kommentarer" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1087,7 +1098,7 @@ msgstr "danner %s, som afhænger af %s" msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1103,16 +1114,16 @@ msgstr "kan ikke læse %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "revisionskontrolsystem %s ikke understøttet" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" @@ -1150,19 +1161,19 @@ msgstr "brug: ikiwiki [valg] kilde mål" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "bygger wrappers.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1170,39 +1181,39 @@ msgstr "genopfrisker wiki..." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 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:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally krævet for title_natural sortering" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index b024e3be7..9433501cc 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-07-23 01:07+0100\n" "Last-Translator: Kurt Gramlich \n" "Language-Team: German \n" @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Fehler" @@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "fertig" @@ -261,8 +261,19 @@ msgstr "Kommentar-Moderation" msgid "comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Kommentare" +msgstr[1] "Kommentare" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Kommentare" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1096,7 +1107,7 @@ msgstr "erzeuge %s, die von %s abhängt" msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1113,16 +1124,16 @@ msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "nicht unterstütztes Versionskontrollsystem %s" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1162,19 +1173,19 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup Konfigurationsdatei" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "erzeuge Wrapper.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." @@ -1182,41 +1193,41 @@ msgstr "aktualisiere Wiki.." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally wird benötigt für title_natural sort" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index 2923ac199..465e9c1a1 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Error" @@ -142,7 +142,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "completado" @@ -265,8 +265,19 @@ msgstr "Aprobación de comentarios" msgid "comment moderation" msgstr "aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Comentarios" +msgstr[1] "Comentarios" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Comentarios" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1095,7 +1106,7 @@ msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1111,16 +1122,16 @@ msgstr "no puedo leer el archivo %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "el sistema de control de versiones %s no está soportado" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1160,19 +1171,19 @@ msgstr "uso: ikiwiki [opciones] origen destino" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup archivo_de_configuración" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "generando programas auxiliares.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "actualizando el wiki.." @@ -1180,44 +1191,44 @@ msgstr "actualizando el wiki.." msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 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:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" "Se necesita el módulo Sort::Naturally para el tipo de ordenación " "title_natural" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 573168d51..723d3a036 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Erreur" @@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "Terminé" @@ -258,8 +258,19 @@ msgstr "Modération du commentaire" msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Commentaires" +msgstr[1] "Commentaires" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Commentaires" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1092,7 +1103,7 @@ msgstr "Reconstruction de %s, qui dépend de %s" msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1110,16 +1121,16 @@ msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1160,19 +1171,19 @@ msgstr "Syntaxe : ikiwiki [options] source destination" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup fichier de configuration" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." @@ -1180,39 +1191,39 @@ msgstr "Rafraîchissement du wiki..." msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff --git a/po/gu.po b/po/gu.po index 3cb505efe..f7725abb9 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "ક્ષતિ" @@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "સંપૂર્ણ" @@ -256,8 +256,18 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1079,7 +1089,7 @@ msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1095,16 +1105,16 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1142,19 +1152,19 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "આવરણ બનાવે છે.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." @@ -1162,38 +1172,38 @@ msgstr "વીકીને તાજી કરે છે.." msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4f44e7c74..11af9e4cd 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,13 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: ../IkiWiki/CGI.pm:116 msgid "You need to log in first." @@ -54,7 +55,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "" @@ -135,7 +136,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "" @@ -253,8 +254,18 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1053,7 +1064,7 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1069,16 +1080,16 @@ msgstr "" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1116,19 +1127,19 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "" @@ -1136,38 +1147,38 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index cc24cccd5..d664c4d30 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -53,7 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Errore" @@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "fatto" @@ -255,8 +255,19 @@ msgstr "Moderazione commenti" msgid "comment moderation" msgstr "moderazione commento" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, fuzzy, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "Commenti" +msgstr[1] "Commenti" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +#, fuzzy +msgid "Comment" msgstr "Commenti" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1083,7 +1094,7 @@ msgstr "compilazione di %s, che dipende da %s" msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1099,16 +1110,16 @@ msgstr "impossibile leggere %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "sistema di controllo di revisione %s non supportato" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "impossibile creare un repository tramite ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1147,19 +1158,19 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup configfile" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "generazione contenitori..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." @@ -1167,38 +1178,38 @@ msgstr "aggiornamento wiki..." msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index 5c8fc1390..77e1537f4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Błąd" @@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "gotowe" @@ -260,8 +260,18 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1101,7 +1111,7 @@ msgstr "renderowanie %s zależącego od %s" msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1117,16 +1127,16 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1164,19 +1174,19 @@ msgstr "użycie: ikiwiki [parametry] źródło cel" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "tworzenie osłon..." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." @@ -1184,40 +1194,40 @@ msgstr "odświeżanie wiki..." msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 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:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 62b9d6905..20a8020c1 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -54,7 +54,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Fel" @@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "klar" @@ -257,8 +257,18 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1088,7 +1098,7 @@ msgstr "ritar upp %s, vilken är beroende av %s" msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1104,16 +1114,16 @@ msgstr "kan inte läsa %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1151,19 +1161,19 @@ msgstr "användning: ikiwiki [flaggor] källa mål" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "genererar wrappers.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." @@ -1171,38 +1181,38 @@ msgstr "uppdaterar wiki.." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 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:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index 94ad12e9e..b3742ca36 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi." msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Hata" @@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "" @@ -250,8 +250,18 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" +msgstr[1] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1050,7 +1060,7 @@ msgstr "" msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1066,16 +1076,16 @@ msgstr "" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1113,19 +1123,19 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "" @@ -1133,38 +1143,38 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index 9326f2975..cfc7184ef 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-12 16:48-0500\n" +"POT-Creation-Date: 2010-03-02 22:18-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1273 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 msgid "Error" msgstr "Lỗi" @@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:206 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 msgid "done" msgstr "xong" @@ -258,8 +258,17 @@ msgstr "" msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:769 -msgid "Comments" +#: ../IkiWiki/Plugin/comments.pm:761 +#, perl-format +msgid "%i comment" +msgid_plural "%i comments" +msgstr[0] "" + +#. translators: Here "Comment" is a verb; +#. translators: the user clicks on it to +#. translators: post a comment. +#: ../IkiWiki/Plugin/comments.pm:771 +msgid "Comment" msgstr "" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 @@ -1089,7 +1098,7 @@ msgstr "đang vẽ %s mà phụ thuộc vào %s" msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:696 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1105,16 +1114,16 @@ msgstr "không thể đọc %s: %s" msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:80 +#: ../IkiWiki/Setup/Automator.pm:82 #, perl-format msgid "unsupported revision control system %s" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:106 +#: ../IkiWiki/Setup/Automator.pm:108 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" -#: ../IkiWiki/Setup/Automator.pm:124 +#: ../IkiWiki/Setup/Automator.pm:126 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1152,19 +1161,19 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:91 +#: ../ikiwiki.in:92 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:140 +#: ../ikiwiki.in:142 msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:195 +#: ../ikiwiki.in:205 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:198 +#: ../ikiwiki.in:208 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." @@ -1172,38 +1181,38 @@ msgstr "đang làm tươi wiki.." msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:507 +#: ../IkiWiki.pm:514 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:553 +#: ../IkiWiki.pm:560 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:582 +#: ../IkiWiki.pm:589 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1255 +#: ../IkiWiki.pm:1262 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1854 +#: ../IkiWiki.pm:1877 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1997 +#: ../IkiWiki.pm:2020 msgid "Sort::Naturally needed for title_natural sort" msgstr "" -#: ../IkiWiki.pm:2008 +#: ../IkiWiki.pm:2031 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2027 +#: ../IkiWiki.pm:2050 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From 6d27bbd026ebed85f8501b6b4daefaba73061574 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Mar 2010 19:55:19 -0500 Subject: Fix utf8 issues in calls to md5_hex. This prevented comments containing some utf-8, including euro sign, from being submitted. Since md5_hex is a C implementation, the string has to be converted from perl's internal encoding to utf-8 when it is called. Some utf-8 happened to work before, apparently by accident. Note that this will change the checksums returned. unique_comment_location is only used when posting comments, so the checksum does not need to be stable there. I only changed page_to_id for completeness; it is passed a comment page name, and they can currently never contain utf-8. In teximg, the bug could perhaps be triggered if the tex source contained utf-8. If that happens, the checksum will change, and some extra work might be performed on upgrade to rebuild the image. --- IkiWiki/Plugin/comments.pm | 4 ++-- IkiWiki/Plugin/teximg.pm | 3 ++- debian/changelog | 6 ++++++ 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 8f8472f07..bbf850a17 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -839,7 +839,7 @@ sub unique_comment_location ($$$) { eval q{use Digest::MD5 'md5_hex'}; error($@) if $@; - my $content_md5=md5_hex(shift); + my $content_md5=md5_hex(Encode::encode_utf8(shift)); my $dir=shift; @@ -862,7 +862,7 @@ sub page_to_id ($) { eval q{use Digest::MD5 'md5_hex'}; error($@) if $@; - return "comment-".md5_hex($page); + return "comment-".md5_hex(Encode::encode_utf8(($page)); } package IkiWiki::PageSpec; diff --git a/IkiWiki/Plugin/teximg.pm b/IkiWiki/Plugin/teximg.pm index 0aaa79698..521af499f 100644 --- a/IkiWiki/Plugin/teximg.pm +++ b/IkiWiki/Plugin/teximg.pm @@ -8,6 +8,7 @@ use strict; use Digest::MD5 qw(md5_hex); use File::Temp qw(tempdir); use HTML::Entities; +use Encode; use IkiWiki 3.00; my $default_prefix = <{page} . "/$digest.png"; my $imglog = $params->{page} . "/$digest.log"; diff --git a/debian/changelog b/debian/changelog index c0f99291f..d1253c079 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100303) UNRELEASED; urgency=low + + * Fix utf8 issues in calls to md5_hex. + + -- Joey Hess Tue, 09 Mar 2010 19:46:35 -0500 + ikiwiki (3.20100302) unstable; urgency=low * comments: Display number of comments in comment action link. -- cgit v1.2.3 From ac3aac560f74457ded48ba3b5a14d0bbbf9b6d92 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Mar 2010 15:44:10 -0500 Subject: moderatedcomments: Added moderate_pagespec * moderatedcomments: Added moderate_pagespec that can be used to control which users or comment locations are moderated. This can be used, just for example, to moderate http://myopenid.com/* if you're getting a lot of spammers from one particular openid provider (who should perhaps answer your emails about them), while not moderating other users. * moderatedcomments: The moderate_users setting is deprecated. Instead, set moderate_pagespec to "!admin()" or "user(*)" instead. --- IkiWiki/Plugin/moderatedcomments.pm | 37 ++++++++++++++++++++++++++++--------- debian/changelog | 8 ++++++++ doc/plugins/moderatedcomments.mdwn | 8 +++++--- 3 files changed, 41 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/moderatedcomments.pm b/IkiWiki/Plugin/moderatedcomments.pm index afe1ceedf..b0a328a06 100644 --- a/IkiWiki/Plugin/moderatedcomments.pm +++ b/IkiWiki/Plugin/moderatedcomments.pm @@ -17,10 +17,11 @@ sub getsetup () { rebuild => 0, section => "auth", }, - moderate_users => { - type => 'boolean', - example => 1, - description => 'Moderate comments of logged-in users?', + moderate_pagespec => { + type => 'pagespec', + example => 'user(http://*)', + description => 'PageSpec matching users or comment locations to moderate', + link => 'ikiwiki/PageSpec', safe => 1, rebuild => 0, }, @@ -32,14 +33,32 @@ sub checkcontent (@) { # only handle comments return undef unless pagespec_match($params{page}, "postcomment(*)", location => $params{page}); + + # backwards compatability + if (exists $config{moderate_users} && + ! exists $config{moderate_pagespec}) { + $config{moderate_pagespec} = $config{moderate_users} + ? "!admin()" + : "!user(*)"; + } + + # default is to moderate all except admins + if (! exists $config{moderate_pagespec}) { + $config{moderate_pagespec}="!admin()"; + } - # admins and maybe users can comment w/o moderation my $session=$params{session}; my $user=$session->param("name") if $session; - return undef if defined $user && (IkiWiki::is_admin($user) || - (exists $config{moderate_users} && ! $config{moderate_users})); - - return gettext("comment needs moderation"); + if (pagespec_match($params{page}, $config{moderate_pagespec}, + location => $params{page}, + (defined $user ? (user => $user) : ()), + (defined $ENV{REMOTE_ADDR} ? (ip => $ENV{REMOTE_ADDR}) : ()), + )) { + return gettext("comment needs moderation"); + } + else { + return undef; + } } 1 diff --git a/debian/changelog b/debian/changelog index d1253c079..c58e612db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,14 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low * Fix utf8 issues in calls to md5_hex. + * moderatedcomments: Added moderate_pagespec that can be used + to control which users or comment locations are moderated. + This can be used, just for example, to moderate http://myopenid.com/* + if you're getting a lot of spammers from one particular openid + provider (who should perhaps answer your emails about them), + while not moderating other users. + * moderatedcomments: The moderate_users setting is deprecated. Instead, + set moderate_pagespec to "!admin()" or "user(*)" instead. -- Joey Hess Tue, 09 Mar 2010 19:46:35 -0500 diff --git a/doc/plugins/moderatedcomments.mdwn b/doc/plugins/moderatedcomments.mdwn index 97924d742..c29b0b052 100644 --- a/doc/plugins/moderatedcomments.mdwn +++ b/doc/plugins/moderatedcomments.mdwn @@ -5,6 +5,8 @@ This plugin causes [[comments]] to be held for manual moderation. Admins can access the comment moderation queue via their preferences page. By default, all comments made by anyone who is not an admin will be held -for moderation. The `moderate_users` setting can be set to false to avoid -moderating comments of logged-in users, while still moderating anonymous -comments. +for moderation. The `moderate_pagespec` setting can be used to specify a +[[ikiwiki/PageSpec]] to match comments and users who should be moderated. +For example, to avoid moderating comments from logged-in users, set +`moderate_pagespec` to "!user(*)". Or to moderate everyone except for +admins, set it to "!admin(*)". -- cgit v1.2.3 From f259f33a0ad4858ce33f458148f1733351b91d92 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Mar 2010 15:49:48 -0500 Subject: Fix missing span on recentchanges page template. --- debian/changelog | 1 + doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn | 2 ++ 2 files changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c58e612db..6b5671e3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low while not moderating other users. * moderatedcomments: The moderate_users setting is deprecated. Instead, set moderate_pagespec to "!admin()" or "user(*)" instead. + * Fix missing span on recentchanges page template. -- Joey Hess Tue, 09 Mar 2010 19:46:35 -0500 diff --git a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn index 536af3473..5c322991a 100644 --- a/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn +++ b/doc/bugs/templateForRecentChangesMissingCloseSpan.mdwn @@ -22,3 +22,5 @@ PS: I have fixed the template by hand on my server, so it will validate, however > markup like this; using [[plugins/comments]] without having one or other of those is a bad idea > from the point of view of avoiding comment forgery, which is probably why icanttype.org works > correctly. Anyway, I've fixed this in a branch: Joey, care to review smcv/trivia? --[[smcv]] + +[[done]], thanks guys --[[Joey]] -- cgit v1.2.3 From 45dfdcb2571953be6815342510b9bb2a73ce59e7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Mar 2010 16:10:04 -0500 Subject: search: Avoid '$' in the wikiname appearing unescaped on omega's query template, where it might crash omega. Really, a more general fix, this deals with any $ that might appear on the misctemplate. --- IkiWiki/Plugin/search.pm | 15 +++++++++++++-- debian/changelog | 2 ++ .../Exception:_Unknown_function___96__this__39___.mdwn | 6 ++++++ 3 files changed, 21 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index fb68396a1..c0e8703d8 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -110,6 +110,7 @@ sub index (@) { # data used by omega # Decode html entities in it, since omega re-encodes them. eval q{use HTML::Entities}; + error $@ if $@; $doc->set_data( "url=".urlto($params{page}, "")."\n". "sample=".decode_entities($sample)."\n". @@ -214,9 +215,19 @@ sub setupfiles () { writefile("omega.conf", $config{wikistatedir}."/xapian", "database_dir .\n". "template_dir ./templates\n"); + + # Avoid omega interpreting anything in the misctemplate + # as an omegascript command. + my $misctemplate=IkiWiki::misctemplate(gettext("search"), "\0"); + eval q{use HTML::Entities}; + error $@ if $@; + $misctemplate=encode_entities($misctemplate, '\$'); + + my $querytemplate=readfile(IkiWiki::template_file("searchquery.tmpl")); + $misctemplate=~s/\0/$querytemplate/; + writefile("query", $config{wikistatedir}."/xapian/templates", - IkiWiki::misctemplate(gettext("search"), - readfile(IkiWiki::template_file("searchquery.tmpl")))); + $misctemplate); $setup=1; } } diff --git a/debian/changelog b/debian/changelog index 6b5671e3e..6828e6b3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low * moderatedcomments: The moderate_users setting is deprecated. Instead, set moderate_pagespec to "!admin()" or "user(*)" instead. * Fix missing span on recentchanges page template. + * search: Avoid '$' in the wikiname appearing unescaped on omega's + query template, where it might crash omega. -- Joey Hess Tue, 09 Mar 2010 19:46:35 -0500 diff --git a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn index 4f94b77bd..035247100 100644 --- a/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn +++ b/doc/forum/Exception:_Unknown_function___96__this__39___.mdwn @@ -50,3 +50,9 @@ What might be causing this exception and how I might go about debugging exceptio } >>>>>> So `$foobar` clashes with Omega's template tags. Does this help? + +>>>>>>> Ahh. I had somehow gotten it into my head that you were talking +>>>>>>> about the title of a single page, not of the whole wiki. But +>>>>>>> you were clear all along it was the wiki title. Sorry for +>>>>>>> misunderstanding. I've put in a complete fix for this problem. +>>>>>>> if this was in [[bugs]], I'd close it. :) --[[Joey]] -- cgit v1.2.3 From d1ebdcd0a23617a578e78e464e3b36f0390f3c4d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Mar 2010 16:28:32 -0500 Subject: redundancy --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6828e6b3f..2a0217dc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low provider (who should perhaps answer your emails about them), while not moderating other users. * moderatedcomments: The moderate_users setting is deprecated. Instead, - set moderate_pagespec to "!admin()" or "user(*)" instead. + set moderate_pagespec to "!admin()" or "user(*)". * Fix missing span on recentchanges page template. * search: Avoid '$' in the wikiname appearing unescaped on omega's query template, where it might crash omega. -- cgit v1.2.3 From 9c274a001a17df01d9ea609c1c39eae72e4c6404 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 11 Mar 2010 16:29:00 -0500 Subject: formatting --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2a0217dc4..bae0e7ee0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low * Fix utf8 issues in calls to md5_hex. * moderatedcomments: Added moderate_pagespec that can be used to control which users or comment locations are moderated. - This can be used, just for example, to moderate http://myopenid.com/* + This can be used, just for example, to moderate "user(http://myopenid.com/*)" if you're getting a lot of spammers from one particular openid provider (who should perhaps answer your emails about them), while not moderating other users. -- cgit v1.2.3 From 2ad3e60ee8272b7cccfd83ae02d5b45e2cec003d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Mar 2010 14:49:13 -0500 Subject: htmlscrubber: Security fix: In data:image/* uris, only allow a few whitelisted image types. No svg. --- IkiWiki/Plugin/htmlscrubber.pm | 6 +++--- debian/changelog | 4 +++- doc/security.mdwn | 12 ++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index ee284a45c..26e18ffc7 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -30,9 +30,9 @@ sub import { "msnim", "notes", "rsync", "secondlife", "skype", "ssh", "sftp", "smb", "sms", "snews", "webcal", "ymsgr", ); - # data is a special case. Allow data:image/*, but - # disallow data:text/javascript and everything else. - $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/|[^:]+(?:$|\/))/i; + # data is a special case. Allow a few data:image/ types, + # but disallow data:text/javascript and everything else. + $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|\/))/i; } sub getsetup () { diff --git a/debian/changelog b/debian/changelog index bae0e7ee0..7fdbbcb63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100303) UNRELEASED; urgency=low +ikiwiki (3.20100312) unstable; urgency=HIGH * Fix utf8 issues in calls to md5_hex. * moderatedcomments: Added moderate_pagespec that can be used @@ -12,6 +12,8 @@ ikiwiki (3.20100303) UNRELEASED; urgency=low * Fix missing span on recentchanges page template. * search: Avoid '$' in the wikiname appearing unescaped on omega's query template, where it might crash omega. + * htmlscrubber: Security fix: In data:image/* uris, only allow a few + whitelisted image types. No svg. -- Joey Hess Tue, 09 Mar 2010 19:46:35 -0500 diff --git a/doc/security.mdwn b/doc/security.mdwn index 3924186c2..21aef316b 100644 --- a/doc/security.mdwn +++ b/doc/security.mdwn @@ -427,3 +427,15 @@ enabling TeX configuration options that disallow unsafe TeX commands. The fix was released on 30 Aug 2009 in version 3.1415926, and was backported to stable in version 2.53.4. If you use the teximg plugin, I recommend upgrading. ([[!cve CVE-2009-2944]]) + +## javascript insertion via svg uris + +Ivan Shmakov pointed out that the htmlscrubber allowed `data:image/*` urls, +including `data:image/svg+xml`. But svg can contain javascript, so that is +unsafe. + +This hole was discovered on 12 March 2010 and fixed the same day +with the release of ikiwiki 3.20100312. +A fix was also backported to Debian etch, as version 2.53.5. I recommend +upgrading to one of these versions if your wiki can be edited by third +parties. -- cgit v1.2.3 From e56ec7a96c3a2064941a82619bf6cb0d2e8392e0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Mar 2010 15:08:00 -0500 Subject: websetup: Add websetup_unsafe to allow marking other settings as unsafe. --- IkiWiki/Plugin/websetup.pm | 22 ++++++++++++++++++---- debian/changelog | 7 +++++++ doc/plugins/websetup.mdwn | 3 ++- 3 files changed, 27 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 5c19c9b63..d444c0a3d 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -27,6 +27,13 @@ sub getsetup () { safe => 0, rebuild => 0, }, + websetup_unsafe => { + type => "string", + example => [], + description => "list of additional setup field keys to treat as unsafe", + safe => 0, + rebuild => 0, + }, websetup_show_unsafe => { type => "boolean", example => 1, @@ -57,6 +64,12 @@ sub formatexample ($$) { } } +sub issafe ($) { + my $key=shift; + + return ! grep { $_ eq $key } @{$config{websetup_unsafe}}; +} + sub showfields ($$$@) { my $form=shift; my $plugin=shift; @@ -78,7 +91,8 @@ sub showfields ($$$@) { # XXX hashes not handled yet next if ref $config{$key} && ref $config{$key} eq 'HASH' || ref $info{example} eq 'HASH'; # maybe skip unsafe settings - next if ! $info{safe} && ! ($config{websetup_show_unsafe} && $config{websetup_advanced}); + next if ! ($config{websetup_show_unsafe} && $config{websetup_advanced}) && + (! $info{safe} || ! issafe($key)); # maybe skip advanced settings next if $info{advanced} && ! $config{websetup_advanced}; # these are handled specially, so don't show @@ -156,7 +170,7 @@ sub showfields ($$$@) { if (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY') { $value=[(ref $value eq 'ARRAY' ? map { Encode::encode_utf8($_) } @{$value} : "")]; - push @$value, "", "" if $info{safe}; # blank items for expansion + push @$value, "", "" if $info{safe} && issafe($key); # blank items for expansion } else { $value=Encode::encode_utf8($value); @@ -210,7 +224,7 @@ sub showfields ($$$@) { } } - if (! $info{safe}) { + if (! $info{safe} || ! issafe($key)) { $form->field(name => $name, disabled => 1); } else { @@ -346,7 +360,7 @@ sub showform ($$) { @value=0; } - if (! $info{safe}) { + if (! $info{safe} || ! issafe($key)) { error("unsafe field $key"); # should never happen } diff --git a/debian/changelog b/debian/changelog index 7fdbbcb63..9e779bb18 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20100313) UNRELEASED; urgency=low + + * websetup: Add websetup_unsafe to allow marking other settings + as unsafe. + + -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 + ikiwiki (3.20100312) unstable; urgency=HIGH * Fix utf8 issues in calls to md5_hex. diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn index f1756ba8f..b4d23ba9c 100644 --- a/doc/plugins/websetup.mdwn +++ b/doc/plugins/websetup.mdwn @@ -16,7 +16,8 @@ enabled and disabled using it too. Some settings are not considered safe enough to be manipulated over the web; these are still shown, by default, but cannot be modified. To hide them, set `websetup_show_unsafe` to false in the setup file. A few settings have too complex a data type to be -configured via the web. +configured via the web. To mark additional settings as unsafe, you can +list them in `websetup_unsafe`. Plugins that should not be enabled/disabled via the web interface can be listed in `websetup_force_plugins` in the setup file. -- cgit v1.2.3 From a01e0679f4134f849473f8a98cb43f5a4aa8d7d8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Mar 2010 19:08:15 -0500 Subject: openid: Use Openid Simple Registration or OpenID Attribute Exchange to get the user's email address and username. The info is stored in the session database, not the user database. There should be no reason to need it when a user is not logged in. Also, hide the email field in the preferences page for openid users. Note that the email and username are not yet actually used for anything. The email will be useful for gravatar, while the username might be used for a more pretty display of the openid. --- IkiWiki/Plugin/openid.pm | 44 ++++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 ++ 2 files changed, 46 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index bb99446b4..9355cd85a 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -90,6 +90,7 @@ sub formbuilder_setup (@) { value => $session->param("name"), size => 50, force => 1, fieldset => "login"); + $form->field(name => "email", type => "hidden"); } } @@ -113,6 +114,26 @@ sub validate ($$$;$) { } } + # Ask for client to provide a name and email, if possible. + # Try sreg and ax + $claimed_identity->set_extension_args( + 'http://openid.net/extensions/sreg/1.1', + { + optional => 'email,fullname,nickname', + }, + ); + $claimed_identity->set_extension_args( + 'http://openid.net/srv/ax/1.0', + { + mode => 'fetch_request', + 'required' => 'email,fullname,nickname,firstname', + 'type.email' => "http://schema.openid.net/contact/email", + 'type.fullname' => "http://axschema.org/namePerson", + 'type.nickname' => "http://axschema.org/namePerson/friendly", + 'type.firstname' => "http://axschema.org/namePerson/first", + }, + ); + my $check_url = $claimed_identity->check_url( return_to => IkiWiki::cgiurl(do => "postsignin"), trust_root => $config{cgiurl}, @@ -139,6 +160,29 @@ sub auth ($$) { } elsif (my $vident = $csr->verified_identity) { $session->param(name => $vident->url); + + my @extensions=grep { defined } ( + $vident->signed_extension_fields('http://openid.net/extensions/sreg/1.1'), + $vident->signed_extension_fields('http://openid.net/srv/ax/1.0'), + ); + foreach my $ext (@extensions) { + foreach my $field (qw{value.email email}) { + if (exists $ext->{$field} && + defined $ext->{$field} && + length $ext->{$field}) { + $session->param(email => $ext->{$field}); + last; + } + } + foreach my $field (qw{value.nickname nickname value.fullname fullname value.firstname}) { + if (exists $ext->{$field} && + defined $ext->{$field} && + length $ext->{$field}) { + $session->param(username => $ext->{$field}); + last; + } + } + } } else { error("OpenID failure: ".$csr->err); diff --git a/debian/changelog b/debian/changelog index 9e779bb18..854d83130 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low * websetup: Add websetup_unsafe to allow marking other settings as unsafe. + * openid: Use Openid Simple Registration or OpenID Attribute Exchange + to get the user's email address and username. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 -- cgit v1.2.3 From c0ad4929deb455804ddfc6451820c6c67a298ea1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Mar 2010 20:10:50 -0500 Subject: Improve openid url munging; do not display anchors and cgi parameters, as used by yahoo and google urls. --- IkiWiki.pm | 2 +- debian/changelog | 2 ++ doc/forum/google_openid_broken__63__.mdwn | 6 ++++++ t/openiduser.t | 7 ++++++- 4 files changed, 15 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 00eadfd98..251ed8cc8 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1131,7 +1131,7 @@ sub openiduser ($) { # Convert "http://somehost.com/user" to "user [somehost.com]". # (also "https://somehost.com/user/") if ($display !~ /\[/) { - $display=~s/^https?:\/\/(.+)\/([^\/]+)\/?$/$2 [$1]/; + $display=~s/^https?:\/\/(.+)\/([^\/#?]+)\/?(?:[#?].*)?$/$2 [$1]/; } $display=~s!^https?://!!; # make sure this is removed eval q{use CGI 'escapeHTML'}; diff --git a/debian/changelog b/debian/changelog index 854d83130..0a9679618 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low as unsafe. * openid: Use Openid Simple Registration or OpenID Attribute Exchange to get the user's email address and username. + * Improve openid url munging; do not display anchors and cgi parameters, + as used by yahoo and google urls. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn index 4ca5cac93..96ba2d791 100644 --- a/doc/forum/google_openid_broken__63__.mdwn +++ b/doc/forum/google_openid_broken__63__.mdwn @@ -59,6 +59,12 @@ points to a fairly useless xml document, rather than a web page. --[[Joey]] > Using the Google profile page as the OpenID is really orthogonal to the above. --[[kaol]] +>> First, I don't accept that the openid google returns from their +>> generic signin url *has* to be so freaking ugly. For contrast, +>> look at the openid you log in as if you use the yahoo url. +>> . Nice and clean, now +>> munged by ikiwiki to "joeyhess [me.yahoo.com]". +>> >> Displaying email addresses is not really an option, because ikiwiki >> can't leak user email addresses like that. Displaying nicknames or >> usernames is, see [[todo/Separate_OpenIDs_and_usernames]]. diff --git a/t/openiduser.t b/t/openiduser.t index 52d879484..caabbcefc 100755 --- a/t/openiduser.t +++ b/t/openiduser.t @@ -10,7 +10,7 @@ BEGIN { eval q{use Test::More skip_all => "Net::OpenID::VerifiedIdentity not available"}; } else { - eval q{use Test::More tests => 9}; + eval q{use Test::More tests => 11}; } use_ok("IkiWiki::Plugin::openid"); } @@ -28,6 +28,11 @@ $^W=1; is(IkiWiki::openiduser('http://yam655.livejournal.com/'), 'yam655 [livejournal.com]'); is(IkiWiki::openiduser('http://id.mayfirst.org/jamie/'), 'jamie [id.mayfirst.org]'); +# yahoo has an anchor in the url +is(IkiWiki::openiduser('https://me.yahoo.com/joeyhess#35f22'), 'joeyhess [me.yahoo.com]'); +# google urls are horrendous, but the worst bit is after a ?, so can be dropped +is(IkiWiki::openiduser('https://www.google.com/accounts/o8/id?id=AItOawm-ebiIfxbKD3KNa-Cu9LvvD9edMLW7BAo'), 'id [www.google.com/accounts/o8]'); + # and some less typical ones taken from the ikiwiki commit history is(IkiWiki::openiduser('http://thm.id.fedoraproject.org/'), 'thm [id.fedoraproject.org]'); -- cgit v1.2.3 From 30c30a0cdde44491370a1e5a0ef371a4f92c4965 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Mar 2010 13:15:55 -0400 Subject: Add complete German basewiki and directives translation done by Sebastian Kuhnert. --- debian/changelog | 2 + debian/copyright | 1 + po/de.po | 57 ++- po/underlay.setup | 2 +- po/underlays/basewiki/ikiwiki.de.po | 69 ++++ po/underlays/basewiki/ikiwiki/directive.de.po | 137 +++++++ po/underlays/basewiki/ikiwiki/formatting.de.po | 299 ++++++++++++++ po/underlays/basewiki/ikiwiki/markdown.de.po | 52 +++ po/underlays/basewiki/ikiwiki/openid.de.po | 115 ++++++ po/underlays/basewiki/ikiwiki/pagespec.de.po | 258 ++++++++++++ .../basewiki/ikiwiki/pagespec/attachment.de.po | 122 ++++++ po/underlays/basewiki/ikiwiki/pagespec/po.de.po | 70 ++++ .../basewiki/ikiwiki/pagespec/sorting.de.po | 48 +++ po/underlays/basewiki/ikiwiki/searching.de.po | 92 +++++ po/underlays/basewiki/ikiwiki/subpage.de.po | 54 +++ .../basewiki/ikiwiki/subpage/linkingrules.de.po | 109 +++++ po/underlays/basewiki/ikiwiki/wikilink.de.po | 111 +++++ po/underlays/basewiki/index.de.po | 29 ++ po/underlays/basewiki/recentchanges.de.po | 38 ++ po/underlays/basewiki/sandbox.de.po | 91 +++++ po/underlays/basewiki/shortcuts.de.po | 287 +++++++++++++ po/underlays/basewiki/templates.de.po | 256 ++++++++++++ po/underlays/basewiki/templates/note.de.po | 42 ++ po/underlays/basewiki/templates/popup.de.po | 59 +++ .../directives/ikiwiki/directive/aggregate.de.po | 189 +++++++++ .../directives/ikiwiki/directive/brokenlinks.de.po | 57 +++ .../directives/ikiwiki/directive/calendar.de.po | 183 +++++++++ .../directives/ikiwiki/directive/color.de.po | 97 +++++ .../directives/ikiwiki/directive/comment.de.po | 133 ++++++ .../directives/ikiwiki/directive/copy.de.po | 25 ++ .../directives/ikiwiki/directive/cut.de.po | 25 ++ .../directives/ikiwiki/directive/cutpaste.de.po | 153 +++++++ .../directives/ikiwiki/directive/date.de.po | 64 +++ .../ikiwiki/directive/edittemplate.de.po | 99 +++++ .../directives/ikiwiki/directive/format.de.po | 93 +++++ .../directives/ikiwiki/directive/fortune.de.po | 42 ++ .../directives/ikiwiki/directive/graph.de.po | 88 ++++ .../directives/ikiwiki/directive/haiku.de.po | 60 +++ po/underlays/directives/ikiwiki/directive/if.de.po | 145 +++++++ .../directives/ikiwiki/directive/img.de.po | 115 ++++++ .../directives/ikiwiki/directive/inline.de.po | 385 +++++++++++++++++ .../directives/ikiwiki/directive/linkmap.de.po | 99 +++++ .../ikiwiki/directive/listdirectives.de.po | 72 ++++ .../directives/ikiwiki/directive/map.de.po | 77 ++++ .../directives/ikiwiki/directive/meta.de.po | 455 +++++++++++++++++++++ .../directives/ikiwiki/directive/more.de.po | 63 +++ .../directives/ikiwiki/directive/orphans.de.po | 60 +++ .../directives/ikiwiki/directive/pagecount.de.po | 48 +++ .../directives/ikiwiki/directive/pagestats.de.po | 99 +++++ .../ikiwiki/directive/pagetemplate.de.po | 64 +++ .../directives/ikiwiki/directive/paste.de.po | 25 ++ .../directives/ikiwiki/directive/ping.de.po | 69 ++++ .../directives/ikiwiki/directive/poll.de.po | 87 ++++ .../directives/ikiwiki/directive/polygen.de.po | 50 +++ .../ikiwiki/directive/postsparkline.de.po | 149 +++++++ .../directives/ikiwiki/directive/progress.de.po | 68 +++ .../directives/ikiwiki/directive/shortcut.de.po | 46 +++ .../directives/ikiwiki/directive/sparkline.de.po | 178 ++++++++ .../directives/ikiwiki/directive/table.de.po | 147 +++++++ .../directives/ikiwiki/directive/tag.de.po | 112 +++++ .../directives/ikiwiki/directive/taglink.de.po | 25 ++ .../directives/ikiwiki/directive/template.de.po | 71 ++++ .../ikiwiki/directive/testpagespec.de.po | 84 ++++ .../directives/ikiwiki/directive/teximg.de.po | 84 ++++ .../directives/ikiwiki/directive/toc.de.po | 85 ++++ .../directives/ikiwiki/directive/toggle.de.po | 113 +++++ .../directives/ikiwiki/directive/toggleable.de.po | 25 ++ .../directives/ikiwiki/directive/version.de.po | 50 +++ po/underlays/smiley/smileys.de.po | 211 ++++++++++ 69 files changed, 7036 insertions(+), 33 deletions(-) create mode 100644 po/underlays/basewiki/ikiwiki.de.po create mode 100644 po/underlays/basewiki/ikiwiki/directive.de.po create mode 100644 po/underlays/basewiki/ikiwiki/formatting.de.po create mode 100644 po/underlays/basewiki/ikiwiki/markdown.de.po create mode 100644 po/underlays/basewiki/ikiwiki/openid.de.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec.de.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/po.de.po create mode 100644 po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po create mode 100644 po/underlays/basewiki/ikiwiki/searching.de.po create mode 100644 po/underlays/basewiki/ikiwiki/subpage.de.po create mode 100644 po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po create mode 100644 po/underlays/basewiki/ikiwiki/wikilink.de.po create mode 100644 po/underlays/basewiki/index.de.po create mode 100644 po/underlays/basewiki/recentchanges.de.po create mode 100644 po/underlays/basewiki/sandbox.de.po create mode 100644 po/underlays/basewiki/shortcuts.de.po create mode 100644 po/underlays/basewiki/templates.de.po create mode 100644 po/underlays/basewiki/templates/note.de.po create mode 100644 po/underlays/basewiki/templates/popup.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/aggregate.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/brokenlinks.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/calendar.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/color.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/comment.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/copy.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/cut.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/cutpaste.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/date.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/edittemplate.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/format.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/fortune.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/graph.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/haiku.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/if.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/img.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/inline.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/linkmap.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/listdirectives.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/map.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/meta.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/more.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/orphans.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/pagecount.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/pagestats.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/pagetemplate.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/paste.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/ping.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/poll.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/polygen.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/postsparkline.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/progress.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/shortcut.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/sparkline.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/table.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/tag.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/taglink.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/template.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/testpagespec.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/teximg.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/toc.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/toggle.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/toggleable.de.po create mode 100644 po/underlays/directives/ikiwiki/directive/version.de.po create mode 100644 po/underlays/smiley/smileys.de.po (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0a9679618..92afe661f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low to get the user's email address and username. * Improve openid url munging; do not display anchors and cgi parameters, as used by yahoo and google urls. + * Add complete German basewiki and directives translation done by + Sebastian Kuhnert. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/debian/copyright b/debian/copyright index 050a4dd61..ad72a0459 100644 --- a/debian/copyright +++ b/debian/copyright @@ -163,6 +163,7 @@ Copyright: 2007 Cyril Brulebois 2007 Daniel Nylander 2009 Fernando González de Requena + 2010 Sebastian Kuhnert License: Redistribution and use in source and compiled forms, with or without modification, are permitted under any circumstances. No warranty. diff --git a/po/de.po b/po/de.po index 9433501cc..f69b98603 100644 --- a/po/de.po +++ b/po/de.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-02 22:18-0500\n" -"PO-Revision-Date: 2009-07-23 01:07+0100\n" -"Last-Translator: Kurt Gramlich \n" +"PO-Revision-Date: 2010-03-14 16:09+0530\n" +"Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -152,12 +152,10 @@ msgid "Failed to create S3 bucket: " msgstr "Konnte Behälter (bucket) in S3 nicht anlegen: " #: ../IkiWiki/Plugin/amazon_s3.pm:225 -#, fuzzy msgid "Failed to save file to S3: " msgstr "Konnte die Datei nicht in S3 speichern: " #: ../IkiWiki/Plugin/amazon_s3.pm:247 -#, fuzzy msgid "Failed to delete file from S3: " msgstr "Konnte die Datei nicht in S3 löschen: " @@ -262,19 +260,18 @@ msgid "comment moderation" msgstr "Kommentar-Moderation" #: ../IkiWiki/Plugin/comments.pm:761 -#, fuzzy, perl-format +#, perl-format msgid "%i comment" msgid_plural "%i comments" -msgstr[0] "Kommentare" -msgstr[1] "Kommentare" +msgstr[0] "%i Kommentar" +msgstr[1] "%i Kommentare" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. #: ../IkiWiki/Plugin/comments.pm:771 -#, fuzzy msgid "Comment" -msgstr "Kommentare" +msgstr "Kommentieren" #: ../IkiWiki/Plugin/conditional.pm:28 ../IkiWiki/Plugin/cutpaste.pm:31 #: ../IkiWiki/Plugin/cutpaste.pm:46 ../IkiWiki/Plugin/cutpaste.pm:62 @@ -349,14 +346,13 @@ msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." #: ../IkiWiki/Plugin/getsource.pm:75 -#, fuzzy msgid "not a page" -msgstr "Kann die Seiten nicht zuordnen: %s" +msgstr "Keine Seite" #: ../IkiWiki/Plugin/getsource.pm:77 -#, fuzzy, perl-format +#, perl-format msgid "%s is an attachment, not a page." -msgstr "Seite %s kann nicht bearbeitet werden" +msgstr "Seite %s ist ein Anhang und keine Seite." #: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 #: ../IkiWiki/Receive.pm:130 @@ -405,9 +401,8 @@ msgstr "" "through" #: ../IkiWiki/Plugin/htmltidy.pm:50 -#, fuzzy msgid "htmltidy failed to parse this html" -msgstr "Smileys konnten nicht ausgewertet werden" +msgstr "htmltidy konnte dieses HTML nicht auswerten" #: ../IkiWiki/Plugin/img.pm:69 msgid "Image::Magick is not installed" @@ -450,7 +445,7 @@ msgstr "fehlender Seitenparameter" #: ../IkiWiki/Plugin/inline.pm:192 #, perl-format msgid "the %s and %s parameters cannot be used together" -msgstr "" +msgstr "die Parameter %s und %s können nicht zusammen benutzt werden" #: ../IkiWiki/Plugin/inline.pm:313 msgid "Add a new post titled:" @@ -472,7 +467,7 @@ msgstr "dot konnte nicht ausgeführt werden" #: ../IkiWiki/Plugin/linkmap.pm:85 msgid "linkmap" -msgstr "" +msgstr "Verknüpfungskarte" #: ../IkiWiki/Plugin/lockedit.pm:49 #, perl-format @@ -513,9 +508,8 @@ msgid "Mirror" msgstr "Spiegel" #: ../IkiWiki/Plugin/moderatedcomments.pm:42 -#, fuzzy msgid "comment needs moderation" -msgstr "Kommentar-Moderation" +msgstr "Kommentar muss moderiert werden" #: ../IkiWiki/Plugin/more.pm:8 msgid "more" @@ -534,9 +528,8 @@ msgid "Get an OpenID" msgstr "Eine OpenID anfordern" #: ../IkiWiki/Plugin/orphans.pm:56 -#, fuzzy msgid "All pages have other pages linking to them." -msgstr "Alle Seiten haben mindenstens einen Verweis von einer anderen Seite." +msgstr "Alle Seiten haben mindestens einen Verweis von einer anderen Seite." #: ../IkiWiki/Plugin/pagetemplate.pm:30 msgid "bad or missing template" @@ -544,11 +537,11 @@ msgstr "fehlerhafte oder fehlende Vorlage" #: ../IkiWiki/Plugin/passwordauth.pm:229 msgid "Your user page: " -msgstr "" +msgstr "Ihre Benutzerseite: " #: ../IkiWiki/Plugin/passwordauth.pm:236 msgid "Create your user page" -msgstr "" +msgstr "Benutzerseite erstellen" #: ../IkiWiki/Plugin/passwordauth.pm:264 msgid "Account creation successful. Now you can Login." @@ -604,7 +597,7 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." -msgstr "" +msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35" #: ../IkiWiki/Plugin/po.pm:139 #, perl-format @@ -663,9 +656,9 @@ msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" #: ../IkiWiki/Plugin/po.pm:885 -#, fuzzy, perl-format +#, perl-format msgid "failed to copy underlay PO file to %s" -msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" +msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" #: ../IkiWiki/Plugin/po.pm:894 #, perl-format @@ -889,14 +882,14 @@ msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" #: ../IkiWiki/Plugin/rsync.pm:37 -#, fuzzy, perl-format +#, perl-format msgid "failed to execute rsync_command: %s" -msgstr "lesen von %s fehlgeschlagen" +msgstr "konnte das rsync_command nicht ausführen: %s" #: ../IkiWiki/Plugin/rsync.pm:40 #, perl-format msgid "rsync_command exited %d" -msgstr "" +msgstr "rsync_command gibt Fehler %d zurück" #: ../IkiWiki/Plugin/search.pm:183 #, perl-format @@ -1003,14 +996,14 @@ msgid "failed to generate image from code" msgstr "konnte kein Bild aus dem Code erzeugen" #: ../IkiWiki/Plugin/websetup.pm:91 -#, fuzzy, perl-format +#, perl-format msgid "%s plugin:" -msgstr "Erweiterung" +msgstr "%s-Erweiterung:" #: ../IkiWiki/Plugin/websetup.pm:107 #, fuzzy, perl-format msgid "%s plugins" -msgstr "Erweiterungen" +msgstr "%s-Erweiterungen" #: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format diff --git a/po/underlay.setup b/po/underlay.setup index 333d331d1..c34045981 100644 --- a/po/underlay.setup +++ b/po/underlay.setup @@ -8,7 +8,7 @@ use IkiWiki::Setup::Standard { # will excessively bloat things. po_slave_languages => { 'es' => 'Español', - #'de' => 'Deutsch', + 'de' => 'Deutsch', 'fr' => 'Français', 'da' => 'Dansk', 'cs' => 'česky', diff --git a/po/underlays/basewiki/ikiwiki.de.po b/po/underlays/basewiki/ikiwiki.de.po new file mode 100644 index 000000000..1420df3e6 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki.de.po @@ -0,0 +1,69 @@ +# German translation of basewiki/ikiwiki page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 09:37+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"This wiki is powered by [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then=\"(Currently running version [[!version ]].)\"\n" +"]]\n" +msgstr "" +"Dieses Wiki basiert auf [ikiwiki](http://ikiwiki.info/).\n" +"[[!if test=\"enabled(version)\"\n" +" then=\"(Es läuft Version [[!version ]].)\"\n" +"]]\n" + +#. type: Plain text +msgid "Some documentation on using ikiwiki:" +msgstr "Dokumentation zur Verwendung von ikiwiki:" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/formatting]]" +msgstr "[[Formatierung|ikiwiki/formatting]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/wikilink]]" +msgstr "[[ikiwiki/wikilink]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/subpage]]" +msgstr "[[Unterseiten|ikiwiki/subpage]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/pagespec]]" +msgstr "[[ikiwiki/pagespec]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/directive]]" +msgstr "[[Anweisungen|ikiwiki/directive]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/markdown]]" +msgstr "[[ikiwiki/markdown]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/openid]]" +msgstr "[[ikiwiki/openid]]" + +#. type: Bullet: '* ' +msgid "[[ikiwiki/searching]]" +msgstr "[[Suchen|ikiwiki/searching]]" + diff --git a/po/underlays/basewiki/ikiwiki/directive.de.po b/po/underlays/basewiki/ikiwiki/directive.de.po new file mode 100644 index 000000000..b8a610c83 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/directive.de.po @@ -0,0 +1,137 @@ +# German translation of basewiki/ikiwiki/directive page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:16+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Anweisungen\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Directives are similar to a [[ikiwiki/WikiLink]] in form, except they begin " +"with `!` and may contain parameters. The general form is:" +msgstr "" +"Anweisungen haben eine ähnliche Form wie ein [[ikiwiki/WikiLink]], " +"allerdings beginnen sie mit `!` und sie können Parameter enthalten. " +"Die allgemeine Form ist:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive param=\"value\" param=\"value\"]]\n" +msgstr "\t\\[[!anweisung param=\"Wert\" param=\"Wert\"]]\n" + +#. type: Plain text +msgid "" +"This gets expanded before the rest of the page is processed, and can be used " +"to transform the page in various ways." +msgstr "" +"Dies wird expandiert, bevor der Rest der Seite verarbeitet wird, und kann " +"auf unterschiedliche Weise genutzt werden, die Seite zu verändern." + +#. type: Plain text +msgid "" +"The quotes around values can be omitted if the value is a simple word. " +"Also, some directives may use parameters without values, for example:" +msgstr "" +"Die Anführungszeichen um die Werte können weggelassen werden, " +"wenn der Wert ein einfaches Wort ist. Einige Anweisungen verwenden " +"auch Parameter ohne Wert, zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!tag foo]]\n" +msgstr "\t\\[[!tag foo]]\n" + +#. type: Plain text +msgid "" +"A directive does not need to all be on one line, it can be wrapped to " +"multiple lines if you like:" +msgstr "" +"Eine Anweisung muss nicht ganz in einer einzelnen Zeile stehen, " +"sie kann auch auf mehrere Zeilen verteilt werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!directive foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" +msgstr "" +"\t\\[[!anweisung foo=\"baldersnatch\"\n" +"\tbar=\"supercalifragilisticexpialidocious\" baz=11]]\n" + +#. type: Plain text +msgid "" +"Also, multiple lines of *quoted* text can be used for a value. To allow " +"quote marks inside the quoted text, delimit the block of text with " +"triple-quotes:" +msgstr "" +"Außerdem können mehrere Zeilen Text *in Anführungszeichen* für einen " +"Wert verwendet werden. Um Anführungszeichen innerhalb des Werts zu " +"ermöglichen, trenne den Textblock durch dreifache Anführungszeichen ab:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!directive text=\"\"\"\n" +msgstr "\t\\[[!anweisung text=\"\"\"\n" + +#. type: Bullet: ' 1. ' +msgid "\"foo\"" +msgstr "\"foo\"" + +#. type: Bullet: ' 2. ' +msgid "\"bar\"" +msgstr "\"bar\"" + +#. type: Bullet: ' 3. ' +msgid "\"baz\"" +msgstr "\"baz\"" + +#. type: Plain text +msgid "" +"ikiwiki also has an older syntax for directives, which requires a space in " +"directives to distinguish them from [[wikilinks|ikiwiki/wikilink]]. This " +"syntax has several disadvantages: it requires a space after directives with " +"no parameters (such as `\\[[pagecount ]]`), and it prohibits spaces in " +"[[wikilinks|ikiwiki/wikilink]]. ikiwiki now provides the `!`-prefixed " +"syntax shown above as default. However, ikiwiki still supports wikis using " +"the older syntax, if the `prefix_directives` option is disabled." +msgstr "" +"Es gibt in ikiwiki auch eine ältere Syntax für Anweisungen, die ein " +"Leerzeichen in erfordert, um sie von [[Wiki-Links|ikiwiki/wikilink]] zu " +"unterscheiden. Diese Syntax hat mehrere Nachteile: Sie erfordert ein " +"Leerzeichen nach Anweisungen ohne Parameter (so wie " +"`\\[[pagecount ]]`), and sie verbietet Leerzeichen in " +"[[Wiki-Links|ikiwiki/wikilink]]. Die oben gezeigte Syntax mit `!`-Präfix " +"ist nun der Standard in ikiwiki. Die alte Syntax wird allerdings auch " +"noch unterstützt, wenn die Option `prefix_directives` deaktiviert wird." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +msgid "Here is a list of currently available directives in this wiki:" +msgstr "" +"Hier ist eine Liste der aktuell verfügbaren Anweisungen in diesem Wiki:" + +#. type: Plain text +#, no-wrap +msgid "[[!listdirectives ]]\n" +msgstr "[[!listdirectives ]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/formatting.de.po b/po/underlays/basewiki/ikiwiki/formatting.de.po new file mode 100644 index 000000000..04b604289 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/formatting.de.po @@ -0,0 +1,299 @@ +# German translation of basewiki/ikiwiki/formatting page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:35+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"Formatting wiki pages\"]]\n" +msgstr "[[!meta title=\"Wiki-Seiten formatieren\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"Text on this wiki is, by default, written in a form very close to how you " +"might write text for an email message. This style of text formatting is " +"called [[MarkDown]], and it works like this:" +msgstr "" +"Text wird in diesem Wiki standardmäßig in einer Form geschrieben, die " +"sehr stark dem ähnelt, wie man eine E-Mail schreibt. Dieser " +"Formatierungs-Stil wird [[MarkDown]] genannt und funktioniert folgendermaßen:" + +#. type: Plain text +msgid "Leave blank lines between paragraphs." +msgstr "Lasse Leerzeilen zwischen Absätzen." + +#. type: Plain text +msgid "" +"You can *\\*emphasise\\** or **\\*\\*strongly emphasise\\*\\*** text by " +"placing it in single or double asterisks." +msgstr "" +"Man kann Text *\\*hervorheben\\** oder **\\*\\*stark hervorheben\\*\\***, " +"indem man ihn zwischen einfache oder doppelte Sternchen setzt." + +#. type: Plain text +msgid "To create a list, start each line with an asterisk:" +msgstr "Um eine Liste zu erstellen, beginne jede Zeile mit einem Sternchen:" + +#. type: Bullet: '* ' +msgid "\"* this is my list\"" +msgstr "\"* Dies ist meine Liste\"" + +#. type: Bullet: '* ' +msgid "\"* another item\"" +msgstr "\"* Noch ein Eintrag.\"" + +#. type: Plain text +msgid "" +"To make a numbered list, start each line with a number (any number will do) " +"followed by a period:" +msgstr "" +"Um eine nummerierte Liste zu erhalten, beginne jede Zeile mit einer Zahl " +"(welche ist egal), auf die ein Punkt folgt:" + +#. type: Bullet: '1. ' +msgid "\"1. first line\"" +msgstr "\"1. Erste Zeile\"" + +#. type: Bullet: '2. ' +msgid "\"2. second line\"" +msgstr "\"2. Zweite Zeile\"" + +#. type: Bullet: '2. ' +msgid "\"2. third line\"" +msgstr "\"2. Dritte Zeile\"" + +#. type: Plain text +msgid "" +"To create a header, start a line with one or more `#` characters followed by " +"a space and the header text. The number of `#` characters controls the size " +"of the header:" +msgstr "" +"Um eine Überschrift zu erstellen, beginne eine Zeile mit einem oder mehreren " +"`#`-Zeichen gefolgt von einem Leerzeichen und dem Text der Überschrift. " +"Die Anzahl der `#` steuert die Größe der Überschriften:" + +#. type: Title # +#, no-wrap +msgid "# h1" +msgstr "# h1 " + +#. type: Title ## +#, no-wrap +msgid "## h2" +msgstr "## h2" + +#. type: Title ### +#, no-wrap +msgid "### h3" +msgstr "### h3" + +#. type: Title #### +#, no-wrap +msgid "#### h4" +msgstr "#### h4" + +#. type: Title ##### +#, no-wrap +msgid "##### h5" +msgstr "##### h5" + +#. type: Title ###### +#, no-wrap +msgid "###### h6" +msgstr "###### h6" + +#. type: Plain text +msgid "" +"To create a horizontal rule, just write three or more dashes or stars on " +"their own line:" +msgstr "" +"Um eine horizontale Linie zu erzeugen, schreibe einfach drei oder mehr " +"Bindestriche oder Sternchen allein in eine Zeile:" + +#. type: Plain text +#, no-wrap +msgid "To quote someone, prefix the quote with \">\":\n" +msgstr "Um jemanden zu zitieren, stelle dem Zitat `>` voran:\n" + +#. type: Plain text +#, no-wrap +msgid "" +"> To be or not to be,\n" +"> that is the question.\n" +msgstr "" +"> Sein oder nicht sein,\n" +"> das ist die Frage.\n" + +#. type: Plain text +msgid "To write a code block, indent each line with a tab or 4 spaces:" +msgstr "" +"Um einen Block mit Programmcode zu schreiben, rücke jede Zeile mit " +"einem Tabulatorzeichen oder 4 Leerzeichen ein:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t10 PRINT \"Hello, world!\"\n" +"\t20 GOTO 10\n" +msgstr "" +"\t10 PRINT \"Hallo, Welt!\"\n" +"\t20 GOTO 10\n" + +#. type: Plain text +#, no-wrap +msgid "" +"To link to an url or email address, you can just put the\n" +"url in angle brackets: <>, or you can use the\n" +"form \\[link text\\]\\(url\\)\n" +msgstr "" +"Um eine URL oder E-Mail-Adresse zu verlinken, kann man die\n" +"URL einfach ein spitze Klammern schreiben: <>; " +"man kann auch die Form \\[Link-Text\\]\\(URL)\) verwenden.\n" + +#. type: Plain text +msgid "" +"In addition to basic html formatting using [[MarkDown]], this wiki lets you " +"use the following additional features:" +msgstr "" +"Zusätzlich zu der einfachen HTML-Formatierung mit [[MarkDown]] können " +"in diesem Wiki die folgenden zusätzlichen Funktionen verwenden werden:" + +#. type: Bullet: '* ' +msgid "" +"To link to another page on the wiki, place the page's name inside double " +"square brackets. So you would use `\\[[WikiLink]]` to link to [[WikiLink]]." +msgstr "" +"Um eine andere Seite des Wikis zu verlinken, schreibe den Namen dieser " +"Seite in doppelte eckige Klammern. Zum Beispiel kann man mit " +"`\\[[WikiLink]]` auf [[WikiLink]] verweisen." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(smiley) and smileys\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Insert [[smileys]] and some other useful symbols. :-)" +msgstr "[[Smileys|smileys]] und einige andere nützliche Symbole einfügen. :-)" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(shortcut) and shortcuts\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "Use [[shortcuts]] to link to common resources." +msgstr "" +"[[Abkürzungen|shortcuts]] verwenden, um auf gängige Quellen zu verweisen." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!wikipedia War\\_of\\_1812]]\n" +msgstr "\t\\[[!wikipedia War\\_of\\_1812]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and templates\" then=\"\"\"\n" + +#. type: Bullet: '* ' +msgid "" +"Create and fill out [[templates]] for repeated chunks of parameterized wiki " +"text." +msgstr "" +"[[Vorlagen|templates]] erstellen und ausfüllen für wiederholte Blöcke " +"von parametrisiertem Wiki-Text." + +#. type: Plain text +#, no-wrap +msgid "" +"* Insert various [[directives|directive]] onto a page to perform useful\n" +" actions.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" " +"then=\"\"\"\n" +msgstr "" +"* Unterschiedliche [[Anweisungen|directives]] in eine Seite einfügen,\n" +" die nützliche Aktionen durchführen.\n" +"[[!if test=\"enabled(toc) or enabled(meta) or enabled(inline)\" " +"then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " For example, you can:\n" +msgstr " Zum Beispiel kann man:\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(toc)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(toc)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Add a table of contents to a page:" +msgstr "Ein Inhaltsverzeichnis zu einer Seite hinzufügen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc]]\n" +msgstr "\t\\[[!toc]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Change the title of a page:" +msgstr "Den Titel einer Seite verändern:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!meta title=\"full page title\"]]\n" +msgstr "\t\\[[!meta title=\"Vollständiger Titel der Seite\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(inline)\" then=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "Create a blog by inlining a set of pages:" +msgstr "Einen Blog durch Einbetten mehrerer Seiten erstellen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"blog/*\"]]\n" +msgstr "\t\\[[!inline pages=\"blog/*\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(listdirectives)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid " Full list of [[directives|directive]] enabled for this wiki:\n" +msgstr "" +" Eine vollständige Liste der in diesem Wiki aktivierten " +"[[Anweisungen|directive]]:\n" + +#. type: Plain text +#, no-wrap +msgid " [[!listdirectives ]]\n" +msgstr " [[!listdirectives ]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/markdown.de.po b/po/underlays/basewiki/ikiwiki/markdown.de.po new file mode 100644 index 000000000..a42c41439 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/markdown.de.po @@ -0,0 +1,52 @@ +# German translation of basewiki/ikiwiki/markdown page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:36+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"[Markdown](http://daringfireball.net/projects/markdown/) is a minimal " +"markup language that resembles plain text as used in email messages. It is " +"the markup language used by this wiki by default." +msgstr "" +"[Markdown](http://daringfireball.net/projects/markdown/) ist eine minimale " +"Sprache für Hervorhebungen, die sich an einfachem Text orientiert, wie er " +"in " +"E-Mail-Nachrichten verwendet wird. Diese Hervorhebungssprache wird " +"standardmäßig in diesem Wiki verwendet." + +#. type: Plain text +msgid "" +"For documentation about the markdown syntax, see [[formatting]] and " +"[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax)." +msgstr "" +"Für die Dokumentation der Markdown-Syntax siehe " +"[[Formatierung|formatting]] " +"und [Markdown: Syntax](http://daringfireball.net/projects/markdown/syntax)." + +#. type: Plain text +msgid "" +"Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part " +"of the markdown syntax, and are the only bit of markup that this wiki " +"handles internally." +msgstr "" +"Beachte dabei, dass [[WikiLinks|WikiLink]] und [[Anweisungen|directive]] " +"nicht Teil der Markdown-Syntax sind: Sie sind die einzigen " +"Formatierungsanweisungen, die dieses Wiki intern verarbeitet." + + diff --git a/po/underlays/basewiki/ikiwiki/openid.de.po b/po/underlays/basewiki/ikiwiki/openid.de.po new file mode 100644 index 000000000..f278e64fc --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/openid.de.po @@ -0,0 +1,115 @@ +# German translation of basewiki/ikiwiki/openid page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 22:29+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"OpenID\"]]\n" +msgstr "[[!meta title=\"OpenID\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"This wiki has OpenID **enabled**.\"\n" +" else=\"This wiki has OpenID **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(openid)\"\n" +" then=\"In diesem Wiki ist OpenID **aktiviert**.\"\n" +" else=\"In diesem Wiki ist OpenID **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "" +"[OpenID](http://openid.net) is a decentralized authentication mechanism that " +"allows you to have one login that you can use on a growing number of " +"websites." +msgstr "" +"[OpenID](http://openid.net) ist ein Mechanismus zur dezentralen " +"Authentifizierung, der es erlaubt, sich mit einem einzigen Benutzerkonto bei " +"einer wachsenden Anzahl von Webseiten anzumelden." + +#. type: Plain text +msgid "To sign up for an OpenID, visit one of the following identity providers:" +msgstr "" +"Eine OpenID kann man bei einem der folgenden Identitäts-Anbieter erhalten:" + +#. type: Bullet: '* ' +msgid "[MyOpenID](https://www.myopenid.com/)" +msgstr "[MyOpenID](https://www.myopenid.com/)" + +#. type: Bullet: '* ' +msgid "[GetOpenID](https://getopenid.com/)" +msgstr "[GetOpenID](https://getopenid.com/)" + +#. type: Bullet: '* ' +msgid "[LiveJournal](http://www.livejournal.com/openid/)" +msgstr "[LiveJournal](http://www.livejournal.com/openid/)" + +#. type: Bullet: '* ' +msgid "[TrustBearer](https://openid.trustbearer.com/)" +msgstr "[TrustBearer](https://openid.trustbearer.com/)" + +#. type: Bullet: '* ' +msgid "" +"or any of the [many others out " +"there](http://openiddirectory.com/openid-providers-c-1.html)" +msgstr "" +"oder einem der [vielen anderen](http://openiddirectory." +"com/openid-providers-c-1.html)." + +#. type: Plain text +#, no-wrap +msgid "" +"Your OpenID is the URL that you are given when you sign up.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" +msgstr "" +"Eine OpenID ist eine URL, die man bei der Anmeldung von seinem Anbieter " +"erhält.\n" +"[[!if test=\"enabled(openid)\" then=\"\"\"\n" + +#. type: Plain text +msgid "" +"To sign in to this wiki using OpenID, just enter it in the OpenID field in " +"the signin form. You do not need to give this wiki a password or go through " +"any registration process when using OpenID." +msgstr "" +"In diesem Wiki kann man sich per OpenID anmelden, indem man einfach seine " +"OpenID im entsprechenden Feld des Anmeldeformulars eingibt. Man muss in " +"diesem Wiki kein Passwort setzen und auch keinen Registrierungsprozess " +"durchlaufen, wenn man OpenID verwendet." + +#. type: Plain text +msgid "" +"It's also possible to make a page in the wiki usable as an OpenID url, by " +"delegating it to an openid server. Here's an example of how to do that:" +msgstr "" +"Außerdem ist es möglich, eine Seite dieses Wikis als OpenID-URL verwendbar zu " +"machen, indem sie an einen OpenID-Server weitergereicht wird. Hier ist ein " +"Beispiel, wie dies gemacht wird:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" +msgstr "" +"\t\\[[!meta openid=\"http://yourid.myopenid.com/\"\n" +"\t server=\"http://www.myopenid.com/server\"]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec.de.po b/po/underlays/basewiki/ikiwiki/pagespec.de.po new file mode 100644 index 000000000..ab4d62da3 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec.de.po @@ -0,0 +1,258 @@ +# German translation of basewiki/ikiwiki/pagespec page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:39+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"To select a set of pages, such as pages that are locked, pages whose commit " +"emails you want subscribe to, or pages to combine into a blog, the wiki uses " +"a PageSpec. This is an expression that matches a set of pages." +msgstr "" +"Um eine Menge von Seiten auszuwählen (etwa Seiten, die gesperrt werden sollen, " +"deren Einrechungs-Mails man abonnieren will, oder die man zu einem Blog " +"kombinieren will), verwendet das Wiki eine PageSpec. Dies ist ein Ausdruck, " +"der auf bestimmte Seiten passt." + +#. type: Plain text +msgid "" +"The simplest PageSpec is a simple list of pages. For example, this matches " +"any of the three listed pages:" +msgstr "" +"Die einfachste PageSpec ist eine einfache Liste von Seiten. Zum Beispiel passt " +"dies " +"auf jede der drei aufgezählten Seiten:" + +#. type: Plain text +#, no-wrap +msgid "\tfoo or bar or baz\n" +msgstr "\tfoo or bar or baz\n" + +#. type: Plain text +msgid "" +"More often you will want to match any pages that have a particular thing in " +"their name. You can do this using a glob pattern. \"`*`\" stands for any " +"part of a page name, and \"`?`\" for any single letter of a page name. So " +"this matches all pages about music, and any [[SubPage]]s of the SandBox, but " +"does not match the SandBox itself:" +msgstr "" +"Häufiger wird es vorkommen, dass man Seiten erfassen will, deren Name etwas " +"bestimmtes enthält. Man kann dies mit einem Muster tun: \"`*`\" steht für " +"einen beliebigen Teil eines Seitennamens und \"`?`\" steht für einen beliebigen " +"Buchstaben eines Seitennamens. Also passt dies alle Seiten über Musik, und alle " +"[[Unterseiten|SubPage]] des Sandkastens, aber nicht auf den Sandkasten selbst:" + +#. type: Plain text +#, no-wrap +msgid "\t*music* or SandBox/*\n" +msgstr "\t*music* or SandBox/*\n" + +#. type: Plain text +msgid "" +"You can also prefix an item with \"`!`\" to skip pages that match it. So to " +"match all pages except for Discussion pages and the SandBox:" +msgstr "" +"Man kann einem Eintrag ein \"`!`\" voranstellen, um die betreffenden Seiten " +"auszuschließen. Auf diese Weise können alle Seiten außer Diskussionsseiten und " +"Sandkasten erfasst werden:" + +#. type: Bullet: ' * ' +msgid "and !SandBox and !*/Discussion" +msgstr "and !SandBox and !*/Discussion" + +#. type: Plain text +msgid "" +"Some more elaborate limits can be added to what matches using these " +"functions:" +msgstr "" +"Einige weitergehende Einschränkungen können hinzugefügt werden, indem die " +"folgenden Funktionen verwendet werden:" + +#. type: Bullet: '* ' +msgid "\"`link(page)`\" - matches only pages that link to a given page (or glob)" +msgstr "" +"\"`link(page)`\" - passt nur auf Seiten, die einen Link auf die angegebene Seite " +"(oder das angegebene Muster) enthalten" + +#. type: Bullet: '* ' +msgid "" +"\"`tagged(tag)`\" - matches pages that are tagged or link to the given tag " +"(or tags matched by a glob)" +msgstr "" +"\"`tagged(tag)`\" - passt nur auf Seiten, die mit dem angegebenen Tag versehen " +"sind oder auf diesen verweisen (auch hier kann ein Muster verwendet werden)" + +#. type: Bullet: '* ' +msgid "\"`backlink(page)`\" - matches only pages that a given page links to" +msgstr "" +"\"`backlink(page)`\" - passt nur auf Seiten, auf die von der angegebenen Seite " +"verwiesen wird" + +#. type: Bullet: '* ' +msgid "\"`creation_month(month)`\" - matches only pages created on the given month" +msgstr "" +"\"`creation_month(month)`\" - passt nur auf Seiten, die im angegebenen Monat " +"erstellt wurden" + +#. type: Bullet: '* ' +msgid "\"`creation_day(mday)`\" - or day of the month" +msgstr "\"`creation_day(mday)`\" - genauso für einen Tag im Monat" + +#. type: Bullet: '* ' +msgid "\"`creation_year(year)`\" - or year" +msgstr "\"`creation_year(year)`\" - der ein Jahr" + +#. type: Bullet: '* ' +msgid "" +"\"`created_after(page)`\" - matches only pages created after the given page " +"was created" +msgstr "" +"\"`created_after(page)`\" - passt nur auf Seiten, die nach der angegebenen Seite " +"angelegt wurden" + +#. type: Bullet: '* ' +msgid "" +"\"`created_before(page)`\" - matches only pages created before the given " +"page was created" +msgstr "" +"\"`created_before(page)`\" - passt nur auf Seiten, die vor der angegebenen Seite " +"angelegt wurden." + +#. type: Bullet: '* ' +msgid "" +"\"`glob(someglob)`\" - matches pages that match the given glob. Just writing " +"the glob by itself is actually a shorthand for this function." +msgstr "" +"\"`glob(someglob)`\" - passt nur auf Seiten, auf die das angegebene Muster passt." +" " +"Das Muster direkt anzugeben ist eine Abkürzung für diese Funktion." + +#. type: Bullet: '* ' +msgid "" +"\"`internal(glob)`\" - like `glob()`, but matches even internal-use pages " +"that globs do not usually match." +msgstr "" +"\"`internal(glob)`\" - wie `glob()`, aber es werden auch intern verwendete " +"Seiten " +"erfasst, auf die normale Muster nicht passen." + +#. type: Bullet: '* ' +msgid "" +"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", " +"\"`license(glob)`\", \"`copyright(glob)`\" - match pages that have the given " +"metadata, matching the specified glob." +msgstr "" +"\"`title(glob)`\", \"`author(glob)`\", \"`authorurl(glob)`\", " +"\"`license(glob)`\", \"`copyright(glob)`\" - passt auf Seiten, deren Metadaten " +"auf die angegebenen Muster passen." + +#. type: Bullet: '* ' +msgid "" +"\"`user(username)`\" - tests whether a modification is being made by a user " +"with the specified username. If openid is enabled, an openid can also be put " +"here. Glob patterns can be used in the username. For example, to match all " +"openid users, use `user(*://*)`" +msgstr "" +"\"`user(username)`\" - prüft ob eine Änderung von einem Benutzer mit dem " +"angegebenen Namen gemacht wird. Wenn OpenID aktiviert ist, kann auch eine " +"OpenID angegeben werden. Muster können im Benutzernamen verwendet werden. " +"zum Beispiel können alle OpenID-Nutzer mit `user(*://*)` erfasst werden." + +#. type: Bullet: '* ' +msgid "" +"\"`admin()`\" - tests whether a modification is being made by one of the " +"wiki admins." +msgstr "" +"\"`admin()`\" - prüft ob eine Änderung durch einen der Wiki-Administratoren " +"gemacht wird." + +#. type: Bullet: '* ' +msgid "" +"\"`ip(address)`\" - tests whether a modification is being made from the " +"specified IP address." +msgstr "" +"\"`ip(address)`\" - prüft ob eine Änderung von der angegebenen IP-Adresse aus " +"gemacht wird." + +#. type: Bullet: '* ' +msgid "" +"\"`postcomment(glob)`\" - matches only when comments are being posted to a " +"page matching the specified glob" +msgstr "" +"\"`postcomment(glob)`\" - passt nur, wenn ein Kommentar zu einer durch das " +"Muster angegebenen Seite gemacht wird" + +#. type: Plain text +msgid "" +"For example, to match all pages in a blog that link to the page about music " +"and were written in 2005:" +msgstr "" +"Zum Beispiel können alle Seiten eines Blogs ausgewählt werden, die einen Link " +"zu einer Seite über Musik enthalten und 2005 geschrieben wurden:" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and link(music) and creation_year(2005)\n" +msgstr "\tblog/* and link(music) and creation_year(2005)\n" + +#. type: Plain text +msgid "" +"Note the use of \"and\" in the above example, that means that only pages " +"that match each of the three expressions match the whole. Use \"and\" when " +"you want to combine expression like that; \"or\" when it's enough for a page " +"to match one expression. Note that it doesn't make sense to say \"index and " +"SandBox\", since no page can match both expressions." +msgstr "" +"Beachte die Verwendung von `and` im obigen Beispiel: Dies bewirkt, dass " +"nur die Seiten auf den gesamten Ausdruck passen, die auf alle drei " +"Teilausdrücke passen. Verwende `and` um Ausdrücke so zu kombinieren " +"und `or` wenn eine Seite nur auf einen der Ausdrücke passen soll. Beachte " +"dass es sinnlos ist, `index and SandBox` zu sagen, da keine Seite auf beide " +"Ausdrücke passen kann." + +#. type: Plain text +msgid "" +"More complex expressions can also be created, by using parentheses for " +"grouping. For example, to match pages in a blog that are tagged with either " +"of two tags, use:" +msgstr "" +"Es können auch komplexere Ausdrücke erstellt werden, indem Klammern " +"zur Gruppierung verwendet werden. Zum Beispiel passt der folgende " +"Ausdruck auf Blog-Seiten, die mit einem der beiden angegebenen Tags " +"versehen sind:" + +#. type: Plain text +#, no-wrap +msgid "\tblog/* and (tagged(foo) or tagged(bar))\n" +msgstr "\tblog/* and (tagged(foo) or tagged(bar))\n" + +#. type: Plain text +msgid "" +"Note that page names in PageSpecs are matched against the absolute filenames " +"of the pages in the wiki, so a pagespec \"foo\" used on page \"a/b\" will " +"not match a page named \"a/foo\" or \"a/b/foo\". To match relative to the " +"directory of the page containing the pagespec, you can use \"./\". For " +"example, \"./foo\" on page \"a/b\" matches page \"a/foo\"." +msgstr "" +"Beachte, dass Seitennamen in PageSpecs auf den absoluten Dateinamen " +"der Seiten im Wiki passen müssen: Die PageSpec `foo` auf der Seite `a/b` " +"wird weder auf `a/foo` noch auf `a/b/foo` passen. Um relative Pfade zum " +"Verzeichnis der Seite, die die PageSpec enthält, zu verwenden, kannst du " +"`./` verwenden. Zum Beispiel passt `./foo` auf der Seite `a/b` auf `a/foo`." + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po new file mode 100644 index 000000000..690e41636 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/attachment.de.po @@ -0,0 +1,122 @@ +# German translation of basewiki/ikiwiki/pagespec/attachment page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:17+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Anhänge\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"This wiki has attachments **enabled**.\"\n" +" else=\"This wiki has attachments **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(attachment)\"\n" +" then=\"In diesem Wiki sind Anhänge **aktiviert**.\"\n" +" else=\"In diesem Wiki sind Anhänge **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "" +"If attachments are enabled, the wiki admin can control what types of " +"attachments will be accepted, via the `allowed_attachments` configuration " +"setting." +msgstr "" +"Wenn Anhänge aktiviert sind, kann der Administrator des Wikis bestimmen, " +"welche Arten von Anhängen akzeptiert werden, indem er die Einstellung " +"`allowed_attachments` verändert." + +#. type: Plain text +msgid "" +"For example, to limit arbitrary files to 50 kilobytes, but allow larger mp3 " +"files to be uploaded by joey into a specific directory, and check all " +"attachments for viruses, something like this could be used:" +msgstr "" +"Zum Beispiel können beliebige Dateien auf 50 Kilobyte beschränkt, " +"aber größere mp3-Dateien von joey in einem bestimmten Verzeichnis erlaubt, " +"und alle Anhänge nach Viren durchsucht werden, indem etwas wie " +"das Folgende verwendet wird:" + +#. type: Plain text +#, no-wrap +msgid "" +"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) " +"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" +msgstr "" +"\tvirusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) " +"and maxsize(15mb)) or (!ispage() and maxsize(50kb)))\n" + +#. type: Plain text +msgid "" +"The regular [[ikiwiki/PageSpec]] syntax is expanded with the following " +"additional tests:" +msgstr "" +"Die reguläre [[ikiwiki/PageSpec]]-Syntax ist um die folgenden zusätzlichen " +"Tests erweitert:" + +#. type: Bullet: '* ' +msgid "" +"\"`maxsize(size)`\" - tests whether the attachment is no larger than the " +"specified size. The size defaults to being in bytes, but \"kb\", \"mb\", " +"\"gb\" etc can be used to specify the units." +msgstr "" +"\"`maxsize(size)`\" - prüft ob der Anhang nicht größer ist als angegeben. " +"Die Größe wird standardmäßig in Bytes angegeben, aber `kb`, `mb`, " +"`gb` und so weiter kann verwendet werden, um die Einheit anzugeben." + +#. type: Bullet: '* ' +msgid "" +"\"`minsize(size)`\" - tests whether the attachment is no smaller than the " +"specified size." +msgstr "" +"\"`minsize(size)`\" - prüft ob der Anhang nicht kleiner ist als angegeben." + +#. type: Bullet: '* ' +msgid "" +"\"`ispage()`\" - tests whether the attachment will be treated by ikiwiki as " +"a wiki page. (Ie, if it has an extension of \".mdwn\", or of any other " +"enabled page format)." +msgstr "" +"\"`ispage()`\" - prüft ob der Anhang von ikiwiki als Wiki-Seite behandelt " +"wird. Dies ist der Fall, wenn er die Endung `.mdwn` oder die eines anderen " +"aktivierten Seitenformats hat." + +#. type: Plain text +#, no-wrap +msgid "" +" So, if you don't want to allow wiki pages to be uploaded as attachments,\n" +" use `!ispage()` ; if you only want to allow wiki pages to be uploaded\n" +" as attachments, use `ispage()`.\n" +msgstr "" +" Wenn man also verhindern will, dass Wiki-Seiten als Anhang hochgeladen\n" +" werden, kann `!ispage()` verwendet werden; wenn nur Wiki-Seiten\n" +" hochgeladen werden können sollen, geht dies mit `ispage()`.\n" + +#. type: Bullet: '* ' +msgid "" +"\"`mimetype(foo/bar)`\" - checks the MIME type of the attachment. You can " +"include a glob in the type, for example `mimetype(image/*)`." +msgstr "" +"\"`mimetype(foo/bar)`\" - prüft den MIME-Typ des Anhangs. Man kann ein " +"Muster für den Typen verwenden, zum Beispiel `mimetype(image/*)`." + +#. type: Bullet: '* ' +msgid "\"`virusfree()`\" - checks the attachment with an antiviral program." +msgstr "\"`virusfree()`\" - prüft den Anhang mit einem Virenscanner." + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/po.de.po b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po new file mode 100644 index 000000000..056552a4f --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/po.de.po @@ -0,0 +1,70 @@ +# German translation of basewiki/ikiwiki/pagespec/po page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:55+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(po)\"\n" +" then=\"This wiki has po support **enabled**.\"\n" +" else=\"This wiki has po support **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(po)\"\n" +" then=\"In diesem Wiki ist die po-Unterstützung **aktiviert**.\"\n" +" else=\"In diesem Wiki ist die po-Unterstützung **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "" +"If the [[!iki plugins/po desc=po]] plugin is enabled, the regular " +"[[ikiwiki/PageSpec]] syntax is expanded with the following additional tests " +"that can be used to improve user navigation in a multi-lingual wiki:" +msgstr "" +"Wenn die [[!iki plugins/po desc=po]]-Erweiterung aktiviert ist, ist die " +"reguläre " +"[[ikiwiki/PageSpec]]-Syntax um die folgenden zusätzlichen Tests erweitert, " +"die zur Verbesserung der Benutzernavigation in mehrsprachigen Wikis " +"verwendet werden kann:" + +#. type: Bullet: '* ' +msgid "" +"\"`lang(LL)`\" - tests whether a page is written in the language specified " +"as a ISO639-1 (two-letter) language code." +msgstr "" +"\"`lang(LL)`\" - prüft ob eine Seite in der angegebenen Sprache geschrieben " +"ist. " +"Die Sprache wird als (zweibuchstabiger) Sprachcode nach ISO639-1 angegeben." + +#. type: Bullet: '* ' +msgid "" +"\"`currentlang()`\" - tests whether a page is written in the same language " +"as the current page." +msgstr "" +"\"`currentlang()`\" - prüft, ob eine Seite in der gleichen Sprache " +"geschrieben ist wie " +"die aktuelle Seite." + +#. type: Plain text +msgid "" +"Note that every non-po page is considered to be written in " +"`po_master_language`, as specified in `ikiwiki.setup`." +msgstr "" +"Beachte, dass als Sprache jeder nicht-po-Seite `po_master_language` " +" angenommen wird, wie in `ikiwiki.setup` angegeben." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po new file mode 100644 index 000000000..7ca179a6a --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/pagespec/sorting.de.po @@ -0,0 +1,48 @@ +# German translation of basewiki/ikiwiki/pagespec/sorting page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:19+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"Some [[directives|ikiwiki/directive]] that use " +"[[PageSpecs|ikiwiki/pagespec]] allow specifying the order that matching " +"pages are shown in. The following sort orders can be specified." +msgstr "" +"[[!meta title=\"Sortierung\"]]\n" +"Bei einigen der [[Anweisungen|ikiwiki/directive]], die [[PageSpecs|ikiwiki/pagespec]] verwenden, kann eine Reihenfolge angegeben werden, in der die ausgewählten Seiten angezeigt werden. Die folgenden Sortierreihenfolgen können angegeben werden:" + +#. type: Bullet: '* ' +msgid "`age` - List pages from the most recently created to the oldest." +msgstr "`age` - Zeige die Seiten von der zuletzt angelegten zur ältesten." + +#. type: Bullet: '* ' +msgid "`mtime` - List pages with the most recently modified first." +msgstr "`mtime` - Zeige die Seiten mit der zuletzt veränderten zuerst." + +#. type: Bullet: '* ' +msgid "`title` - Order by title." +msgstr "`title` - Sortiere nach Titel." + +#. type: Bullet: '* ' +msgid "" +"`title_natural` - Only available if [[!cpan Sort::Naturally]] is " +"installed. Orders by title, but numbers in the title are treated as such, " +"(\"1 2 9 10 20\" instead of \"1 10 2 20 9\")" +msgstr "" +"`title_natural` - Nur verfügbar, wenn [[!cpan Sort::Naturally]] " +"installiert ist. " +"Sortiert nach Titel, aber Zahlen im Titel werden als solche behandelt" +"(\"1 2 9 10 20\" statt \"1 10 2 20 9\")." + + diff --git a/po/underlays/basewiki/ikiwiki/searching.de.po b/po/underlays/basewiki/ikiwiki/searching.de.po new file mode 100644 index 000000000..211117995 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/searching.de.po @@ -0,0 +1,92 @@ +# German translation of basewiki/ikiwiki/searching page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:14+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta robots=\"noindex, follow\"]]\n" +"[[!meta title=\"Suchen\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(search)\"\n" +"then=\"This wiki has searching **enabled**.\"\n" +"else=\"This wiki has searching **disabled**.\"]]\n" +msgstr "" +"[[!if test=\"enabled(search)\"\n" +"then=\"In diesem Wiki ist Suchen **aktiviert**.\"\n" +"else=\"In diesem Wiki ist Suchen **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "" +"If searching is enabled, you can enter search terms in the search field, as " +"you'd expect. There are a few special things you can do to construct more " +"powerful searches." +msgstr "" +"Wenn Suchen aktiviert ist, kann man wie erwartet Suchausdrücke in das " +"Suchfeld eintragen. Es gibt einige spezielle Ausdrücke, um mächtigere " +"Suchen zu erstellen." + +#. type: Bullet: '* ' +msgid "To match a phrase, enclose it in double quotes." +msgstr "" +"Um nach einer Phrase aus mehreren Wörtern zu suchen, schreibe sie in " +"Anführungszeichen." + +#. type: Bullet: '* ' +msgid "`AND` can be used to search for documents containing two expressions." +msgstr "" +"`AND` kann verwendet werden, um nach Dokumenten mit zwei Ausdrücken zu " +"suchen." + +#. type: Bullet: '* ' +msgid "" +"`OR` can be used to search for documents containing either one of two " +"expressions." +msgstr "" +"`OR` kann verwendet werden, um nach Dokumenten mit einem der beiden " +"Ausdrücke zu suchen." + +#. type: Bullet: '* ' +msgid "" +"Parentheses can be used to build up complicated search expressions. For " +"example, \"(foo AND bar) OR (me AND you)\"" +msgstr "" +"Klammern können verwendet werden, um komplexere Suchausdrücke aufzubauen. " +"Zum Beispiel `(foo AND bar) OR (ich AND du)`." + +#. type: Bullet: '* ' +msgid "" +"Prefix a search term with \"-\" to avoid it from appearing in the results. " +"For example, \"-discussion\" will omit \"discussion\"." +msgstr "" +"Stelle einem Suchausdruck `-` voran, damit er nicht in den Ergebnissen " +"auftaucht. " +"Zum Beispiel wird `-Diskussion`alle Seiten mit \"Diskussion\" ausschließen." + +#. type: Bullet: '* ' +msgid "To search for a page with a given title, use \"title:foo\"." +msgstr "" +"Um nach einer Seite mit einem bestimmten Titel zu suchen, verwende " +"`title:foo`." + +#. type: Bullet: '* ' +msgid "To search for pages that contain a \"bar\" link, use \"link:bar\"." +msgstr "" +"Um nach Seiten mit einem Link auf \"bar\" zu suchen, verwende `link:bar`." + + diff --git a/po/underlays/basewiki/ikiwiki/subpage.de.po b/po/underlays/basewiki/ikiwiki/subpage.de.po new file mode 100644 index 000000000..3594ab445 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage.de.po @@ -0,0 +1,54 @@ +# German translation of basewiki/ikiwiki/subpage page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:19+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Unterseiten\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"ikiwiki supports placing pages in a directory hierarchy. For example, this " +"page, [[SubPage]] has some related pages placed under it, like " +"[[SubPage/LinkingRules]]. This is a useful way to add some order to your " +"wiki rather than just having a great big directory full of pages." +msgstr "" +"In ikiwiki werden Seiten in einem Verzeichnisbaum angeordnet. Zum Beispiel " +"gibt es unterhalb dieser Seite, [[SubPage]], einige verwandte Seiten, etwa " +"[[SubPage/LinkingRules]]. Dies ist eine nützliche Möglichkeit, Ordnung in " +"ein Wiki zu bringen und nicht nur ein riesiges Verzeichnis voller Seiten zu " +"haben." + +#. type: Plain text +msgid "" +"To add a SubPage, just make a subdirectory and put pages in it. For example, " +"this page is SubPage.mdwn in this wiki's source, and there is also a SubPage " +"subdirectory, which contains SubPage/LinkingRules.mdwn. Subpages can be " +"nested as deeply as you'd like." +msgstr "" +"Um eine Unterseite hinzuzufügen, legt man einfach ein Unterverzeichnis an " +"und erstellt darin Seiten. Zum Beispiel ist diese Seite `SubPage.mdwn` in " +"der Quelle dieses Wikis und es existiert auch ein Unterverzeichnis " +"`SubPage`, das `SubPage/LinkingRules.mdwn` enthält. Unterseiten können " +"beliebig tief verschachtelt werden." + +#. type: Plain text +msgid "Linking to and from a SubPage is explained in [[LinkingRules]]." +msgstr "" +"Wie Links auf Unterseiten gesetzt werden, wird in [[LinkingRules]] erklärt." + + diff --git a/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po new file mode 100644 index 000000000..5702c5fcd --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/subpage/linkingrules.de.po @@ -0,0 +1,109 @@ +# German translation of basewiki/ikiwiki/subpage/linkingrules page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:21+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" +"[[!meta title=\"Regeln für Links\"]]\n" +"[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"To link to or from a [[SubPage]], you can normally use a regular " +"[[WikiLink]] that does not contain the name of the parent directory of the " +"[[SubPage]]. Ikiwiki descends the directory hierarchy looking for a page " +"that matches your link." +msgstr "" +"Um einen Link von oder zu einer [[Unterseite|SubPage]] anzulegen, kann man " +"normalerweise einfache WikiLinks verwenden, ohne dass diese den Namen des " +"Verzeichnisses enthalten, in dem die [[Unterseite|SubPage]] liegt. " +"Ikiwiki läuft dann die Verzeichnishierarchie ab und sucht nach einer Seite, " +"die zu dem angegebenen Link passt." + +#. type: Plain text +msgid "" +"For example, if FooBar/SubPage links to \"OtherPage\", ikiwiki will first " +"prefer pointing the link to FooBar/SubPage/OtherPage if it exists, next to " +"FooBar/OtherPage and finally to OtherPage in the root of the wiki." +msgstr "" +"Wenn zum Beispiel `FooBar/UnterSeite` einen Link auf `AndereSeite` enthält, " +"wird ikiwiki bevorzugt auf `FooBar/UnterSeite/AndereSeite` verweisen, wenn " +"diese existiert, dann auf `FooBar/AndereSeite` und schließlich auf " +"`AndereSeite` im Wurzelverzeichnis des Wikis." + +#. type: Plain text +msgid "" +"Note that this means that if a link on FooBar/SomePage to \"OtherPage\" " +"currently links to OtherPage, in the root of the wiki, and FooBar/OtherPage " +"is created, the link will _change_ to point to FooBar/OtherPage. On the " +"other hand, a link from BazBar to \"OtherPage\" would be unchanged by this " +"creation of a [[SubPage]] of FooBar." +msgstr "" +"Insbesondere bedeutet dies, dass wenn ein Link auf `FooBar/EineSeite` auf " +"`AndereSeite` momentan auf `AndereSeite` im Wurzelverzeichnis des Wikis " +"verweist, und `FooBar/AndereSeite` erstellt wird, dann _ändert_ sich das " +"Ziel des Links auf `FooBar/AndereSeite`. Andererseits würde ein Link von " +"`BazBar` auf `AndereSeite` durch das Anlegen einer [[Unterseite|SubPage]] " +"von `FooBar` unverändert bleiben." + +#. type: Plain text +msgid "" +"You can also specify a link that contains a directory name, like " +"\"FooBar/OtherPage\" to more exactly specify what page to link to. This is " +"the only way to link to an unrelated [[SubPage]]." +msgstr "" +"Man kann auch einen Link mit Verzeichnisnamen angeben, etwa " +"`FooBar/AndereSeite`, um genauer anzugeben auf welche Seite verwiesen werden " +"soll. Nur so kann auf eine [[Unterseite|SubPage]] einer anderen Seite " +"verwiesen werden." + +#. type: Plain text +msgid "" +"You can use this to, for example, to link from BazBar to \"FooBar/SubPage\", " +"or from BazBar/SubPage to \"FooBar/SubPage\"." +msgstr "" +"Man kann dies zum Beispiel dazu verwenden, um einen Link von `BazBar` auf " +"`FooBar/UnterSeite` oder von `BazBar/UnterSeite` auf `FooBar/UnterSeite` " +"anzulegen." + +#. type: Plain text +msgid "" +"You can also use \"/\" at the start of a link, to specify exactly which page " +"to link to, when there are multiple pages with similar names and the link " +"goes to the wrong page by default. For example, linking from " +"\"FooBar/SubPage\" to \"/OtherPage\" will link to the \"OtherPage\" in the " +"root of the wiki, even if there is a \"FooBar/OtherPage\"." +msgstr "" +"Man kann auch `/` am Anfang des Links verwenden, um die Zielseite genau zu " +"spezifizieren, wenn es mehrere Seiten mit ähnlichen Namen gibt und der Link " +"standardmäßig zur falschen geht. Zum Beispiel zeigt der Link `/AndereSeite` " +"auf der Seite `FooBar/UnterSeite` auf `AndereSeite` im Wurzelverzeichnis des " +"Wikis, selbst wenn es eine `FooBar/AndereSeite` gibt." + +#. type: Plain text +msgid "" +"Also, if the wiki is configured with a userdir, you can link to pages within " +"the userdir without specifying a path to them. This is to allow for easy " +"linking to a user's page in the userdir, to sign a comment. These links are " +"checked for last of all." +msgstr "" +"Wenn das Wiki mit einem `userdir` konfiguriert ist, kann man außerdem " +"die Seiten im Benutzerverzeichnis direkt verlinken, ohne einen Pfad " +"anzugeben. Dadurch können leichter Links auf die Seite eines Benutzers " +"gesetzt werden, etwa beim Signieren eines Kommentars. Diese Links " +"werden als letzte von allen in Betracht gezogen." + + diff --git a/po/underlays/basewiki/ikiwiki/wikilink.de.po b/po/underlays/basewiki/ikiwiki/wikilink.de.po new file mode 100644 index 000000000..7bd9130e3 --- /dev/null +++ b/po/underlays/basewiki/ikiwiki/wikilink.de.po @@ -0,0 +1,111 @@ +# German translation of basewiki/ikiwiki/wikilink page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:41+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"WikiLinks provide easy linking between pages of the wiki. To create a " +"[[WikiLink]], just put the name of the page to link to in double brackets. " +"For example `\\[[WikiLink]]`." +msgstr "" +"WikiLinks ermöglichen es, auf einfache Weise Links zwischen Seiten im Wiki " +"zu setzen. " +"Um einen [[WikiLink]] zu erstellen, setze einfach den Namen der Zielseite in " +"doppelte eckige Klammern, zum Beispiel `\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"If you ever need to write something like `\\[[WikiLink]]` without creating a " +"wikilink, just prefix it with a `\\`, like `\\\\[[WikiLink]]`." +msgstr "" +"Wenn man irgendwann einmal etwas wie `\\[[WikiLink]]` schreiben will, " +"ohne einen WikiLink zu erzeugen, stellt man einfach ein `\\` voran, wie in " +"`\\\\[[WikiLink]]`." + +#. type: Plain text +msgid "" +"There are some special [[SubPage/LinkingRules]] that come into play when " +"linking between [[SubPages|SubPage]]." +msgstr "" +"Es gibt einige spezielle [[Regeln für Links|SubPage/LinkingRules]], die beim " +"setzen von Links zwischen [[Unterseiten|SubPage]] ins Spiel kommen." + +#. type: Plain text +msgid "" +"Also, if the file linked to by a WikiLink looks like an image, it will be " +"displayed inline on the page." +msgstr "" +"Wenn das Ziel eines WikiLinks nach einem Bild aussieht, wird dieses " +"innerhalb der Seite angezeigt." + +#. type: Plain text +msgid "" +"WikiLinks are matched with page names in a case-insensitive manner, so you " +"don't need to worry about getting the case the same, and can capitalise " +"links at the start of a sentence, and so on." +msgstr "" +"WikiLinks werden unabhängig von der Groß- und Kleinschreibung gefunden, " +"man braucht sich also keine Gedanken über identische Schreibweise zu machen " +"und kann zum Beispiel das erste Wort eines Satzes groß schreiben." + +#. type: Plain text +msgid "" +"It's also possible to write a WikiLink that uses something other than the " +"page name as the link text. For example `\\[[foo_bar|SandBox]]` links to the " +"SandBox page, but the link will appear like this: [[foo_bar|SandBox]]." +msgstr "" +"Es ist auch möglich einen WikiLink zu schreiben, der etwas anderes als den " +"Seitennamen als Text für den Link verwendet. Zum Beispiel verweist " +"`\\[[foo_bar|SandBox]]` auf die Sandkasten-Seite, aber der Link erscheint " +"als [[foo_bar|SandBox]]." + +#. type: Plain text +msgid "" +"To link to an anchor inside a page, you can use something like " +"`\\[[WikiLink#foo]]` ." +msgstr "" +"Um auf ein Ziel innerhalb einer Seite zu verweisen, kann man etwas wie " +"`\\[[WikiLink#foo]]` verwenden." + +#. type: Title ## +#, no-wrap +msgid "Directives and WikiLinks" +msgstr "Anweisungen und WikiLinks" + +#. type: Plain text +msgid "" +"ikiwiki has two syntaxes for [[directives|directive]]. The older syntax " +"used spaces to distinguish between directives and wikilinks; as a result, " +"with that syntax in use, you cannot use spaces in WikiLinks, and must " +"replace spaces with underscores. The newer syntax, enabled with the " +"`prefix_directives` option in an ikiwiki setup file, prefixes directives " +"with `!`, and thus does not prevent links with spaces. Future versions of " +"ikiwiki will turn this option on by default." +msgstr "" +"Es gibt in ikiwiki zwei Syntaxen für [[Anweisungen|directive]]. Die ältere " +"Syntax verwendete Leerzeichen, um zwischen Anweisungen und WikiLinks " +"zu unterscheiden; mit dem Ergebnis, dass bei Verwendung dieser Syntax " +"keine Leerzeichen in WikiLinks verwendet werden können und durch " +"Unterstriche ersetzt werden müssen. Die neuere Syntax, aktiviert durch " +"die Option `prefix_directives` in einer ikiwiki-Setup-Datei, stellt " +"Anweisungen `!` voran und ermöglicht so Links mit Leerzeichen. " +"Zukünftige Versionen von ikiwiki werden diese Option standardmäßig " +"aktivieren." + + diff --git a/po/underlays/basewiki/index.de.po b/po/underlays/basewiki/index.de.po new file mode 100644 index 000000000..037412d55 --- /dev/null +++ b/po/underlays/basewiki/index.de.po @@ -0,0 +1,29 @@ +# German translation of basewiki/index page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 09:40+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "Welcome to your new wiki." +msgstr "Willkommen in Ihrem neuen Wiki." + +#. type: Plain text +msgid "All wikis are supposed to have a [[SandBox]], so this one does too." +msgstr "" +"Alle Wikis sollten einen [[Sandkasten|SandBox]] haben, also hat dieses " +"auch einen." + +#. type: Plain text +msgid "This wiki is powered by [[ikiwiki]]." +msgstr "Dieses Wiki wird mit [[ikiwiki]] betrieben." + diff --git a/po/underlays/basewiki/recentchanges.de.po b/po/underlays/basewiki/recentchanges.de.po new file mode 100644 index 000000000..f1e75acd9 --- /dev/null +++ b/po/underlays/basewiki/recentchanges.de.po @@ -0,0 +1,38 @@ +# German translation of basewiki/recentchanges page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 09:41+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(meta)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(meta)\" then=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta title=\"RecentChanges\"]]\n" +msgstr "[[!meta title=\"Letzte Änderungen\"]]\n" + +#. type: Plain text +msgid "Recent changes to this wiki:" +msgstr "Die letzten Änderungen an diesem Wiki:" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" +msgstr "" +"[[!inline pages=\"internal(recentchanges/change_*) and !*/Discussion\" \n" +"template=recentchanges show=0]]\n" + diff --git a/po/underlays/basewiki/sandbox.de.po b/po/underlays/basewiki/sandbox.de.po new file mode 100644 index 000000000..0e8d354f8 --- /dev/null +++ b/po/underlays/basewiki/sandbox.de.po @@ -0,0 +1,91 @@ +# German translation of basewiki/sandbox page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:14+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, fuzzy +msgid "This is the SandBox, a page anyone can edit to learn how to use the wiki." +msgstr "" +"[[!meta title=\"Sandkasten\"]]\n" +"Dies ist der Sandkasten: Eine Seite die jeder bearbeiten kann, um zu lernen wie man das Wiki benutzt." + +#. type: Plain text +msgid "Here's a paragraph." +msgstr "Dies ist ein Absatz." + +#. type: Plain text +msgid "Here's another one with *emphasised* text." +msgstr "Dies ist noch ein Absatz mit *hervorgehobenem* Text." + +#. type: Title # +#, no-wrap +msgid "Header" +msgstr "Überschrift" + +#. type: Title ## +#, no-wrap +msgid "Subheader" +msgstr "Unterüberschrift" + +#. type: Plain text +#, no-wrap +msgid "" +"> This is a blockquote.\n" +">\n" +"> This is the first level of quoting.\n" +">\n" +"> > This is nested blockquote.\n" +">\n" +"> Back to the first level.\n" +msgstr "" +"> Dies ist ein zitierter Absatz.\n" +">\n" +"> Dies ist die erste Zitatebene.\n" +">\n" +"> > Dies ist ein verschachteltes Zitat.\n" +">\n" +"> Zurück zur ersten Ebene.\n" + +#. type: Plain text +msgid "Numbered list" +msgstr "Nummerierte Aufzählung" + +#. type: Bullet: '1. ' +msgid "First item." +msgstr "Erster Eintrag" + +#. type: Bullet: '1. ' +msgid "Another." +msgstr "Noch einer." + +#. type: Bullet: '1. ' +msgid "And another.." +msgstr "Und noch einer ..." + +#. type: Plain text +msgid "Bulleted list" +msgstr "Einfache Aufzählung" + +#. type: Bullet: '* ' +msgid "*item*" +msgstr "*Eintrag*" + +#. type: Bullet: '* ' +msgid "item" +msgstr "Eintrag" + +#. type: Plain text +msgid "[[ikiwiki/WikiLink]]" +msgstr "[[ikiwiki/WikiLink]]" + diff --git a/po/underlays/basewiki/shortcuts.de.po b/po/underlays/basewiki/shortcuts.de.po new file mode 100644 index 000000000..36be14729 --- /dev/null +++ b/po/underlays/basewiki/shortcuts.de.po @@ -0,0 +1,287 @@ +# German translation of basewiki/shortcuts page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:14+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"This wiki has shortcuts **enabled**.\"\n" +" else=\"This wiki has shortcuts **disabled**.\"]]\n" +msgstr "" +"[[!meta title=\"Abkürzungen\"]]\n" +"[[!if test=\"enabled(shortcut)\"\n" +" then=\"In diesem Wiki sind Abkürzungen **aktiviert**.\"\n" +" else=\"In diesem Wiki sind Abkürzungen **deaktiviert**.\"]]\n" + +#. type: Plain text +msgid "Some examples of using shortcuts include:" +msgstr "Abkürzungen können unter anderem so benutzt werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tCheck the \\[[!cia ikiwiki desc=\"CIA page for %s\"]].\n" +msgstr "" +"\t\\[[!google foo]]\n" +"\t\\[[!wikipedia War_of_1812]]\n" +"\t\\[[!debbug 12345]]\n" +"\tBetrachte die \\[[!cia ikiwiki desc=\"CIA-Seite für %s\"]].\n" + +#. type: Plain text +msgid "This page controls what shortcut links the wiki supports." +msgstr "Diese Seite bestimmt, welche Abkürzungen das Wiki unterstützt." + +#. type: Bullet: '* ' +msgid "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]" +msgstr "[[!shortcut name=google url=\"http://www.google.com/search?q=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" +msgstr "[[!shortcut name=archive url=\"http://web.archive.org/*/%S\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]" +msgstr "[[!shortcut name=gmap url=\"http://maps.google.com/maps?q=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]" +msgstr "[[!shortcut name=gmsg url=\"http://groups.google.com/groups?selm=%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wikipedia url=\"http://en.wikipedia.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" +msgstr "[[!shortcut name=wikitravel url=\"http://wikitravel.org/en/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" +msgstr "[[!shortcut name=wiktionary url=\"http://en.wiktionary.org/wiki/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug " +"#%s\"]]" +msgstr "" +"[[!shortcut name=debbug url=\"http://bugs.debian.org/%S\" desc=\"Debian bug " +"#%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" " +"desc=\"debian-%s@lists.debian.org\"]]" +msgstr "" +"[[!shortcut name=deblist url=\"http://lists.debian.org/debian-%s\" " +"desc=\"debian-%s@lists.debian.org\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpkg url=\"http://packages.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" +msgstr "[[!shortcut name=debpkgsid url=\"http://packages.debian.org/sid/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" +msgstr "[[!shortcut name=debpts url=\"http://packages.qa.debian.org/%s\"]]" + +#. type: Bullet: '* ' +msgid "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]" +msgstr "[[!shortcut name=debmsg url=\"http://lists.debian.org/msgid-search/%s\"]]" + +#. type: Bullet: '* ' +msgid "" +"[[!shortcut name=debrt " +"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]" +msgstr "" +"[[!shortcut name=debrt " +"url=\"https://rt.debian.org/Ticket/Display.html?id=%s\"]]" + +#. type: Plain text +#, no-wrap +msgid "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Usage: `\\[[!debss package]]`, `\\[[!debss package#version]]`, or " +"`\\[[!debss package/version]]`. See http://snapshot.debian.net for " +"details.\n" +"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n" +"* [[!shortcut name=fdobug " +"url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" " +"desc=\"freedesktop.org bug #%s\"]]\n" +"* [[!shortcut name=fdolist " +"url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" " +"desc=\"%s@lists.freedesktop.org\"]]\n" +"* [[!shortcut name=gnomebug " +"url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug " +"#%s\"]]\n" +"* [[!shortcut name=linuxbug " +"url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug " +"#%s\"]]\n" +"* [[!shortcut name=mozbug " +"url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug " +"#%s\"]]\n" +"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" " +"desc=\"%s@gnu.org\"]]\n" +"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n" +"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n" +"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" " +"desc=\"gmane.%s\"]]\n" +"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n" +"* [[!shortcut name=cpan " +"url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n" +"* [[!shortcut name=ctan " +"url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n" +"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n" +"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n" +"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n" +"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC " +"%s\"]]\n" +"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n" +"* [[!shortcut name=meatballwiki " +"url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n" +"* [[!shortcut name=emacswiki " +"url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n" +"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n" +"* [[!shortcut name=dict " +"url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n" +"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n" +"* [[!shortcut name=gpg " +"url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n" +"* [[!shortcut name=perldoc " +"url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n" +"* [[!shortcut name=whois " +"url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n" +"* [[!shortcut name=cve " +"url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n" +"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n" +"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n" +"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n" +"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n" +"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n" +"* [[!shortcut name=cpanrt " +"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN " +"RT#%s\"]]\n" +"* [[!shortcut name=novellbug " +"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n" +msgstr "" +"* [[!shortcut name=debss url=\"http://snapshot.debian.net/package/%s\"]]\n" +" * Verwendung: `\\[[!debss Paket]]`, `\\[[!debss Paket#Version]]`, or " +"`\\[[!debss Paket/Version]]`. Details unter http://snapshot.debian.net.\n" +"* [[!shortcut name=debwiki url=\"http://wiki.debian.org/%s\"]]\n" +"* [[!shortcut name=fdobug " +"url=\"https://bugs.freedesktop.org/show_bug.cgi?id=%s\" " +"desc=\"freedesktop.org bug #%s\"]]\n" +"* [[!shortcut name=fdolist " +"url=\"http://lists.freedesktop.org/mailman/listinfo/%s\" " +"desc=\"%s@lists.freedesktop.org\"]]\n" +"* [[!shortcut name=gnomebug " +"url=\"http://bugzilla.gnome.org/show_bug.cgi?id=%s\" desc=\"GNOME bug " +"#%s\"]]\n" +"* [[!shortcut name=linuxbug " +"url=\"http://bugzilla.kernel.org/show_bug.cgi?id=%s\" desc=\"Linux bug " +"#%s\"]]\n" +"* [[!shortcut name=mozbug " +"url=\"https://bugzilla.mozilla.org/show_bug.cgi?id=%s\" desc=\"Mozilla bug " +"#%s\"]]\n" +"* [[!shortcut name=gnulist url=\"http://lists.gnu.org/mailman/listinfo/%s\" " +"desc=\"%s@gnu.org\"]]\n" +"* [[!shortcut name=marcmsg url=\"http://marc.info/?i=%s\"]]\n" +"* [[!shortcut name=marclist url=\"http://marc.info/?l=%s\"]]\n" +"* [[!shortcut name=gmane url=\"http://dir.gmane.org/gmane.%s\" " +"desc=\"gmane.%s\"]]\n" +"* [[!shortcut name=gmanemsg url=\"http://mid.gmane.org/%s\"]]\n" +"* [[!shortcut name=cpan " +"url=\"http://search.cpan.org/search?mode=dist&query=%s\"]]\n" +"* [[!shortcut name=ctan " +"url=\"http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s\"]]\n" +"* [[!shortcut name=hoogle url=\"http://haskell.org/hoogle/?q=%s\"]]\n" +"* [[!shortcut name=iki url=\"http://ikiwiki.info/%S/\"]]\n" +"* [[!shortcut name=ljuser url=\"http://%s.livejournal.com/\"]]\n" +"* [[!shortcut name=rfc url=\"http://www.ietf.org/rfc/rfc%s.txt\" desc=\"RFC " +"%s\"]]\n" +"* [[!shortcut name=c2 url=\"http://c2.com/cgi/wiki?%s\"]]\n" +"* [[!shortcut name=meatballwiki " +"url=\"http://www.usemod.com/cgi-bin/mb.pl?%s\"]]\n" +"* [[!shortcut name=emacswiki " +"url=\"http://www.emacswiki.org/cgi-bin/wiki/%s\"]]\n" +"* [[!shortcut name=haskellwiki url=\"http://haskell.org/haskellwiki/%s\"]]\n" +"* [[!shortcut name=dict " +"url=\"http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s\"]]\n" +"* [[!shortcut name=imdb url=\"http://imdb.com/find?q=%s\"]]\n" +"* [[!shortcut name=gpg " +"url=\"http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s\"]]\n" +"* [[!shortcut name=perldoc " +"url=\"http://perldoc.perl.org/search.html?q=%s\"]]\n" +"* [[!shortcut name=whois " +"url=\"http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain\"]]\n" +"* [[!shortcut name=cve " +"url=\"http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s\"]]\n" +"* [[!shortcut name=cia url=\"http://cia.vc/stats/project/%s\"]]\n" +"* [[!shortcut name=ciauser url=\"http://cia.vc/stats/user/%s\"]]\n" +"* [[!shortcut name=flickr url=\"http://www.flickr.com/photos/%s\"]]\n" +"* [[!shortcut name=man url=\"http://linux.die.net/man/%s\"]]\n" +"* [[!shortcut name=ohloh url=\"http://www.ohloh.net/projects/%s\"]]\n" +"* [[!shortcut name=cpanrt " +"url=\"https://rt.cpan.org/Ticket/Display.html?id=%s\" desc=\"CPAN " +"RT#%s\"]]\n" +"* [[!shortcut name=novellbug " +"url=\"https://bugzilla.novell.com/show_bug.cgi?id=%s\" desc=\"bug %s\"]]\n" + +#. type: Plain text +msgid "" +"To add a new shortcut, use the `shortcut` [[ikiwiki/directive]]. In the url, " +"\"%s\" is replaced with the text passed to the named shortcut, after " +"[[!wikipedia url_encoding]] it, and '%S' is replaced with the raw, " +"non-encoded text. The optional `desc` parameter controls the description of " +"the link." +msgstr "" +"Um eine neue Abkürzung hinzuzufügen, verwende die " +"shortcut-[[Anweisung|ikiwiki/directive]]. " +"In der URL wird `%s` durch den der Abkürzung übergebenen Text in " +"URL-Kodierung ersetzt. Außerdem wird `%S` durch den unveränderten Text ersetzt. " +"Der optionale Parameter `desc` steuert die Beschriftung der Verknüpfung." + +#. type: Plain text +msgid "" +"Remember that the `name` you give the shortcut will become a new " +"[[ikiwiki/directive]]. Avoid using a `name` that conflicts with an existing " +"directive. These directives also accept a `desc` parameter that will " +"override the one provided at definition time." +msgstr "" +"Denke daran, dass der angegebene `name` eine neue " +"[[Anweisung|ikiwiki/directive]] wird. Deshalb sollte man es vermeiden, " +"einen Namen zu verwenden, der mit einer bestehenden " +"[[Anweisung|ikiwiki/directive]] in Konflikt steht. Diese Anweisungen akzeptieren " +"einen optionalen Parameter `desc`, der statt des Werts aus der Definition " +"verwendet wird." + +#. type: Plain text +msgid "" +"If you come up with a shortcut that you think others might find useful, " +"consider contributing it to the [shortcuts page on the ikiwiki " +"wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki " +"will include your shortcut in the standard underlay." +msgstr "" +"Wenn Sie eine Idee für eine Abkürzung haben, die auch andere nützlich " +"finden könnten, können Sie diese auf der [Abkürzungs-Seite des " +"ikiwiki-Wiki](http://ikiwiki.info/shortcuts/) eintragen, damit künftige " +"Versionen von ikiwiki diese Abkürzung standardmäßig zur Verfügung stellen." + + diff --git a/po/underlays/basewiki/templates.de.po b/po/underlays/basewiki/templates.de.po new file mode 100644 index 000000000..1bc6c7513 --- /dev/null +++ b/po/underlays/basewiki/templates.de.po @@ -0,0 +1,256 @@ +# German translation of basewiki/templates page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 15:15+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!if test=\"enabled(template)\"\n" +"then=\"This wiki has templates **enabled**.\"\n" +"else=\"This wiki has templates **disabled**.\"\n" +"]]\n" +msgstr "" +"[[!meta title=\"Vorlagen\"]]\n" +"[[!if test=\"enabled(template)\"\n" +"then=\"In diesem Wiki sind Vorlagen **aktiviert**.\"\n" +"else=\"In diesem Wiki sind Vorlagen **deaktiviert**.\"\n" +"]]\n" + +#. type: Plain text +msgid "" +"Templates are files that can be filled out and inserted into pages in the " +"wiki." +msgstr "" +"Vorlagen sind Dateien, die ausgefüllt und in Wiki-Seiten eingefügt werden " +"können." + +#. type: Plain text +#, no-wrap +msgid "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" +msgstr "[[!if test=\"enabled(template) and enabled(inline)\" then=\"\"\"\n" + +#. type: Plain text +msgid "These templates are available for inclusion onto other pages in this wiki:" +msgstr "" +"Diese Vorlagen sind verfügbar und können in andere Seiten dieses " +"Wikis eingebettet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" +msgstr "" +"[[!inline pages=\"templates/* and !*/discussion\" feeds=no archive=yes\n" +"sort=title template=titlepage]]\n" + +#. type: Title ## +#, no-wrap +msgid "Using a template" +msgstr "Verwenden einer Vorlage" + +#. type: Plain text +msgid "Using a template works like this:" +msgstr "Eine Vorlage kann folgendermaßen verwendet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my " +"note.\"\"\"]]\n" +msgstr "" +"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine " +"Notiz eingefügt werden soll.\"\"\"]]\n" + +#. type: Plain text +msgid "" +"This fills out the [[note]] template, filling in the `text` field with the " +"specified value, and inserts the result into the page." +msgstr "" +"Dies verwendet die Vorlage [[note]], wobei das `text`-Feld mit dem " +"angegebenen Wert gefüllt wird, und fügt das Ergebnis in die Seite ein." + +#. type: Plain text +msgid "" +"Generally, a value can include any markup that would be allowed in the wiki " +"page outside the template. Triple-quoting the value even allows quotes to be " +"included in it. Combined with multi-line quoted values, this allows for " +"large chunks of marked up text to be embedded into a template:" +msgstr "" +"Ein Wert kann im allgemeinen beliebige Formatierungsanweisungen enthalten, " +"die im Wiki außerhalb der Vorlage zulässig sind. Durch die Verwendung dreier " +"Anführungszeichen können sogar Anführungszeichen enthalten sein. In Kombination " +"mit mehrzeiligen Werten in Anführungszeichen können so große Mengen an " +"zu formatierendem Text in die Vorlage eingefügt werden:" + +#. type: Plain text +#, no-wrap +msgid "" +" \\[[!template id=foo name=\"Sally\" color=\"green\" age=8 " +"notes=\"\"\"\n" +msgstr "" +" \\[[!template id=foo name=\"Anna\" color=\"grün\" age=8 " +"notes=\"\"\"\n" + +#. type: Bullet: ' * ' +msgid "\\[[Charley]]'s sister." +msgstr "\\[[Thomas]] Schwester." + +#. type: Bullet: ' * ' +msgid "\"I want to be an astronaut when I grow up.\"" +msgstr "\"Ich will ein Astronaut werden, wenn ich erwachsen bin.\"" + +#. type: Bullet: ' * ' +msgid "Really 8 and a half." +msgstr "Wirklich achteinhalb." + +#. type: Title ## +#, no-wrap +msgid "Creating a template" +msgstr "Erstellen einer Vorlage" + +#. type: Plain text +msgid "" +"To create a template, simply add a template directive to a page, and the " +"page will provide a link that can be used to create the template. The " +"template is a regular wiki page, located in the `templates/` subdirectory " +"inside the source directory of the wiki." +msgstr "" +"Um eine Vorlage zu erstellen, füge einfach die Anweisung `template` zu " +"einer Seite hinzu. Diese Seite bietet dann einen Link zur Erstellung der " +"Vorlage an. Die Vorlage ist eine normale Wiki-Seite, die im Unterverzeichnis " +"`templates/` des Wiki-Quellverzeichnisses liegt." + +#. type: Plain text +msgid "" +"The template uses the syntax used by the [[!cpan HTML::Template]] perl " +"module, which allows for some fairly complex things to be done. Consult its " +"documentation for the full syntax, but all you really need to know are a few " +"things:" +msgstr "" +"Die Vorlage verwendet die Syntax des Perl-Moduls [[!cpan HTML::Template]], " +"das die Umsetzung auch komplexer Vorhaben ermöglicht. In seiner Dokumentation " +"ist die vollständige Syntax beschrieben, zur Verwendung muss man aber nur " +"das Folgende wirklich wissen:" + +#. type: Bullet: '* ' +msgid "" +"Each parameter you pass to the template directive will generate a template " +"variable. There are also some pre-defined variables like PAGE and BASENAME." +msgstr "" +"Jeder Parameter, der der template-Anweisung übergeben wird, erzeugt eine " +"Variable, die in der Vorlage verwendet werden kann. Es gibt auch einige " +"vordefinierte Variablen wie PAGE und BASENAME." + +#. type: Bullet: '* ' +msgid "" +"To insert the value of a variable, use ``. Wiki markup in " +"the value will first be converted to html." +msgstr "" +"Um den Wert einer Variable einzufügen, verwende ``. " +"Wiki-Formatierung im Wert wird zuvor zu HTML konvertiert werden." + +#. type: Bullet: '* ' +msgid "" +"To insert the raw value of a variable, with wiki markup not yet converted to " +"html, use ``." +msgstr "" +"Um den unformatierten Wert einer Variable einzufügen, der die unveränderten " +"Wiki-Formatierungsanweisungen enthält, verwende ``." + +#. type: Bullet: '* ' +msgid "" +"To make a block of text conditional on a variable being set use `text`." +msgstr "" +"Wenn ein Textblock nur dann angezeigt werden soll, wenn eine Variable gesetzt " +"ist, " +"verwende `Text`." + +#. type: Bullet: '* ' +msgid "" +"To use one block of text if a variable is set and a second if it's not, use " +"`textother text`" +msgstr "" +"Um einen Textblock anzuzeigen, wenn eine Variable gesetzt ist, und einen " +"anderen, wenn sie es nicht ist, verwende `Textanderer Text`." + +#. type: Plain text +msgid "Here's a sample template:" +msgstr "Hier ist eine Beispiel-Vorlage:" + +#. type: Plain text +#, no-wrap +msgid "" +" \n" +" Name: \\[[]]
    \n" +" Age:
    \n" +" \n" +" Favorite color:
    \n" +" \n" +" No favorite color.
    \n" +"
    \n" +" \n" +"
    \n" +" \n" +"
    \n" +"
    \n" +msgstr "" +" \n" +" Name: \\[[]]
    \n" +" Alter:
    \n" +" \n" +" Lieblingsfarbe:
    \n" +" \n" +" Keine Lieblingsfarbe.
    \n" +"
    \n" +" \n" +"
    \n" +" \n" +"
    \n" +"
    \n" + +#. type: Plain text +msgid "" +"The filled out template will be formatted the same as the rest of the page " +"that contains it, so you can include WikiLinks and all other forms of wiki " +"markup in the template. Note though that such WikiLinks will not show up as " +"backlinks to the page that uses the template." +msgstr "" +"Die ausgefüllte Vorlage wird genauso formatiert wie der Rest der Seite, die " +"sie enthält, man kann also WikiLinks und alle anderen Arten von " +"Wiki-Formatierung in der Vorlage verwenden. Zu beachten ist aber, dass " +"solche WikiLinks nicht als Rückwärts-Links zu der Seite auftauchen, die " +"die Vorlage verwendet." + +#. type: Plain text +msgid "" +"Note the use of \"raw_name\" inside the [[ikiwiki/WikiLink]] generator. This " +"ensures that if the name contains something that might be mistaken for wiki " +"markup, it's not converted to html before being processed as a " +"[[ikiwiki/WikiLink]]." +msgstr "" +"Beachte auch die Verwendung von `raw_name` innerhalb des Generators für " +"den [[ikiwiki/WikiLink]]. Dies stellt sicher, dass der Name nicht nach HTML " +"konvertiert wird, selbst wenn er etwas enthält, was für eine " +"Wiki-Formatierungsanweisung gehalten werden könnte, bevor er als " +"[[ikiwiki/WikiLink]] verarbeitet wird." + + diff --git a/po/underlays/basewiki/templates/note.de.po b/po/underlays/basewiki/templates/note.de.po new file mode 100644 index 000000000..2aa5aa9d6 --- /dev/null +++ b/po/underlays/basewiki/templates/note.de.po @@ -0,0 +1,42 @@ +# German translation of basewiki/templates/note page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 20:04+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"
    \n" +"\n" +"
    \n" +"\n" +"Use this template to insert a note into a page. The note will be styled to\n" +"float to the right of other text on the page. This template has one\n" +"parameter:\n" +"
      \n" +"
    • `text` - the text to display in the note\n" +"
    \n" +"
    \n" +msgstr "" +"
    \n" +"\n" +"
    \n" +"\n" +"Verwende diese Vorlage, um eine Notiz in eine Seite einzufügen. Die Notiz\n" +"wird rechts vom restlichen Text der Seite schwebend angezeigt werden.\n" +"Diese Vorlage hat einen Parameter:" +"
      \n" +"
    • `text` - der Text, der in der Notiz angezeigt werden soll.\n" +"
    \n" +"
    \n" + diff --git a/po/underlays/basewiki/templates/popup.de.po b/po/underlays/basewiki/templates/popup.de.po new file mode 100644 index 000000000..37ba31ff8 --- /dev/null +++ b/po/underlays/basewiki/templates/popup.de.po @@ -0,0 +1,59 @@ +# German translation of basewiki/templates/popup page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 20:08+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\n" +"Use this template to create a popup window that is displayed when the " +"mouse\n" +"is over part of the page. This template has two parameters:\n" +"
      \n" +"
    • `mouseover` - This is the text or other content that triggers the\n" +"popup.\n" +"
    • `popup` - This should be the content of the popup window. It can be\n" +"anything, even images or a whole little wiki page, but should not be too\n" +"large for good usability.\n" +"
    \n" +"Note that browsers that do not support the CSS will display the popup\n" +"inline in the page, inside square brackets.\n" +"
    \n" +"\n" +"[]\n" +"\n" +msgstr "" +"\n" +"Verwende diese Vorlage, um ein Popup-Fenster anzuzeigen, wenn sich die " +"Maus\n" +"über diesem Teil der Seite befindet. Dies Vorlage hat zwei Parameter:\n" +"
      \n" +"
    • `mouseover` - Dies ist der Text oder andere Inhalt, der das " +"Popup-Fenster\n" +"auslöst.\n" +"
    • `popup` - Dies ist der Inhalt des Popup-Fensters. Er kann beliebig " +"sein,\n" +"sogar Bilder oder eine ganze kleine Wiki-Seite. Im Interesse guter " +"Benutzbarkeit\n" +"sollte er aber nicht zu groß sein." +"
    \n" +"Beachte, dass Browser, die CSS nicht unterstützen, das Popup innerhalb\n" +"der Seite anzeigen, eingerahmt durch eckige Klammern.\n" +"
    \n" +"\n" +"[]\n" +"\n" + diff --git a/po/underlays/directives/ikiwiki/directive/aggregate.de.po b/po/underlays/directives/ikiwiki/directive/aggregate.de.po new file mode 100644 index 000000000..518190ade --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/aggregate.de.po @@ -0,0 +1,189 @@ +# German translation of directives/ikiwiki/directive/aggregate page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:56+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `aggregate` directive is supplied by the [[!iki plugins/aggregate " +"desc=aggregate]] plugin. This plugin requires extra setup, specifically, a " +"cron job. See the plugin's documentation for details." +msgstr "" +"Die `aggregate`-Anweisung wird durch die [[!iki plugins/aggregate " +"desc=aggregate]]-Erweiterung zur Verfügung gestellt. Diese Erweiterung erfordert " +"zusätzliche Konfiguration, insbesondere einen cron-Job. Für Details siehe die " +"Dokumentation der Erweiterung." + +#. type: Plain text +msgid "" +"This directive allows content from other feeds to be aggregated into the " +"wiki. Aggregate a feed as follows:" +msgstr "" +"Diese Anweisung erlaubt es, Inhalt von anderen Feeds in diesem Wiki " +"gesammelt zur Verfügung zu stellen. Dies funktioniert wie folgt:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!aggregate name=\"example blog\" dir=\"example\"\n" +"\tfeedurl=\"http://example.com/index.rss\"\n" +"\turl=\"http://example.com/\" updateinterval=\"15\"]]\n" +msgstr "" +"\t\\[[!aggregate name=\"Beispiel-Blog\" dir=\"beispiel\"\n" +"\tfeedurl=\"http://beispiel.de/index.rss\"\n" +"\turl=\"http://beispiel.de/\" updateinterval=\"15\"]]\n" + +#. type: Plain text +msgid "" +"That example aggregates posts from the specified RSS feed, updating no more " +"frequently than once every 15 minutes (though possibly less frequently, if " +"the cron job runs less frequently than that), and puts a page per post under " +"the example/ directory in the wiki." +msgstr "" +"In diesem Beispiel werden Beiträge aus dem angegebenen RSS-Feed " +"eingesammelt, und zwar nicht öfter als alle 15 Minuten (möglicherweise " +"aber seltener, wenn der cron-Job seltener läuft), und dann als eine Seite " +"pro Beitrag im Verzeichnis `beispiel/` des Wikis gespeichert." + +#. type: Plain text +msgid "" +"You can then use ikiwiki's [[inline]] directive to create a blog of one or " +"more aggregated feeds. For example:" +msgstr "" +"Man kann dann ikiwikis [[inline]]-Anweisun nutzen, um einen Blog aus " +"einem oder mehreren eingesammelten Feeds zu erstellen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"internal(example/*)\"]]\n" +msgstr "\t\\[[!inline pages=\"internal(beispiel/*)\"]]\n" + +#. type: Plain text +msgid "" +"Note the use of `internal()` in the [[ikiwiki/PageSpec]] to match aggregated " +"pages. By default, aggregated pages are internal pages, which prevents them " +"from showing up directly in the wiki, and so this special [[PageSpec]] is " +"needed to match them." +msgstr "" +"Dabei ist es wichtig, `internal()` in der [[ikiwiki/PageSpec]] zur Erfassung der " +"eingesammelten Seiten zu verwenden. Diese werden standardmäßig als interne " +"Seiten gespeichert: Dies verhindert, dass sie direkt im Wiki auftauchen. Deshalb " +"ist diese spezielle [[ikiwiki/PageSpec]] nötig, um sie zu erfassen." + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"Here are descriptions of all the supported parameters to the `aggregate` " +"directive:" +msgstr "" +"Hier die Beschreibung aller unterstützter Parameter der " +"`aggregate`-Anweisung:" + +#. type: Bullet: '* ' +msgid "`name` - A name for the feed. Each feed must have a unique name. Required." +msgstr "" +"`name` - Ein Name für den Feed. Jeder Feed muss einen nur einmal vergebenen " +"Namen haben. Erforderlich." + +#. type: Bullet: '* ' +msgid "" +"`url` - The url to the web page for the feed that's being aggregated. " +"Required." +msgstr "" +"`url` - Die URL mit der Webseite des Feeds, der eingesammelt werden soll. " +"Erforderlich." + +#. type: Bullet: '* ' +msgid "" +"`dir` - The directory in the wiki where pages should be saved. Optional, if " +"not specified, the directory is based on the name of the feed." +msgstr "" +"`dir` - Das Verzeichnis im Wiki, in dem die Seiten gespeichert werden sollen. " +"Optional, wenn nicht angegeben, wird der Verzeichnisname vom Namen des Feeds " +"abgeleitet." + +#. type: Bullet: '* ' +msgid "" +"`feedurl` - The url to the feed. Optional, if it's not specified ikiwiki " +"will look for feeds on the `url`. RSS and atom feeds are supported." +msgstr "" +"`feedurl` - Die URL des Feeds. Optional, wenn nicht angegeben, sucht ikiwiki in " +"unter der `url` nach feeds. Unterstützt werden RSS- und Atom-Feeds." + +#. type: Bullet: '* ' +msgid "" +"`updateinterval` - How often to check for new posts, in minutes. Default is " +"15 minutes." +msgstr "" +"`updateinterval` - Wie oft nach neuen Beiträgen geschaut werden soll. " +"Voreingestellt sind 15 Minuten." + +#. type: Bullet: '* ' +msgid "" +"`expireage` - Expire old items from this feed if they are older than a " +"specified number of days. Default is to never expire on age." +msgstr "" +"`expireage` - Entferne alte Einträge aus diesem Feed, wenn sie älter sind als " +"die angegebene Anzahl von Tagen. Voreingestellt ist, niemals Einträge aufgrund " +"ihres Alters zu entfernen." + +#. type: Bullet: '* ' +msgid "" +"`expirecount` - Expire old items from this feed if there are more than the " +"specified number total. Oldest items will be expired first. Default is to " +"never expire on count." +msgstr "" +"`expirecount` - Entferne alte Einträge aus diesem Feed, wenn es insgesamt mehr " +"als die angegebene Anzahl von Beiträgen gibt. Die ältesten Einträge werden " +"zuerst entfernt. Voreingestellt ist, niemals Einträge aufgrund der Anzahl zu " +"entfernen." + +#. type: Bullet: '* ' +msgid "" +"`tag` - A tag to tag each post from the feed with. A good tag to use is the " +"name of the feed. Can be repeated multiple times. The [[tag]] plugin must be " +"enabled for this to work." +msgstr "" +"`tag` - Ein Tag, mit dem alle Beiträge dieses Feeds versehen werden. Gut eignet " +"sich der Name des Feeds. Kann mehrmals angegeben werden. Die [[tag]]-Erweiterung " +"muss " +"aktiviert sein, damit dies funktioniert." + +#. type: Bullet: '* ' +msgid "" +"`template` - Template to use for creating the aggregated pages. Defaults to " +"aggregatepost." +msgstr "" +"`template` - Vorlage, die bei der Erstellung der eingesammelten Seiten verwendet " +"wird. Voreingestellt ist `aggregatepost`." + +#. type: Plain text +msgid "" +"Note that even if you are using subversion or another revision control " +"system, pages created by aggregation will *not* be checked into revision " +"control." +msgstr "" +"Dabei ist zu beachten, dass die beim Einsammeln erstellten Seiten nicht in der " +"Versionsverwaltung registriert werden, selbst wenn subversion oder ein " +"anderes solches System verwendet wird." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po new file mode 100644 index 000000000..ff258a562 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/brokenlinks.de.po @@ -0,0 +1,57 @@ +# German translation of directives/ikiwiki/directive/brokenlinks page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:57+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `brokenlinks` directive is supplied by the [[!iki plugins/brokenlinks " +"desc=brokenlinks]] plugin." +msgstr "" +"Die `brokenlinks`-Anweisung wird durch die [[!iki plugins/brokenlinks " +"desc=brokenlinks]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a list of broken links on pages in the wiki. This " +"is a useful way to find pages that still need to be written, or links that " +"are written wrong." +msgstr "" +"Diese Anweisung erzeugt eine Liste aller defekter Links im Wiki. Dies ist " +"ein nützlicher Weg zu erfahren, welche Seiten noch geschrieben werden " +"müssen und welche Links Fehler enthalten." + +#. type: Plain text +msgid "" +"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying " +"the pages to search for broken links, default is search them all." +msgstr "" +"Der optionale Parameter `pages` kann eine [[ikiwiki/PageSpec]] enthalten, " +"die angibt welche Seiten nach defekten Links durchsucht werden sollen. " +"Standardmäßig werden alle durchsucht." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n" +msgstr "\t\\[[!brokenlinks pages=\"* and !recentchanges\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/calendar.de.po b/po/underlays/directives/ikiwiki/directive/calendar.de.po new file mode 100644 index 000000000..5c6868e18 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/calendar.de.po @@ -0,0 +1,183 @@ +# German translation of directives/ikiwiki/directive/calendar page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:57+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `calendar` directive is supplied by the [[!iki plugins/calendar " +"desc=calendar]] plugin." +msgstr "" +"Die `calendar`-Anweisung wird durch die [[!iki plugins/calendar " +"desc=calendar]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive displays a calendar, similar to the typical calendars shown " +"on some blogs." +msgstr "" +"Diese Anweisung zeigt einen Kalender, ähnlich denen, die auf manchen Blogs " +"angezeigt werden." + +#. type: Title # +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!calendar ]]\n" +msgstr "\t\\[[!calendar ]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n" +msgstr "\t\\[[!calendar type=\"month\" pages=\"blog/* and !*/Discussion\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and " +"!*/Discussion\"]]\n" +msgstr "" +"\t\\[[!calendar type=\"year\" year=\"2005\" pages=\"blog/* and " +"!*/Discussion\"]]\n" + +#. type: Title ## +#, no-wrap +msgid "setup" +msgstr "Einrichtung" + +#. type: Plain text +msgid "" +"The calendar is essentially a fancy front end to archives of previous pages, " +"usually used for blogs. It can produce a calendar for a given month, or a " +"list of months for a given year. The month format calendar simply links to " +"any page posted on each day of the month. The year format calendar links to " +"archive pages, with names like `archives/2007` (for all of 2007) and " +"`archives/2007/01` (for January, 2007)." +msgstr "" +"Der Kalender ist im Wesentlichen eine schicke Schnittstelle zu einem Archiv mit " +"früheren Seiten und wird normalerweise für Blogs verwendet. Er kann einen " +"Kalender für einen angegebenen Monat erzeugen, oder eine Liste der Monate eines " +"angegebenen Jahres. Der Kalender im Jahresformat enthält einfach Links zu den " +"Archivseiten mit Namen wie `archiv/2007` (für ganz 2007) und `archiv/2007/01` " +"(für Januar 2007)." + +#. type: Plain text +msgid "" +"While you can insert calendar directives anywhere on your wiki, including in " +"the sidebar, you'll also need to create these archive pages. They typically " +"use this directive to display a calendar, and also use [[inline]] to display " +"or list pages created in the given time frame." +msgstr "" +"Während `calendar`-Anweisungen überall im Wiki verwendet werden können, auch in " +"der Sidebar, muss man auch die Archiv-Seiten anlegen. Dort wird typischerweise " +"diese Anweisung verwendet, um einen Kalender anzuzeigen, und außerdem die Seiten " +"aus dem entsprechenden Zeitraum über [[inline]] eingebunden." + +#. type: Plain text +msgid "" +"The `ikiwiki-calendar` command can be used to automatically generate the " +"archive pages. It also refreshes the wiki, updating the calendars to " +"highlight the current day. This command is typically run at midnight from " +"cron. An example crontab:" +msgstr "" +"Der `ikiwiki-calendar`-Befehl kann verwendet werden, um die Archivseiten " +"automatisch zu erzeugen. Es aktualisiert auch das Wiki und hebt in den Kalendern " +"den aktuellen Tag hervor. Dieser Befehl wird typischerweise um Mitternacht von " +"cron ausgeführt, beispielsweise durch folgenden crontab-Eintrag:" + +#. type: Plain text +msgid "An example crontab:" +msgstr "Ein Beispiel-Eintrag in crontab:" + +#. type: Plain text +#, no-wrap +msgid "\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n" +msgstr "" +"\t0 0 * * * ikiwiki-calendar ~/ikiwiki.setup \"posts/* and !*/Discussion\"\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Bullet: '* ' +msgid "" +"`type` - Used to specify the type of calendar wanted. Can be one of " +"\"month\" or \"year\". The default is a month view calendar." +msgstr "" +"`type` - Hiermit wird die Art des zu erzeugenden Kalenders angegeben. Kann " +"entweder \"month\" oder \"year\" sein. Vorgeingestellt ist die Monatsansicht." + +#. type: Bullet: '* ' +msgid "" +"`pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the " +"month calendar. Defaults to \"*\"." +msgstr "" +"`pages` - Gibt die [[ikiwiki/PageSpec]] der Seiten an, auf die aus dem " +"Monatskalender verwiesen werden soll. Voreingestellt ist \"*\"." + +#. type: Bullet: '* ' +msgid "" +"`archivebase` - Configures the base of the archives hierarchy. The default " +"is \"archives\". Note that this default can also be overridden for the whole " +"wiki by setting `archivebase` in ikiwiki's setup file." +msgstr "" +"`archivebase` - Konfiguriert die Basis der Archiv-Hierarchie. Voreingestellt ist " +"\"archives\". Dies kann auch für das gesamte Wiki geändert werden, indem " +"`archivebase` in der Setup-Datei von ikiwiki gesetzt wird." + +#. type: Bullet: '* ' +msgid "" +"`year` - The year for which the calendar is requested. Defaults to the " +"current year." +msgstr "" +"`year` - Das Jahr, für das der Kalender angezeigt werden soll. Voreingestellt ist " +"das aktuelle Jahr." + +#. type: Bullet: '* ' +msgid "" +"`month` - The numeric month for which the calendar is requested, in the " +"range 1..12. Used only for the month view calendar, and defaults to the " +"current month." +msgstr "" +"`month` - Der Monat, für den der Kalender angezeigt werden soll, als Zahl von 1 " +"bis 12. Wird nur für Monatskalender verwendet. Voreingestellt ist der aktuelle " +"Monat." + +#. type: Bullet: '* ' +msgid "" +"`week_start_day` - A number, in the range 0..6, which represents the day of " +"the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and " +"so on. Defaults to 0, which is Sunday." +msgstr "" +"`week_start_day` - Eine Zahl aus dem Bereich 0 bis 6, die den Wochentag angibt, " +"mit dem ein Monatskalender anfängt. 0 ist Sonntag, 1 ist Montag, und so weiter. " +"Voreingestellt ist 0, also Sonntag." + +#. type: Bullet: '* ' +msgid "" +"`months_per_row` - In the annual calendar, number of months to place in each " +"row. Defaults to 3." +msgstr "" +"`months_per_row` - Anzahl der Monate, die in einem Jahreskalender in einer Zeile " +"platziert werden. Voreingestellt ist 3." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/color.de.po b/po/underlays/directives/ikiwiki/directive/color.de.po new file mode 100644 index 000000000..1cc36f8ee --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/color.de.po @@ -0,0 +1,97 @@ +# German translation of directives/ikiwiki/directive/color page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:58+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `color` directive is supplied by the [[!iki plugins/color desc=color]] " +"plugin." +msgstr "" +"Die `color`-Anweisung wird durch die [[!iki plugins/color " +"desc=color]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive can be used to color a piece of text on a page. It can be " +"used to set the foreground and/or background color of the text." +msgstr "" +"Diese Anweisung kann verwendet werden, um ein Stück Text auf einer Seite zu " +"färben. Sie kann die Schrift- und/oder Hintergrundfarbe verändern." + +#. type: Plain text +msgid "" +"You can use a color name (e.g. `white`) or HTML code (e.g. `#ffffff`) to " +"define colors." +msgstr "" +"Man kann einen Farbnamen (z.B. `white`) oder HTML-Code (z.B. `#ffffff`) " +"verwenden, um eine Farbe zu definieren." + +#. type: Title ## +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +msgid "" +"Here the foreground color is defined as a word, while the background color " +"is defined as a HTML color code:" +msgstr "" +"Hier wird die Schriftfarbe durch ein Wort und die Hintergrundfarbe durch eine " +"HTML-Farbe definiert:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!color foreground=white background=#ff0000 text=\"White text on red " +"background\"]]\n" +msgstr "" +"\t\\[[!color foreground=white background=#ff0000 text=\"Weißer Text auf rotem " +"Hintergrund\"]]\n" + +#. type: Plain text +msgid "" +"The background color is missing, so the text is displayed on default " +"background:" +msgstr "" +"Die Hintergrundfarbe fehlt, also wird der Text auf dem Standardhintergrund " +"dargestellt:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!color foreground=white text=\"White text on default color " +"background\"]]\n" +msgstr "" +"\t\\[[!color foreground=white text=\"Weißer Text auf Hintergrund in " +"Standardfarbe\"]]\n" + +#. type: Plain text +msgid "The foreground is missing, so the text has the default foreground color:" +msgstr "Die Schriftfarbe fehlt, also wird hierfür die Standardfarbe verwendet:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!color background=#ff0000 text=\"Default color text on red " +"background\"]]\n" +msgstr "" +"\t\\[[!color background=#ff0000 text=\"Schrift in Standardfarbe auf rotem " +"Hintergrund\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/comment.de.po b/po/underlays/directives/ikiwiki/directive/comment.de.po new file mode 100644 index 000000000..70d0d7d50 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/comment.de.po @@ -0,0 +1,133 @@ +# German translation of directives/ikiwiki/directive/comment page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:58+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `comment` directive is supplied by the [[!iki plugins/comments " +"desc=comments]] plugin, and is used to add a comment to a page. Typically, " +"the directive is the only thing on a comment page, and is filled out by the " +"comment plugin when a user posts a comment." +msgstr "" +"Die `comment`-Anweisung wird durch die [[!iki plugins/comments " +"desc=comments]]-Erweiterung bereitgestellt, und wird zum Hinzufügen von " +"Kommentaren zu einer Seite verwendet. Typischerweise ist diese Anweisung " +"das Einzige auf einer Kommentarseite, und wird von der comment-Erweiterung " +"ausgefüllt, wenn ein Benutzer einen Kommentar veröffentlicht." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!comment format=mdwn\n" +"\tusername=\"foo\"\n" +"\tsubject=\"Bar\"\n" +"\tdate=\"2009-06-02T19:05:01Z\"\n" +"\tcontent=\"\"\"\n" +msgstr "" +"\t\\[[!comment format=mdwn\n" +"\tusername=\"foo\"\n" +"\tsubject=\"Bar\"\n" +"\tdate=\"2009-06-02T19:05:01Z\"\n" +"\tcontent=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tBlah blah.\n" +"\t\"\"\"\n" +msgstr "" +"\tBla bla.\n" +"\t\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\t]]\n" +msgstr "\t]]\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"The only required parameter is `content`, the others just add or override " +"metadata of the comment." +msgstr "" +"Der einzige erforderliche Parameter ist `content`, die übrigen fügen nur " +"Metadaten zu dem Kommentar hinzu oder ändern diese." + +#. type: Bullet: '* ' +msgid "" +"`content` - Text to display for the comment. Note that " +"[[directives|ikiwiki/directive]] may not be allowed, depending on the " +"configuration of the comment plugin." +msgstr "" +"`content` - Text, der in diesem Kommentar angezeigt werden soll. " +"[[Anweisungen|ikiwiki/directive]] sind hier unter Umständen nicht erlaubt, " +"abhängig von der Konfiguration der comment-Erweiterung." + +#. type: Bullet: '* ' +msgid "`format` - Specifies the markup used for the content." +msgstr "" +"`format` - Gibt die Formatierungssprache an, die für den Inhalt verwendet " +"wird." + +#. type: Bullet: '* ' +msgid "`subject` - Subject for the comment." +msgstr "`subject` - Betreff des Kommentars." + +#. type: Bullet: '* ' +msgid "" +"`date` - Date the comment was posted. Can be entered in nearly any format, " +"since it's parsed by [[!cpan TimeDate]]" +msgstr "" +"`date` - Datum, an dem der Kommentar veröffentlicht wurde. Kann in beinahe " +"beliebigem Format angegeben werden, da es von [[!cpan TimeDate]] " +"ausgewertet wird." + +#. type: Bullet: '* ' +msgid "" +"`username` - Used to record the username (or OpenID) of a logged in " +"commenter." +msgstr "" +"`username` - Hier wird der Benutzername (oder die OpenID) eines " +"angemeldeten Kommentators gespeichert." + +#. type: Bullet: '* ' +msgid "" +"`ip` - Can be used to record the IP address of a commenter, if they posted " +"anonymously." +msgstr "" +"`ip` - Hier kann die IP-Adresse eines Kommentators gespeichert werden, wenn " +"der Kommentar anonym abgegeben wurde." + +#. type: Bullet: '* ' +msgid "" +"`claimedauthor` - Records the name that the user entered, if anonymous " +"commenters are allowed to enter their (unverified) name." +msgstr "" +"`claimedauthor` - Speichert den Namen, den der Benutzer angegeben hat, wenn " +"anonyme Kommentatoren ihren (nicht verifizierten) Namen angeben dürfen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/copy.de.po b/po/underlays/directives/ikiwiki/directive/copy.de.po new file mode 100644 index 000000000..33f902da8 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/copy.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/copy page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 22:05+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/cut.de.po b/po/underlays/directives/ikiwiki/directive/cut.de.po new file mode 100644 index 000000000..33f902da8 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/cut.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/copy page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 22:05+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/cutpaste.de.po b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po new file mode 100644 index 000000000..ff3503ed5 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/cutpaste.de.po @@ -0,0 +1,153 @@ +# German translation of directives/ikiwiki/directive/cutpaste page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:59+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `copy`, `cut` and `paste` directives are supplied by the [[!iki " +"plugins/cutpaste desc=cutpaste]] plugin." +msgstr "" +"Die `copy`- `cut`- und `paste`-Anweisungen werden durch die [[!iki " +"plugins/cutpaste desc=cutpaste]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "With these directives you can store and recall pieces of text in a page:" +msgstr "" +"Mit diesen Anweisungen kann man Textabschnitte innerhalb einer Seite " +"speichern und wieder abrufen:" + +#. type: Bullet: ' * ' +msgid "" +"`\\[[!cut id=name text=\"text\"]]` memorizes the text allowing to recall it " +"using the given ID. The text being cut is not included in the output." +msgstr "" +"`\\[[!cut id=name text=\"text\"]]` merkt sich den Text und erlaubt es, ihn " +"über die angegebene id wieder abzurufen. Der Text taucht an dieser Stelle " +"nicht in der Ausgabe auf." + +#. type: Bullet: ' * ' +msgid "" +"`\\[[!copy id=name text=\"text\"]]` memorizes the text allowing to recall it " +"using the given ID. The text being cut *is* included in the output." +msgstr "" +"`\\[[!copy id=name text=\"text\"]]` merkt sich den Text und erlaubt es, ihn " +"über die angegebene id wieder abzurufen. Der Text *wird* an dieser Stelle " +"ausgegeben." + +#. type: Bullet: ' * ' +msgid "`\\[[!paste id=name]]` is replaced by the previously memorized text." +msgstr "`\\[[!paste id=name]]` wird durch den zuvor gemerkten Text ersetzt." + +#. type: Plain text +msgid "" +"The text being cut, copied and pasted can freely include wiki markup, " +"including more calls to cut, copy and paste." +msgstr "" +"Der ausgeschnittene, kopierte und eingefügte Text kann beliebige " +"Wiki-Formatierungsanweisungen enthalten, inklusive weiterer Aufrufe von " +"`cut`, `copy` und `paste`." + +#. type: Plain text +msgid "" +"You do not need to memorize the text before using it: a cut directive can " +"follow the paste directive that uses its text. In fact, this is quite " +"useful to postpone big blocks of text like long annotations and have a more " +"natural flow. For example:" +msgstr "" +"Man muss sich einen Text nicht vor seiner Verwendung merken: Eine " +"`cut`-Anweisung kann auch erst nach der `paste`-Anweisung kommen, die ihren " +"Text verwendet. Dies ist ein durchaus nützlich, um größere Blöcke von Text " +"wie lange Anmerkungen erst später anzugeben und so für einen natürlicheren " +"Textfluss zu sorgen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=cutlongdesc]]\"]]\n" +"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=copylongdesc]]\"]]\n" +"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=pastelongdesc]]\"]]\n" +msgstr "" +"\t\\[[!toggleable id=\"cut\" text=\"[[!paste id=beschreibungcut]]\"]]\n" +"\t\\[[!toggleable id=\"copy\" text=\"[[!paste id=beschreibungcopy]]\"]]\n" +"\t\\[[!toggleable id=\"paste\" text=\"[[!paste id=beschreibungpaste]]\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t[...some time later...]\n" +msgstr "\t[… und später …]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=cutlongdesc text=\"\"\"\n" +msgstr "\t\\[[!cut id=beschreibungcut text=\"\"\"\n" + +#. type: Plain text +#: +#, no-wrap +msgid "\t blah blah blah\n" +msgstr "\t bla bla bla\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=copylongdesc text=\"\"\"\n" +msgstr "\t\\[[!cut id=beschreibungcopy text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=pastelongdesc text=\"\"\"\n" +msgstr "\t\\[[!cut id=beschreibungpaste text=\"\"\"\n" + +#. type: Plain text +msgid "" +"This can potentially be used to create loops, but ikiwiki is clever and " +"breaks them." +msgstr "" +"Auf diese Weise können möglicherweise Schleifen erzeugt werden, aber ikiwiki " +"ist schlau und bricht diese auf." + +#. type: Plain text +msgid "" +"Since you can paste without using double quotes, copy and paste can be used " +"to nest directives that require multiline parameters inside each other:" +msgstr "" +"Da man `paste` ohne Anführungszeichen verwenden kann, können mit `copy` und " +"`paste` Anweisungen ineinander geschachtelt werden, die mehrzeilige Parameter " +"benötigen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toggleable id=foo text=\"\"\"\n" +msgstr "\t\\[[!toggleable id=foo text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\t [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n" +msgstr "\t [[!toggleable id=bar text=\"[[!paste id=baz]]\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!cut id=baz text=\"\"\"\n" +msgstr "\t\\[[!cut id=baz text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\tmultiline parameter!\n" +msgstr "\tmehrzeiliger Parameter!\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/date.de.po b/po/underlays/directives/ikiwiki/directive/date.de.po new file mode 100644 index 000000000..7baa1b3a4 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/date.de.po @@ -0,0 +1,64 @@ +# German translation of directives/ikiwiki/directive/date page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:59+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `date` directive is supplied by the [[!iki plugins/date desc=date]] " +"plugin." +msgstr "" +"Die `date`-Anweisung wird durch die [[!iki plugins/date desc=date]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive can be used to display a date on a page, using the same " +"display method that is used to display the modification date in the page " +"footer, and other dates in the wiki. This can be useful for consistency of " +"display, or if you want to embed parseable dates into the page source." +msgstr "" +"Diese Anweisung kann verwendet werden, um ein Datum auf einer Seite anzuzeigen, " +"und verwendet dieselbe Methode, die auch zur Anzeige des Datums der letzten " +"Änderung im Seitenfuß und anderer Daten im Wiki verwendet wird. Dies ist " +"nützlich für die Konsistenz der Ausgabe, oder wenn der Seitenquelltext ein " +"maschinenlesbares Datum enthalten soll." + +#. type: Plain text +msgid "" +"Like the dates used by the [[meta]] directive, the date can be entered in " +"nearly any format, since it's parsed by [[!cpan TimeDate]]." +msgstr "" +"Wie auch in der [[meta]]-Anweisung kann das Datum in nahezu beliebigem Format " +"angegeben werden, da es durch [[!cpan TimeDate]] interpretiert wird." + +#. type: Plain text +msgid "" +"For example, an update to a page with an embedded date stamp could look " +"like:" +msgstr "" +"Zum Beispiel könnte eine Seite mit eingebettetem Zeitstempel folgendermaßen " +"aussehen:" + +#. type: Plain text +#, no-wrap +msgid "\tUpdated \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: mumble mumble\n" +msgstr "" +"\tAktualisiert \\[[!date \"Wed, 25 Nov 2009 01:11:55 -0500\"]]: murmel murmel\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/edittemplate.de.po b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po new file mode 100644 index 000000000..f47140c09 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/edittemplate.de.po @@ -0,0 +1,99 @@ +# German translation of directives/ikiwiki/directive/edittemplate page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 13:59+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate " +"desc=edittemplate]] plugin." +msgstr "" +"Die `edittemplate`-Anweisung wird durch die [[!iki plugins/edittemplate " +"desc=edittemplate]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows registering template pages, that provide default " +"content for new pages created using the web frontend. To register a " +"template, insert a [[ikiwiki/directive/template]] directive on some other " +"page." +msgstr "" +"Diese Anweisung erlaubt es, Vorlagen-Seiten zu registrieren, die einen " +"Standardinhalt für neue Seiten bereitstellen, die über das Webfrontend " +"angelegt werden. Um eine Vorlage zu registrieren, fügt man eine " +"[[ikiwiki/directive/template]]-Anweisung auf einer anderen Seite ein." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n" +msgstr "\t\\[[!edittemplate template=\"bugtemplate\" match=\"bugs/*\"]]\n" + +#. type: Plain text +msgid "" +"In the above example, the page named \"bugtemplate\" is registered as a " +"template to be used when any page named \"bugs/*\" is created. To avoid the " +"directive displaying a note about the template being registered, add " +"\"silent=yes\"." +msgstr "" +"Im obigen Beispiel wird die Seite mit Namen \"bugtemplate\" für alle Seiten " +"als Vorlage registriert, die mit Namen \"bugs/*\" angelegt werden. Um den " +"Hinweis über die Registrierung der Vorlage zu unterdrücken, kann man " +"`silent=yes` hinzufügen." + +#. type: Plain text +msgid "" +"Often the template page contains a simple skeleton for a particular type of " +"page. For the bug report pages in the above example, it might look something " +"like:" +msgstr "" +"Oft enthält eine Vorlagen-Seite ein einfaches Skelett für einen bestimmten " +"Seitentyp. Für die Fehlerberichte aus dem obigen Beispiel könnte sie " +"folgendermaßen aussehen:" + +#. type: Plain text +#, no-wrap +msgid "" +"\tPackage: \n" +"\tVersion: \n" +"\tReproducible: y/n\n" +"\tDetails:\n" +msgstr "" +"\tPaket: \n" +"\tVersion: \n" +"\tReproduzierbar: ja/nein\n" +"\tDetails:\n" + +#. type: Plain text +#, no-wrap +msgid "" +"The template page can also contain [[!cpan HTML::Template]] directives,\n" +"similar to other ikiwiki [[templates]]. Currently only one variable is\n" +"set: `` is replaced with the name of the page being\n" +"created.\n" +msgstr "" + +#. type: Plain text +msgid "" +"It's generally not a good idea to put the `edittemplate` directive in the " +"template page itself, since the directive would then be included as part of " +"the template on new pages, which would then in turn be registered as " +"templates. If multiple pages are registered as templates for a new page, an " +"arbitrary one is chosen, so that could get confusing." +msgstr "" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "" + + diff --git a/po/underlays/directives/ikiwiki/directive/format.de.po b/po/underlays/directives/ikiwiki/directive/format.de.po new file mode 100644 index 000000000..2db9e5af6 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/format.de.po @@ -0,0 +1,93 @@ +# German translation of directives/ikiwiki/directive/format page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:00+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `format` directive is supplied by the [[!iki plugins/format " +"desc=format]] plugin." +msgstr "" +"Die `format`-Anweisung wird durch die [[!iki plugins/format " +"desc=format]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"The directive allows formatting a chunk of text using any available page " +"format. It takes two parameters. First is the type of format to use, ie the " +"extension that would be used for a standalone file of this type. Second is " +"the text to format." +msgstr "" +"Die Anweisung erlaubt es, einen Textabschnitt mit einem beliebigen " +"Seitenformat zu formatieren. Sie hat zwei Parameter. Der erste ist das zu " +"verwendende Seitenformat – also die Erweiterung, die für eine " +"eigenständige Seite dieses Typs verwendet würde. Der zweite ist der zu " +"formatierende Text." + +#. type: Plain text +msgid "" +"For example, this will embed an otl outline inside a page using mdwn or some " +"other format:" +msgstr "" +"Zum Beispiel bettet dies eine otl-Gliederung in eine Seite ein, die mdwn " +"oder ein anderes Format verwendet:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!format otl \"\"\"\n" +msgstr "\t\\[[!format otl \"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tfoo\n" +"\t\t1\n" +"\t\t2\n" +"\tbar\n" +"\t\t3\n" +"\t\t4\n" +msgstr "" +"\tfoo\n" +"\t\t1\n" +"\t\t2\n" +"\tbar\n" +"\t\t3\n" +"\t\t4\n" + +#. type: Plain text +msgid "" +"Note that if the highlight plugin is enabled, this directive can also be " +"used to display syntax highlighted code. Many languages and formats are " +"supported. For example:" +msgstr "" +"Wenn die highlight-Erweiterung installiert ist, kann diese Anweisung auch " +"zur " +"Anzeige von Programmcode mit Syntaxhervorhebung verwendet werden. Viele " +"Sprachen und Formate werden unterstützt. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!format perl \"\"\"\n" +msgstr "\t\\[[!format perl \"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "\tprint \"hello, world\\n\";\n" +msgstr "\tprint \"hello, world\\n\";\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/fortune.de.po b/po/underlays/directives/ikiwiki/directive/fortune.de.po new file mode 100644 index 000000000..89cdf84aa --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/fortune.de.po @@ -0,0 +1,42 @@ +# German translation of directives/ikiwiki/directive/fortune page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:00+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `fortune` directive is supplied by the [[!iki plugins/fortune " +"desc=fortune]] plugin." +msgstr "" +"Die `fortune`-Anweisung wird durch die [[!iki plugins/fortune " +"desc=fortune]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This just uses the `fortune` program to insert a fortune cookie into the " +"page. Usage:" +msgstr "" +"Sie verwendet einfach das Programm `fortune`, um einen Spruch (engl. " +"*fortune cookie*) in die Seite einzubinden. Verwendung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!fortune ]]\n" +msgstr "\t\\[[!fortune ]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/graph.de.po b/po/underlays/directives/ikiwiki/directive/graph.de.po new file mode 100644 index 000000000..4f9d6a346 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/graph.de.po @@ -0,0 +1,88 @@ +# German translation of directives/ikiwiki/directive/graph page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:01+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `graph` directive is supplied by the [[!iki plugins/graphviz " +"desc=graphviz]] plugin." +msgstr "" +"Die `graph`-Anweisung wird durch die [[!iki plugins/graphviz " +"desc=graphviz]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows embedding [graphviz](http://www.graphviz.org/) graphs " +"in a page. Example usage:" +msgstr "" +"Diese Anweisung erlaubt es, von [graphviz](http://www.graphviz.org/) " +"erzeugte Graphen in eine Seite einzubinden. Verwendungsbeispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n" +msgstr "\t\\[[!graph src=\"a -> b -> c; a -> c;\"]]\n" + +#. type: Plain text +msgid "" +"Note that graphs will only show up in previews if your browser has " +"[[!wikipedia data: URI]] support, or if the same graph already exists on " +"that page." +msgstr "" +"Zu beachten ist, dass der Graph nur dann in der Vorschau auftaucht, wenn der " +"verwendete Browser [[!wikipedia data: URI]] unterstützt, oder wenn derselbe " +"Graph bereits auf der Seite existiert." + +#. type: Plain text +msgid "The `graph` directive supports the following parameters:" +msgstr "Die `graph`-Anweisung unterstützt die folgenden Parameter:" + +#. type: Bullet: '- ' +msgid "`src` - The graphviz source to render." +msgstr "`src` - Der graphviz-Quelltext des zu erzeugenden Graphen." + +#. type: Bullet: '- ' +msgid "" +"`type` - The type of graph to render: `graph` or `digraph`. Defaults to " +"`digraph`." +msgstr "" +"`type` - Die Art des zu erzeugenden Graphen: `graph` oder `digraph`. " +"Voreingestellt ist `digraph`." + +#. type: Bullet: '- ' +msgid "" +"`prog` - The graphviz program to render with: `dot`, `neato`, `fdp`, " +"`twopi`, or `circo`. Defaults to `dot`." +msgstr "" +"`prog` - Das graphviz-Programm, mit dem der Graph erzeugt werden soll: " +"`dot`, `neato`, `fdp`, " +"`twopi` oder `circo`. Voreingestellt ist `dot`." + +#. type: Bullet: '- ' +msgid "" +"`height`, `width` - Limit the size of the graph to a given height and width, " +"in inches. You must specify both to limit the size; otherwise, graphviz will " +"choose a size, without any limit." +msgstr "" +"`height`, `width` - Begrenzt die Größe des erzeugten Graphen durch die in " +"Inch angegebene Höhe und Breite. Es müssen beide angegeben werden, um die " +"Größe zu beschränken, graphviz sucht sich sonst selbst eine Größe aus, ohne " +"jede Beschränkung." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/haiku.de.po b/po/underlays/directives/ikiwiki/directive/haiku.de.po new file mode 100644 index 000000000..7923a1395 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/haiku.de.po @@ -0,0 +1,60 @@ +# German translation of directives/ikiwiki/directive/haiku page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:01+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `haiku` directive is supplied by the [[!iki plugins/haiku desc=haiku]] " +"plugin." +msgstr "" +"Die `haiku`-Anweisung wird durch die [[!iki plugins/haiku " +"desc=haiku]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows inserting a randomly generated haiku into a wiki " +"page. Just type:" +msgstr "" +"Diese Anweisung erlaubt es, ein zufällig erzeugtes Haiku in eine Wiki-Seite " +"einzufügen. Dafür genügt:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!haiku hint=\"argument\"]]\n" +msgstr "\t\\[[!haiku hint=\"argument\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!haiku hint=\"argument test\"]]\n" +msgstr "[[!haiku hint=\"argument test\"]]\n" + +#. type: Plain text +msgid "" +"The hint parameter can be omitted, it only provides the generator a hint of " +"what to write the haiku about. If no hint is given, it might base it on the " +"page name. Since the vocabulary it knows is very small, many hints won't " +"affect the result at all." +msgstr "" +"Der `hint`-Parameter kann weggelassen werden, er gibt dem Generator nur " +"einen Hinweis, worüber er das Haiku schreiben soll. Wenn kein solcher " +"Hinweis gegeben wird, könnte er den Seitennamen verwenden. Da das ihm " +"bekannte Vokabular sehr klein ist, werden viele Hinweise das Ergebnis in " +"keiner Weise beeinflussen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/if.de.po b/po/underlays/directives/ikiwiki/directive/if.de.po new file mode 100644 index 000000000..e28e45936 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/if.de.po @@ -0,0 +1,145 @@ +# German translation of directives/ikiwiki/directive/if page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:02+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `if` directive is supplied by the [[!iki plugins/conditional " +"desc=conditional]] plugin." +msgstr "" +"Die `if`-Anweisung wird durch die [[!iki plugins/conditional " +"desc=conditional]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"With this directive, you can make text be conditionally displayed on a " +"page. For example:" +msgstr "" +"Mit dieser Anweisung kann die Anzeige von Text an bestimmte Bedingungen " +"geknüpft werden. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!if test=\"enabled(smiley)\"\n" +"\t then=\"The smiley plugin is enabled :-)\"\n" +"\t else=\"No smiley plugin here..\"]]\n" +msgstr "" +"\t\\[[!if test=\"enabled(smiley)\"\n" +"\t then=\"Die smiley-Erweiterung ist aktiviert :-)\"\n" +"\t else=\"Hier gibt es keine smiley-Erweiterung …\"]]\n" + +#. type: Plain text +msgid "" +"If the specified `test` succeeds, the `then` text will be displayed, " +"otherwise the `else` text will be displayed. The `else` part is optional." +msgstr "" +"Wenn der angegebene `test` erfolgreich ist, wird der `then`-Text angezeigt, " +"sonst der `else`-Text. Der `else`-Teil ist optional." + +#. type: Plain text +msgid "" +"The `then` and `else` values can include any markup that would be allowed in " +"the wiki page outside the template. Triple-quoting the values even allows " +"quotes to be included." +msgstr "" +"Die Werte für `then` und `else` können beliebige Formatierungsanweisungen " +"enthalten, die außerhalb der Anweisung erlaubt wären. Werten die Werte durch " +"dreifache Anführungszeichen abgetrennt, können sie sogar Anführungszeichen " +"enthalten." + +#. type: Plain text +msgid "" +"The `test` is a [[ikiwiki/PageSpec]]; if it matches any page in the wiki " +"then it succeeds. So you can do things like testing for the existence of a " +"page or pages, testing to see if any pages were created in a given month, " +"and so on." +msgstr "" +"Der `test` ist eine [[ikiwiki/PageSpec]]; wenn sie auf irgendeine Seite im " +"Wiki passt, hat der Test Erfolg. Dadurch kann man die Existenz einer oder " +"mehrerer Seiten überprüfen, überprüfen ob in einem bestimmten Monat Seiten " +"angelegt wurden, und so weiter." + +#. type: Plain text +msgid "" +"If you want the [[ikiwiki/PageSpec]] to only match against the page that " +"contains the conditional, rather than matching against all pages in the " +"wiki, set the \"all\" parameter to \"no\"." +msgstr "" +"Wenn die [[ikiwiki/PageSpec]] nur auf die aktuelle Seite angewendet werden " +"soll, die die Bedingung enthält (und nicht auf alle Seiten im Wiki), kann " +"der optionale `all`-Parameter auf `no` gesetzt werden." + +#. type: Plain text +msgid "" +"In an `if` directive, the regular [[ikiwiki/PageSpec]] syntax is expanded " +"with the following additional tests:" +msgstr "" +"In einer `if`-Anweisung sind neben der regulären [[ikiwiki/PageSpec]]-Syntax " +"die folgenden zusätzlichen Test verfügbar:" + +#. type: Bullet: '* ' +msgid "enabled(plugin)" +msgstr "enabled(plugin)" + +#. type: Plain text +#, no-wrap +msgid " Tests whether the specified plugin is enabled.\n" +msgstr " Prüft, ob die angegebene Erweiterung aktiviert ist.\n" + +#. type: Bullet: '* ' +msgid "sourcepage(glob)" +msgstr "sourcepage(glob)" + +#. type: Plain text +#, no-wrap +msgid "" +" Tests whether the glob matches the name of the page that contains the\n" +" conditional.\n" +msgstr "" +" Prüft, ob das angegebene Muster auf den Namen der Seite passt, die die\n" +" Bedingung enthält.\n" + +#. type: Bullet: '* ' +msgid "destpage(glob)" +msgstr "destpage(glob)" + +#. type: Plain text +#, no-wrap +msgid "" +" Tests whether the glob matches the name of the page that is being built.\n" +" That might be different than the name of the page that contains the\n" +" conditional, if it's being inlined into another page.\n" +msgstr "" +" Prüft, ob das Muster auf den namen der Seite passt, die gerade erzeugt\n" +" wird. Dies kann ein anderer Name sein als der der Seite, die die " +"Bedingung\n" +" enthält, wenn diese über [[inline]] in eine andere Seite eingebunden wird." +"\n" + +#. type: Bullet: '* ' +msgid "included()" +msgstr "included()" + +#. type: Plain text +#, no-wrap +msgid " Tests whether the page is being included onto another page.\n" +msgstr " Prüft, ob die Seite gerade in eine andere eingebunden wird.\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/img.de.po b/po/underlays/directives/ikiwiki/directive/img.de.po new file mode 100644 index 000000000..f28a1597b --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/img.de.po @@ -0,0 +1,115 @@ +# German translation of directives/ikiwiki/directive/img page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:02+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "The `img` directive is supplied by the [[!iki plugins/img desc=img]] plugin." +msgstr "" +"Die `img`-Anweisung wird durch die [[!iki plugins/img desc=img]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This is an image handling directive. While ikiwiki supports inlining " +"full-size images by making a [[ikiwiki/WikiLink]] that points to the image, " +"using this directive you can easily scale down an image for inclusion onto a " +"page, providing a link to a full-size version." +msgstr "" +"Diese Anweisung verarbeitet Bilder. Während ikiwiki das Einbinden von Bildern in " +"voller Größe durch einen [[ikiwiki/WikiLink]] auf das Bild unterstützt, kann man " +"mit dieser Anweisung ein Bild einfach herunterskalieren, um es in eine Seite " +"einzubinden, und einen Link auf das Bild in Originalgröße setzen." + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!img image1.jpg size=\"200x200\" alt=\"clouds\"]]\n" +msgstr "\t\\[[!img image1.jpeg size=\"200x200\" alt=\"Wolken\"]]\n" + +#. type: Plain text +msgid "" +"The image file will be searched for using the same rules as used to find the " +"file pointed to by a [[ikiwiki/WikiLink]]." +msgstr "" +"Diese Bilddatei wird nach den gleichen Regeln gesucht wie das Ziel eines " +"[[ikiwiki/WikiLink]]." + +#. type: Plain text +msgid "" +"The `size` parameter is optional, defaulting to full size. Note that the " +"original image's aspect ratio is always preserved, even if this means making " +"the image smaller than the specified size. You can also specify only the " +"width or the height, and the other value will be calculated based on it: " +"\"200x\", \"x200\"" +msgstr "" +"Der Parameter `size` ist optional, voreingestellt ist die volle Größe. Das " +"Seitenverhältnis des Originalbildes wird immer bewahrt, auch wenn das Bild " +"dadurch kleiner wird als angegeben. Man kann auch nur die Breite oder nur die " +"Höhe angeben, dann wird der jeweils andere Wert automatisch berechnet: `200x`, " +"`x200`." + +#. type: Plain text +msgid "" +"You can also pass `alt`, `title`, `class`, `align` and `id` parameters. " +"These are passed through unchanged to the html img tag. If you include a " +"`caption` parameter, the caption will be displayed centered beneath the " +"image." +msgstr "" +"Man kann auch die Parameter `alt`, `title`, `class`, `align` und `id` übergeben. " +"Diese werden an den img-Tag im erzeugten HTML-Code weitergereicht. Wird der " +"Parameter `caption` angegeben, wird sein Wert unter dem Bild zentriert angezeigt." + +#. type: Plain text +msgid "" +"The `link` parameter is used to control whether the scaled image links to " +"the full size version. By default it does; set \"link=somepage\" to link to " +"another page instead, or \"link=no\" to disable the link, or " +"\"link=http://url\" to link to a given url." +msgstr "" +"Der Parameter `link` steuert, ob herunterskalierte Bilder mit dem Originalbild " +"verlinkt werden. In der Voreinstellung ist dies der Fall; mit `link=AndereSeite` " +"zeigt der Link auf eine andere Seite, mit `link=no` wird der Link deaktiviert, " +"mit `link=http://url` zeigt er auf die angegebene URL." + +#. type: Plain text +msgid "" +"You can also set default values that will be applied to all later images on " +"the page, unless overridden. Useful when including many images on a page." +msgstr "" +"Man kann auch die Voreinstellung für die weiter unten auf der Seite eingebundenen " +"Bilder verändern. Dies ist nützlich, wenn es auf einer Seite viele Bilder gibt." + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!img defaults size=200x200 alt=\"wedding photo\"]]\n" +"\t\\[[!img photo1.jpg]]\n" +"\t\\[[!img photo2.jpg]]\n" +"\t\\[[!img photo3.jpg size=200x600]]\n" +msgstr "" +"\t\\[[!img defaults size=200x200 alt=\"Hochzeitsfoto\"]]\n" +"\t\\[[!img photo1.jpg]]\n" +"\t\\[[!img photo2.jpg]]\n" +"\t\\[[!img photo3.jpg size=200x600]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/inline.de.po b/po/underlays/directives/ikiwiki/directive/inline.de.po new file mode 100644 index 000000000..17e5c19d2 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/inline.de.po @@ -0,0 +1,385 @@ +# German translation of directives/ikiwiki/directive/inline page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:02+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `inline` directive is supplied by the [[!iki plugins/inline " +"desc=inline]] plugin." +msgstr "" +"Die `inline`-Anweisung wird durch die [[!iki plugins/inline " +"desc=inline]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This is a directive that allows including one wiki page inside another. The " +"most common use of inlining is generating blogs and RSS or Atom feeds." +msgstr "" +"Diese Anweisung erlaubt das Einbinden einer Wiki-Seite in eine andere. Die " +"häufigste Verwendung ist das Erzeugen von Blogs und RSS- oder Atom-Feeds." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" " +"rootpage=\"blog\"]]\n" +msgstr "" +"\t\\[[!inline pages=\"blog/* and !*/Discussion\" show=\"10\" " +"rootpage=\"blog\"]]\n" + +#. type: Plain text +msgid "" +"Any pages that match the specified [[PageSpec]] (in the example, any " +"[[SubPage]] of \"blog\") will be part of the blog, and the newest 10 of them " +"will appear in the page. Note that if files that are not pages match the " +"[[PageSpec]], they will be included in the feed using RSS enclosures, which " +"is useful for podcasting." +msgstr "" +"Es wird jede Seite Teil des Blogs, die auf die angegebene [[PageSpec]] passt " +"(im Beispiel jede [[Unterseite|subpage]] von \"blog\"), und die zehn neusten " +"davon erscheinen auf der Seite. Übrigens werden Dateien, die keine Seiten sind " +"und auf die [[PageSpec]] passen, als RSS-Einbettungen Teil des Feeds: Dies ist " +"nützlich für Podcasts." + +#. type: Plain text +msgid "" +"The optional `rootpage` parameter tells the wiki that new posts to this blog " +"should default to being [[SubPages|SubPage]] of \"blog\", and enables a form " +"at the top of the blog that can be used to add new items." +msgstr "" +"Der optionale Parameter `rootpage` teilt dem Wiki mit, dass neue Einträge in " +"diesem Blog [[Unterseiten|subpage]] von \"blog\" sein sollen; in diesem Fall " +"wird ein Formular zum Hinzufügen neuer Beiträge am Anfang der Seite angezeigt." + +#. type: Plain text +msgid "" +"If you want your blog to have an archive page listing every post ever made " +"to it, you can accomplish that like this:" +msgstr "" +"Wenn es zu einem Blog eine Archivseite mit allen bisherigen Einträgen geben " +"soll, kann dies wie folgt erreicht werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n" +msgstr "\t\\[[!inline pages=\"blog/* and !*/Discussion\" archive=\"yes\"]]\n" + +#. type: Plain text +msgid "" +"You can even create an automatically generated list of all the pages on the " +"wiki, with the most recently added at the top, like this:" +msgstr "" +"Mit dem folgenden Code kann man sogar eine automatisch erzeugte Liste mit " +"allen Seiten des Wikis erstellen (die neuesten erscheinen oben):" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n" +msgstr "\t\\[[!inline pages=\"* and !*/Discussion\" archive=\"yes\"]]\n" + +#. type: Plain text +msgid "" +"If you want to be able to add pages to a given blog feed by tagging them, " +"you can do that too. To tag a page, just make it link to a page or pages " +"that represent its tags. Then use the special `link()` [[PageSpec]] to match " +"all pages that have a given tag:" +msgstr "" +"Es ist auch möglich, dass Seiten durch das Hinzufügen eines Tags Teil des " +"Blogs werden. Hierzu kann auf der betreffenden Seite einfach ein Link auf die " +"Seite (oder die Seiten) erstellt, die die Tags repräsentieren. Dann kann die " +"spezielle `link()`-[[PageSpec]] verwendet werden, um alle Seiten mit einem " +"gegebenen Tag zu erfassen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"link(life)\"]]\n" +msgstr "\t\\[[!inline pages=\"link(life)\"]]\n" + +#. type: Plain text +msgid "Or include some tags and exclude others:" +msgstr "" +"Es ist auch möglich, bestimmte Tags inzuschließen, während andere " +"ausgeschlossen werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n" +msgstr "\t\\[[!inline pages=\"link(debian) and !link(social)\"]]\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"There are many parameters you can use with the `inline` directive. These are " +"the commonly used ones:" +msgstr "" +"Es gibt viele Parameter, die man mit der `inline`-Anweisung verwenden kann. " +"Dies sind die am häufigsten benutzten:" + +#. type: Bullet: '* ' +msgid "`pages` - A [[PageSpec]] of the pages to inline." +msgstr "`pages` - Eine [[PageSpec]] der einzubindenden Seiten." + +#. type: Bullet: '* ' +msgid "" +"`show` - Specify the maximum number of matching pages to inline. Default is " +"10, unless archiving, when the default is to show all. Set to 0 to show all " +"matching pages." +msgstr "" +"`show` - Gibt die maximale Anzahl von Seiten an, die eingebunden werden sollen." +" Voreingestellt sind 10, außer wenn archiviert wird, dass sind es alle. Ist " +"der Wert 0, werden alle passenden Seiten angezeigt." + +#. type: Bullet: '* ' +msgid "" +"`archive` - If set to \"yes\", only list page titles and some metadata, not " +"full contents." +msgstr "" +"`archive` - Hat dieser Parameter den Wert `yes`, werden nur der Titel und " +"einige Metadaten angezeigt, aber nicht der komplette Inhalt." + +#. type: Bullet: '* ' +msgid "" +"`description` - Sets the description of the rss feed if one is generated. " +"Defaults to the name of the wiki." +msgstr "" +"`description` - Setzt die Beschreibung des RSS-Feeds, wenn einer erzeugt wird. " +"Voreingestellt ist der Name des Wikis." + +#. type: Bullet: '* ' +msgid "" +"`skip` - Specify a number of pages to skip displaying. Can be useful to " +"produce a feed that only shows archived pages." +msgstr "" +"`skip` - Gibt die Anzahl von Seiten an, die bei der Anzeige übersprungen " +"werden. Dies kann nützlich sein, um einen Feed zu erstellen, der nur " +"archivierte Seiten enthält." + +#. type: Bullet: '* ' +msgid "`postform` - Set to \"yes\" to enable a form to post new pages to a blog." +msgstr "" +"`postform` - Bei dem Wert `yes`, wird ein Formular zum Erstellen neuer " +"Einträge in dem Blog angezeigt." + +#. type: Bullet: '* ' +msgid "`postformtext` - Set to specify text that is displayed in a postform." +msgstr "`postformtext` - Gibt an, welcher Text im 'postform' angezeigt wird." + +#. type: Bullet: '* ' +msgid "" +"`rootpage` - Enables the postform, and allows controling where newly posted " +"pages should go, by specifiying the page that they should be a [[SubPage]] " +"of." +msgstr "" +"`rootpage` - Aktiviert `postform` und erlaubt gleichzeitig die Kontrolle " +"darüber, wo neu erstellte Seiten landen sollen, indem eine Seite angegeben " +"wird, deren [[Unterseite|subpage]] die neuen Seiten werden sollen." + +#. type: Plain text +msgid "Here are some less often needed parameters:" +msgstr "Hier sind einige weniger häufig benötigte Parameter:" + +#. type: Bullet: '* ' +msgid "" +"`actions` - If set to \"yes\" add links to the bottom of the inlined pages " +"for editing and discussion (if they would be shown at the top of the page " +"itself)." +msgstr "" +"`actions` - Wenn `yes`, füge Links zum Bearbeiten und zur Diskussion am " +"unteren Ende jeder eingebundenen Seite ein (wenn sie im Kopf der jeweiligen " +"Seite angezeigt werden würden)." + +#. type: Bullet: '* ' +msgid "" +"`rss` - controls generation of an rss feed. If the wiki is configured to " +"generate rss feeds by default, set to \"no\" to disable. If the wiki is " +"configured to `allowrss`, set to \"yes\" to enable." +msgstr "" +"`rss` - Steuert die Erzeugung eines RSS-Feeds. Wenn das Wiki so konfiguriert " +"ist, dass es standardmäßig RSS-Feeds erzeugt, kann dies durch den Wert `no` " +"verhindert werden. Wenn das Wiki RSS erlaubt (`allowrss` in der " +"Konfigurationsdatei), dann kann der RSS-Feed mit `yes` aktiviert werden." + +#. type: Bullet: '* ' +msgid "" +"`atom` - controls generation of an atom feed. If the wiki is configured to " +"generate atom feeds by default, set to \"no\" to disable. If the wiki is " +"configured to `allowatom`, set to \"yes\" to enable." +msgstr "" +"`atom` - Steuert die Erzeugung eines Atom-Feeds. Wenn das Wiki so konfiguriert " +"ist, dass es standardmäßig Atom-Feeds erzeugt, kann dies durch den Wert `no` " +"verhindert werden. Wenn das Wiki Atom erlaubt (`allowatom` in der " +"Konfigurationsdatei), dann kann der Atom-Feed mit `yes` aktiviert werden." + +#. type: Bullet: '* ' +msgid "" +"`feeds` - controls generation of all types of feeds. Set to \"no\" to " +"disable generating any feeds." +msgstr "" +"`feeds` - Steuert die Erzeugung aller Feed-Typen. Ein Wert von `no` " +"unterdrückt alle Feeds." + +#. type: Bullet: '* ' +msgid "" +"`emptyfeeds` - Set to \"no\" to disable generation of empty feeds. Has no " +"effect if `rootpage` or `postform` is set." +msgstr "" +"`emptyfeeds` - Bei `no` werden keine leeren Feeds erzeugt. Dies hat keine " +"Auswirkung, wenn `rootpage` oder `postform` aktiv sind." + +#. type: Bullet: '* ' +msgid "" +"`template` - Specifies the template to fill out to display each inlined " +"page. By default the `inlinepage` template is used, while the `archivepage` " +"template is used for archives. Set this parameter to use some other, custom " +"template, such as the `titlepage` template that only shows post titles or " +"the `microblog` template, optimised for microblogging. Note that you should " +"still set `archive=yes` if your custom template does not include the page " +"content." +msgstr "" +"`template` - Gibt die Vorlage an, die für die Anzeige der einzelnen " +"eingebundenen Seiten verwendet wird. Voreingestellt ist die " +"`inlinepage`-Vorlage, für Archive wird `archivepage` verwendet. Es können auch " +"andere, angepasste Vorlagen verwendet werden, etwa `titlepage` (zeigt nur die " +"Titel der Blog-Einträge) oder `microblog` (optimiert für Microblogging). Wenn " +"die angepasste Vorlage den Seiteninhalt nicht einbindet, kann zusätzlich " +"`archive=yes` gesetzt werden." + +#. type: Bullet: '* ' +msgid "" +"`raw` - Rather than the default behavior of creating a blog, if raw is set " +"to \"yes\", the page will be included raw, without additional markup around " +"it, as if it were a literal part of the source of the inlining page." +msgstr "" +"`raw` - Statt des voreingestellten Verhaltens, einen Blog zu erzeugen, wird " +"bei `raw=yes` die Seite ohne zusätzliches Drumherum eingebunden, als ob sie " +"ein Teil des Quelltextes der einbindenden Seite wäre." + +#. type: Bullet: '* ' +msgid "" +"`sort` - Controls how inlined pages are [[sorted|pagespec/sorting]]. The " +"default is to sort the newest created pages first." +msgstr "" +"`sort` - Steuert wie die eingebundenen Seiten [[sortiert|pagespec/sorting]] " +"werden. In der Voreinstellung kommen die zuletzt angelegten Seiten zuerst." + +#. type: Bullet: '* ' +msgid "`reverse` - If set to \"yes\", causes the sort order to be reversed." +msgstr "`reverse` - Bei `yes` wird die Sortierung umgekehrt." + +#. type: Bullet: '* ' +msgid "" +"`feedshow` - Specify the maximum number of matching pages to include in the " +"rss/atom feeds. The default is the same as the `show` value above." +msgstr "" +"`feedshow` - Gibt an, wie viele Seiten höchstens in den RSS- und Atom-Feeds " +"eingebunden werden. Voreingestellt ist der Wert von `show`." + +#. type: Bullet: '* ' +msgid "" +"`feedonly` - Only generate the feed, do not display the pages inline on the " +"page." +msgstr "" +"`feedonly` - Erzeuge nur den Feed, zeige die Seiten nicht eingebettet auf der " +"Seite an." + +#. type: Bullet: '* ' +msgid "" +"`quick` - Build archives in quick mode, without reading page contents for " +"metadata. This also turns off generation of any feeds." +msgstr "" +"`quick` - Erzeuge Archive im Schnelldurchlauf, ohne im Seiteninhalt nach " +"Metadaten zu suchen. Dies deaktiviert auch das Erzeugen von Feeds." + +#. type: Bullet: '* ' +msgid "" +"`timeformat` - Use this to specify how to display the time or date for pages " +"in the blog. The format string is passed to the strftime(3) function." +msgstr "" +"`timeformat` - Hiermit kann gesteuert werden, wie die Zeit oder das Datum der " +"Blogeinträge dargestellt wird. Der Wert wird an die Funktion strftime(3) " +"weitergereicht." + +#. type: Bullet: '* ' +msgid "" +"`feedpages` - A [[PageSpec]] of inlined pages to include in the rss/atom " +"feeds. The default is the same as the `pages` value above, and only pages " +"matched by that value are included, but some of those can be excluded by " +"specifying a tighter [[PageSpec]] here." +msgstr "" +"`feedpages` - Eine [[PageSpec]] mit Seiten, die im RSS- bzw. Atom-Feed " +"auftachen sollen. Voreingestellt ist der Wert von `pages`, und nur Seiten die " +"darauf passen werden eingebunden, aber einige davon können ausgeschlossen " +"werden, indem hier eine striktere [[PageSpec]] angegeben wird." + +#. type: Bullet: '* ' +msgid "" +"`guid` - If a URI is given here (perhaps a UUID prefixed with `urn:uuid:`), " +"the Atom feed will have this as its ``. The default is to use the URL of " +"the page containing the `inline` directive." +msgstr "" +"`guid` - Wenn hier eine URI angegeben wird (möglicherweise eine UUID mit " +"Präfix `urn:uuid:`), dann hat der Atom-Feed diese als seine ``. " +"Voreingestellt ist der Name der Seite, die die inline-Anweisung enthält." + +#. type: Bullet: '* ' +msgid "" +"`feedfile` - Can be used to change the name of the file generated for the " +"feed. This is particularly useful if a page contains multiple feeds. For " +"example, set \"feedfile=feed\" to cause it to generate `page/feed.atom` " +"and/or `page/feed.rss`. This option is not supported if the wiki is " +"configured not to use `usedirs`." +msgstr "" +"`feedfile` - Hiermit kann der Name der Datei verändert werden, die für den " +"Feed erzeugt wird. Dies ist insbesondere dann nützlich, wenn eine Seite " +"mehrere Feeds enthält. Zum Beispiel kann man `feedfile=feed` setzen, um " +"`page/feed.atom` und/oder `page/feed.rss` zu erzeugen. Diese Option ist nicht " +"verfügbar, wenn das Wiki die Option `usedirs` nicht verwendet." + +#. type: Bullet: '* ' +msgid "" +"`pagenames` - If given instead of `pages`, this is interpreted as a " +"space-separated list of links to pages (with the same " +"[[SubPage/LinkingRules]] as in a [[ikiwiki/WikiLink]]), and they are inlined " +"in exactly the order given: the `sort` and `pages` parameters cannot be used " +"in conjunction with this one." +msgstr "" +"`pagenames` - Kann anstelle von `pages` angegeben werden und wird als " +"Leerzeichen-separierte Liste von Links zu Seiten interpretiert (mit den " +"gleichen [[Verlinkungsregeln|SubPage/LinkingRules]] wie in einem " +"[[ikiwiki/WikiLink]]), und werden dann genau in der angegebenen Reihenfolge " +"eingebunden. Die Parameter `sort` und `pages` können nicht in Kombination mit " +"diesem verwendet werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + +#. type: Plain text +msgid "" +"A related directive is the [[ikiwiki/directive/edittemplate]] directive, " +"which allows default text for a new page to be specified." +msgstr "" +"Eine verwandte Anweisung ist die [[ikiwiki/directive/edittemplate]]-Anweisung, " +"mit der für eine neue Seite ein voreingestellter Text angegeben werden kann." + + diff --git a/po/underlays/directives/ikiwiki/directive/linkmap.de.po b/po/underlays/directives/ikiwiki/directive/linkmap.de.po new file mode 100644 index 000000000..1695ca659 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/linkmap.de.po @@ -0,0 +1,99 @@ +# German translation of directives/ikiwiki/directive/linkmap page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:03+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `linkmap` directive is supplied by the [[!iki plugins/linkmap " +"desc=linkmap]] plugin." +msgstr "" +"Die `linkmap`-Anweisung wird durch die [[!iki plugins/linkmap " +"desc=linkmap]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive uses [graphviz](http://www.graphviz.org/) to generate a graph " +"showing the links between a set of pages in the wiki. Example usage:" +msgstr "" +"Diese Anweisung verwendet [graphviz](http://www.graphviz.org/), um einen " +"Graph mit den Links zwischen den Seiten im Wiki zu erstellen. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n" +msgstr "\t\\[[!linkmap pages=\"* and !blog/* and !*/Discussion\"]]\n" + +#. type: Plain text +msgid "" +"Only links between mapped pages will be shown; links pointing to or from " +"unmapped pages will be omitted. If the pages to include are not specified, " +"the links between all pages (and other files) in the wiki are mapped." +msgstr "" +"Nur Links zwischen den angegebenen Seiten werden angezeigt; Links die auf " +"andere Seiten zeigen werden ausgelassen. Wenn die einzuschließenden Seiten " +"nicht angegeben werden, werden Links zwischen allen Seiten (und anderen " +"Dateien) im Wiki angezeigt." + +#. type: Plain text +msgid "" +"Here are descriptions of all the supported parameters to the `linkmap` " +"directive:" +msgstr "" +"Hier die Beschreibung aller unterstützter Parameter der `linkmap`-Anweisung:" + +#. type: Bullet: '* ' +msgid "`pages` - A [[ikiwiki/PageSpec]] of the pages to map." +msgstr "`pages` - Eine [[ikiwiki/PageSpec]] der darzustellenden Seiten." + +#. type: Bullet: '* ' +msgid "" +"`height`, `width` - Limit the size of the map to a given height and width, " +"in inches. Both must be specified for the limiting to take effect, otherwise " +"the map's size is not limited." +msgstr "" +"`height`, `width` - Begrenzt die Größe der erzeugten Graphik auf die (in " +"Inch) angegebene Breite und Höne. Beide müssen angegeben werden, damit die " +"Beschränkung wirksam wird." + +#. type: Bullet: '* ' +msgid "" +"`connected` - Controls whether to include pages on the map that link to no " +"other pages (connected=no, the default), or to only show pages that link to " +"others (connected=yes)." +msgstr "" +"`connected` - Steuert ob auch Seiten dargestellt werden, die keinen Link zu " +"anderen Seiten enthalten (`connected=no`, die Voreinstellung), oder ob nur " +"Seiten angezeigt werden, die auf andere verlinken (`connected=yes`)." + +#. type: Plain text +msgid "" +"For best results, only a small set of pages should be mapped, since " +"otherwise the map can become very large, unwieldy, and complicated. If too " +"many pages are included, the map may get so large that graphviz cannot " +"render it. Using the `connected` parameter is a good way to prune out pages " +"that clutter the map." +msgstr "" +"Um die besten Ergebnisse zu erzielen, sollte nur eine kleine Teilmenge der " +"Seiten angegeben werden, da die erzeugte Karte sonst groß, unhandlich und " +"kompliziert wird. Wenn zu viele Seiten angegeben werden, kann die Karte zu " +"kompliziert werden, als dass graphviz sie noch rendern könnte. Der Parameter " +"`connected` ist ein guter Weg Seiten loszuwerden, die die Karte " +"unübersichtlich machen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/listdirectives.de.po b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po new file mode 100644 index 000000000..18d0a6da0 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/listdirectives.de.po @@ -0,0 +1,72 @@ +# German translation of directives/ikiwiki/directive/listdirectives page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:03+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `listdirectives` directive is supplied by the [[!iki " +"plugins/listdirectives desc=listdirectives]] plugin." +msgstr "" +"Die `listdirectives`-Anweisung wird durch die [[!iki " +"plugins/listdirectives desc=listdirectives]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a list of available " +"[[directives|ikiwiki/directive]]." +msgstr "" +"Diese Anweisung erzeugt eine Liste der verfügbaren " +"[[Anweisungen|ikiwiki/directives]]." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!listdirectives]]\n" +msgstr "\t\\[[!listdirectives]]\n" + +#. type: Plain text +msgid "" +"There is one optional keyword argument, `generated`. Normally the " +"`listdirectives` directive will list all built in directives and directives " +"directly registered by plugins. With this keyword, `listdirectives` will " +"also list directives generated later. For example, all [[shortcuts]] are " +"directives generated in turn by the `shortcut` directive. They will only be " +"listed if the `generated` argument is supplied." +msgstr "" +"Es gibt nur ein optionales Argument, `generated`. Normalerweise zeigt die " +"`listdirectives`-Anweisung alle eingebauten und alle durch eine Erweiterung " +"registrierten Anweisungen an. Mit diesem Schlüsselwort zeigt " +"`listdirectives` auch Anweisungen an, die erst später erzeugt wurden. Zum " +"Beispiel werden alle [[Abkürzungen|shortcuts]] durch die " +"`shortcut`-Anweisung erzeugt und werden nur aufgelistet, wenn das Argument " +"`generated` angegeben wird." + +#. type: Plain text +#, no-wrap +msgid " \\[[!listdirectives generated]]\n" +msgstr " \\[[!listdirectives generated]]\n" + +#. type: Plain text +msgid "" +"This extended list is often quite long, and often contains many undocumented " +"directives." +msgstr "" +"Diese erweiterte Liste ist oft ziemlich lang und enthält oft viele " +"undokumentierte Anweisungen." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/map.de.po b/po/underlays/directives/ikiwiki/directive/map.de.po new file mode 100644 index 000000000..303624b2c --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/map.de.po @@ -0,0 +1,77 @@ +# German translation of directives/ikiwiki/directive/map page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:03+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "The `map` directive is supplied by the [[!iki plugins/map desc=map]] plugin." +msgstr "" +"Die `map`-Anweisung wird durch die [[!iki plugins/map desc=map]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a hierarchical page map for the wiki. Example " +"usage:" +msgstr "" +"Diese Anweisung erzeugt eine hierarchische Liste der Seiten im Wiki. Beispiel für " +"die Verwendung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n" +msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\"]]\n" + +#. type: Plain text +msgid "" +"If the pages to include are not specified, all pages (and other files) in " +"the wiki are mapped." +msgstr "" +"Wenn die anzuzeigenden Seiten nicht angegeben werden, kommen alle Seiten (und " +"andere Dateien) in die Liste." + +#. type: Plain text +msgid "" +"By default, the names of pages are shown in the map. The `show` parameter " +"can be used to show the titles or descriptions of pages instead (as set by " +"the [[meta]] directive). For example:" +msgstr "" +"In der Voreinstellung werden in der Liste die Namen der Seiten angezeigt. Mit dem " +"Parameter `show` können stattdessen der Titel (`title`) oder die Beschreibung " +"(`description`) verwendet werden, die mit der [[meta]]-Anweisung gesetzt wurden. " +"Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n" +msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=title]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n" +msgstr "\t\\[[!map pages=\"* and !blog/* and !*/Discussion\" show=description]]\n" + +#. type: Plain text +msgid "" +"Hint: To limit the map to displaying pages less than a certain level deep, " +"use a [[ikiwiki/PageSpec]] like this: `pages=\"* and !*/*/*\"`" +msgstr "" +"Tipp: Um nur Seiten bis zu einer bestimmten Ebene anzuzeigen, kann eine " +"[[ikiwiki/PageSpec]] wie `pages=\"* and !*/*/*\"` verwendet werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/meta.de.po b/po/underlays/directives/ikiwiki/directive/meta.de.po new file mode 100644 index 000000000..aab5fd806 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/meta.de.po @@ -0,0 +1,455 @@ +# German translation of directives/ikiwiki/directive/meta page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:04+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `meta` directive is supplied by the [[!iki plugins/meta desc=meta]] " +"plugin." +msgstr "" +"Die `meta`-Anweisung wird durch die [[!iki plugins/meta desc=meta]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows inserting arbitrary metadata into the source of a " +"page. Enter the metadata as follows:" +msgstr "" +"Diese Anweisung erlaubt es, beliebige Metadaten in den Quelltext einer Seite " +"einzufügen. Dies geschieht wie folgt:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta field=\"value\"]]\n" +"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n" +msgstr "" +"\t\\[[!meta field=\"value\"]]\n" +"\t\\[[!meta field=\"value\" param=\"value\" param=\"value\"]]\n" + +#. type: Plain text +msgid "" +"The first form sets a given field to a given value, while the second form " +"also specifies some additional sub-parameters." +msgstr "" +"In der ersten Form wird das angegebene Feld auf den angegebenen Wert gesetzt. In " +"der zweiten Form werden zusätzlich einige Unter-Parameter angegeben." + +#. type: Plain text +msgid "" +"The field values are treated as HTML entity-escaped text, so you can include " +"a quote in the text by writing `"` and so on." +msgstr "" +"Die Feldwerte können HTML-Entities enthalten, zum Beispiel kann durch `"` " +"ein Anführungszeichen eingefügt werden." + +#. type: Plain text +msgid "Supported fields:" +msgstr "Unterstützte Felder:" + +#. type: Bullet: '* ' +msgid "title" +msgstr "`title` " + +#. type: Plain text +#, no-wrap +msgid "" +" Overrides the title of the page, which is generally the same as the\n" +" page name.\n" +msgstr "" +" Überschreibt den Titel der Seite, der normalerweise dem Namen\n" +" der Seite entspricht." + +#. type: Plain text +#, no-wrap +msgid "" +" Note that if the title is overridden, a \"title_overridden\" variable " +"will\n" +" be set to a true value in the template; this can be used to format " +"things\n" +" differently in this case.\n" +msgstr "" +" Wenn der Titel so überschrieben wird, wird die Template-Variable\n" +" `title_overridden` auf wahr gesetzt. Eine Vorlage kann in diesem\n" +" Fall eine andere Darstellung wählen.\n" + +#. type: Bullet: '* ' +msgid "license" +msgstr "`license`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a license for the page, for example, \"GPL\". Can contain\n" +" WikiLinks and arbitrary markup.\n" +msgstr "" +" Gibt eine Lizenz für die Seite an, etwa `GPL`. Kann WikiLinks und\n" +" beliebige Formatierungsanweisungen enhalten.\n" + +#. type: Bullet: '* ' +msgid "copyright" +msgstr "`copyright`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies the copyright of the page, for example, \"Copyright 2007 by\n" +" Joey Hess\". Can contain WikiLinks and arbitrary markup.\n" +msgstr "" +" Gibt die Urheberrechte der Seite an, zum Beispiel `Copyright 2007\n" +" by Joey Hess`. Kann WikiLinks und beliebige\n" +" Formatierungsanweisungen enhalten.\n" + +#. type: Bullet: '* ' +msgid "author" +msgstr "`author`" + +#. type: Plain text +#, no-wrap +msgid " Specifies the author of a page.\n" +msgstr " Gibt den Autor der Seite an.\n" + +#. type: Bullet: '* ' +msgid "authorurl" +msgstr "`authorurl`" + +#. type: Plain text +#, no-wrap +msgid " Specifies an url for the author of a page.\n" +msgstr " Gibt eine URL für den Autor der Seite an.\n" + +#. type: Bullet: '* ' +msgid "description" +msgstr "`description`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a short description for the page. This will be put in\n" +" the html header, and can also be displayed by eg, the [[map]] directive.\n" +msgstr "" +" Gibt eine kurze Beschreibung der Seite an. Diese wird im\n" +" HTML-Header angegeben und kann zum Beispiel auch durch die\n" +" [[map]]-Anweisung ausgegeben werden.\n" + +#. type: Bullet: '* ' +msgid "permalink" +msgstr "`permalink`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a permanent link to the page, if different than the page\n" +" generated by ikiwiki.\n" +msgstr "" +" Gibt einen dauerhaften Link zu der Seite an, wenn dieser anders ist\n" +" als die von ikiwiki generierte Seite.\n" + +#. type: Bullet: '* ' +msgid "date" +msgstr "`date`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies the creation date of the page. The date can be entered in\n" +" nearly any format, since it's parsed by [[!cpan TimeDate]].\n" +msgstr "" +" Gibt das Erstellungsdatum der Seite an. Das Datum kann in\n" +" nahezu beliebigem Format angegeben werden, da es durch\n" +" [[!cpan TimeDate]] interpretiert wird.\n" + +#. type: Bullet: '* ' +msgid "stylesheet" +msgstr "`stylesheet`" + +#. type: Plain text +#, no-wrap +msgid "" +" Adds a stylesheet to a page. The stylesheet is treated as a wiki link to\n" +" a `.css` file in the wiki, so it cannot be used to add links to external\n" +" stylesheets. Example:\n" +msgstr "" +" Fügt ein Stylesheet zu der Seite hinzu. Der angegebene Name wird als\n" +" WikiLink zu einer `.css`-Datei im Wiki behandelt, es können also keine\n" +" externen Stylesheets eingebunden werden. Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n" +"\ttitle=\"somestyle\"]]\n" +msgstr "" +"\t\\[[!meta stylesheet=somestyle rel=\"alternate stylesheet\"\n" +"\ttitle=\"somestyle\"]]\n" + +#. type: Bullet: '* ' +msgid "openid" +msgstr "`openid`" + +#. type: Plain text +#, no-wrap +msgid "" +" Adds html <link> tags to perform OpenID delegation to an external\n" +" OpenID server. This lets you use an ikiwiki page as your OpenID.\n" +msgstr "" +" Fügt die nötigen <link>-Tags für die Weiterleitung an einen externen\n" +" OpenID-Server ein. Dadurch kann eine ikiwiki-Seite als OpenID\n" +" verwendet werden.\n" + +#. type: Plain text +#, no-wrap +msgid "" +" By default this will delegate for both `openid` and `openid2`. To only\n" +" delegate for one, add a parameter such as `delegate=openid`.\n" +msgstr "" +" Standardmäßig werden sowohl `openid` als auch `openid2`\n" +" weitergeleitet. Um nur eines davon weiterzuleiten, kann ein\n" +" Parameter wie `delegate=openid` verwendet werden.\n" + +#. type: Plain text +#, no-wrap +msgid "" +" An optional `xrds-location`\n" +" parameter lets you specify the location of any [eXtensible Resource\n" +" DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml).\n" +msgstr "" +" Der optionale Parameter `xrds-location` erlaubt es, den Ort eines\n" +" [eXtensible Resource\n" +" DescriptorS](http://www.windley.com/archives/2007/05/using_xrds.shtml)\n" +" anzugeben.\n" + +#. type: Plain text +#, no-wrap +msgid " Example:\n" +msgstr " Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n" +"\tserver=\"http://www.myopenid.com/server\"\n" +"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n" +msgstr "" +"\t\\\\[[!meta openid=\"http://joeyh.myopenid.com/\"\n" +"\tserver=\"http://www.myopenid.com/server\"\n" +"\txrds-location=\"http://www.myopenid.com/xrds?username=joeyh.myopenid.com\"\"]]\n" + +#. type: Bullet: '* ' +msgid "link" +msgstr "`link`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a link to another page. This can be used as a way to make the\n" +" wiki treat one page as linking to another without displaying a " +"user-visible\n" +" [[ikiwiki/WikiLink]]:\n" +msgstr "" +" Gibt einen Link zu einer anderen Seite an. Auf diese Weise kann das Wiki\n" +" dazu gebracht werden, eine Seite so zu behandeln, als ob sie einen Link\n" +" auf eine andere enthält, ohne dass die Benutzer einen [[ikiwiki/WikiLink]]\n" +" zu Gesicht bekommen:\n" + +#. type: Plain text +#, no-wrap +msgid " \\[[!meta link=otherpage]]\n" +msgstr " \\[[!meta link=andereseite]]\n" + +#. type: Plain text +#, no-wrap +msgid " It can also be used to insert a html <link> tag. For example:\n" +msgstr "" +" Es kann auch ein HTML <link>-Tag eingefügt werden, zum\n" +" Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid "" +" \\[[!meta link=\"http://joeyh.myopenid.com/\" " +"rel=\"openid.delegate\"]]\n" +msgstr "" +" \\[[!meta link=\"http://joeyh.myopenid.com/\" " +"rel=\"openid.delegate\"]]\n" + +#. type: Plain text +#: +#, no-wrap +msgid "" +" However, this latter syntax won't be allowed if the \n" +" [[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since " +"it can be used to\n" +" insert unsafe content.\n" +msgstr "" +" Allerdings ist diese zweite Syntax nicht erlaubt, wenn die\n" +" [[!iki plugins/htmlscrubber desc=htmlscrubber]]-Erweiterung aktiviert ist,\n" +" weil auf diese Weise unsichere Inhalte eingefügt werden können.\n" + +#. type: Bullet: '* ' +msgid "redir" +msgstr "`redir`" + +#. type: Plain text +#, no-wrap +msgid " Causes the page to redirect to another page in the wiki.\n" +msgstr " Lässt die Seite auf eine andere Seite im Wiki weiterleiten.\n" + +#. type: Plain text +#, no-wrap +msgid " \t\\[[!meta redir=otherpage]]\n" +msgstr " \t\\[[!meta redir=andereseite]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +" Optionally, a delay (in seconds) can be specified. The default is to\n" +" redirect without delay.\n" +msgstr "" +" Es kann optional eine Verzögerung (`delay=seconds`) angegeben\n" +" werden. Voreingestellt ist, ohne Verzögerung weiterzuleiten.\n" + +#. type: Plain text +#, no-wrap +msgid " It can also be used to redirect to an external url. For example:\n" +msgstr "" +" Es kann auch auf eine externe URL weitergeleitet werden. Zum\n" +" Beispiel:\n" + +#. type: Plain text +#, no-wrap +msgid " \t\\[[!meta redir=\"http://example.com/\"]]\n" +msgstr " \t\\[[!meta redir=\"http://beispiel.de/\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +" For both cases, an anchor to jump to inside the destination page may also " +"be\n" +" specified using the common `#ANCHOR` syntax.\n" +msgstr "" +" In beiden Fällen kann ein anzuspringender Anker auf der Zielseite\n" +" angegeben werden, indem die übliche `#ANKER`-Syntax verwendet wird.\n " + +#. type: Bullet: '* ' +msgid "robots" +msgstr "`robots`" + +#. type: Plain text +#, no-wrap +msgid " Causes the robots meta tag to be written:\n" +msgstr " Schreibt den robots-Meta-Tag:\n" + +#. type: Plain text +#, no-wrap +msgid " \\[[!meta robots=\"index, nofollow\"]]\n" +msgstr " \\[[!meta robots=\"index, nofollow\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +" Valid values for the attribute are: \"index\", \"noindex\", \"follow\", " +"and\n" +" \"nofollow\". Multiple comma-separated values are allowed, but obviously " +"only\n" +" some combinations make sense. If there is no robots meta tag, \"index,\n" +" follow\" is used as the default.\n" +msgstr "" +" Zulässige Werte sind `index`, `noindex`, `follow` und `nofollow`. Es\n" +" können mehrere Werte durch Kommas getrennt angegeben werden, aber\n" +" offensichtlich ergeben nur einige Kombinationen Sinn. Wenn der\n" +" robots-Meta-Tag nicht explizit angegeben wird, wird als Voreinstellung\n" +" \"index,follow\" angenommen.\n" + +#. type: Plain text +#, no-wrap +msgid " The value is escaped, but its contents are not otherwise checked.\n" +msgstr " Der Wert wird nicht auf Zulässigkeit geprüft.\n" + +#. type: Bullet: '* ' +msgid "guid" +msgstr "`guid`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a globally unique ID for a page. This guid should be a URI\n" +" (in particular, it can be `urn:uuid:` followed by a UUID, as per\n" +" [[!rfc 4122]]), and it will be used to identify the page's entry in RSS\n" +" and Atom feeds. If not given, the default is to use the page's URL as " +"its\n" +" guid.\n" +msgstr "" +" Gibt eine global einmalige ID für die Seite an. Diese guid sollte eine\n" +" URI sein (insbesondere kann sie nach [[!rfc 4122]] `urn:uuid:`\n" +" gefolgt von einer UUID sein). Sie wird verwendet, um den Eintrag der\n" +" Seite in RSS- und Atom-Feeds zu identifizieren. Wird keine guid\n" +" angegeben, wird an dieser Stelle die URL der Seite verwendet.\n" + +#. type: Plain text +#, no-wrap +msgid "" +" This is mostly useful when a page has moved, to keep the guids for\n" +" pages unchanged and avoid_flooding_aggregators\n" +" (see [[!iki tips/howto_avoid_flooding_aggregators]]).\n" +msgstr "" +" Diese Angabe ist in erster Linie dann nützlich, wenn eine Seite\n" +" verschoben wurde: Indem die guids unverändert gelassen werden,\n" +" kann das Fluten von Aggregatoren vermieden werden (siehe\n" +" [[!iki tips/howto_avoid_flooding_aggregators]]).\n" + +#. type: Bullet: '* ' +msgid "updated" +msgstr "`updated`" + +#. type: Plain text +#, no-wrap +msgid "" +" Specifies a fake modification time for a page, to be output into RSS and\n" +" Atom feeds. This is useful to avoid flooding aggregators that sort by\n" +" modification time, like Planet: for instance, when editing an old blog " +"post\n" +" to add tags, you could set `updated` to be one second later than the " +"original\n" +" value. The date/time can be given in any format that\n" +" [[!cpan TimeDate]] can understand, just like the `date` field.\n" +msgstr "" +" Gibt eine gefälschte Änderungszeit für die Seite an, die dann von RSS-\n" +" und Atom-Feeds ausgegeben wird. Dies ist nützlich, um Aggregatoren\n" +" nicht zu fluten, die nach Änderungszeit sortieren, wie etwa Planet:\n" +" Wenn man zum Beispiel einen alten Blog-Eintrag bearbeitet (etwa um\n" +" Tags hinzuzufügen), kann man `updated` auf eine Sekunde später als\n" +" den ursprünglichen Wert setzen. Das Datum mit Uhrzeit kann in jedem\n" +" Format angegeben werden, das von [[!cpan TimeDate]] verstanden\n" +" wird, genauso wie im Feld `date`.\n" + +#. type: Plain text +msgid "" +"If the field is not one of the above predefined fields, the metadata will be " +"written to the generated html page as a <meta> header. However, this " +"won't be allowed if the [[!iki plugins/htmlscrubber desc=htmlscrubber]] " +"plugin is enabled, since it can be used to insert unsafe content." +msgstr "" +"Wenn das Feld nicht eines der oben vordefinierten ist, werden die Metadaten als " +"<meta>-Header in die generierte Seite geschrieben. Dies ist allerdings " +"nicht erlaubt, wenn die [[!iki plugins/htmlscrubber " +"desc=htmlscrubber]]-Erweiterung aktiv ist, da auf diese Weise unsichere Inhalte " +"eingefügt werden können." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/more.de.po b/po/underlays/directives/ikiwiki/directive/more.de.po new file mode 100644 index 000000000..bffb3a247 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/more.de.po @@ -0,0 +1,63 @@ +# German translation of directives/ikiwiki/directive/more page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:04+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `more` directive is supplied by the [[!iki plugins/more desc=more]] " +"plugin." +msgstr "" +"Die `more`-Anweisung wird durch die [[!iki plugins/more desc=more]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive provides a way to have a \"more\" link on a post in a blog, " +"that leads to the full version of the page. Use it like this:" +msgstr "" +"Diese Anweise stellt eine Möglichkeit zur Verfügung, einen \"mehr\"-Link in " +"einem Blogeintrag anzuzeigen, der zur kompletten Version der Seite führt. " +"Benutzt wird sie folgendermaßen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!more linktext=\"click for more\" text=\"\"\"\n" +msgstr "\t\\[[!more linktext=\"mehr …\" text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tThis is the rest of my post. Not intended for people catching up on\n" +"\ttheir blogs at 30,000 feet. Because I like to make things\n" +"\tdifficult.\n" +msgstr "" +"\tDies ist der Rest meines Blog-Eintrags. Er ist nicht für Leute\n" +"\tgedacht, die auf 10000m Blogs lesen, weil ich es gerne kompliziert\n" +"\tmache.\n" + +#. type: Plain text +msgid "If the `linktext` parameter is omitted it defaults to just \"more\"." +msgstr "" +"Wenn der Parameter `linktext` weggelassen wird, wird einfach \"more\" angezeigt." + +#. type: Plain text +msgid "Note that you can accomplish something similar using a [[toggle]] instead." +msgstr "Etwas ähnliches kann auch mit einem [[toggle]] erreicht werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/orphans.de.po b/po/underlays/directives/ikiwiki/directive/orphans.de.po new file mode 100644 index 000000000..45ba378db --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/orphans.de.po @@ -0,0 +1,60 @@ +# German translation of directives/ikiwiki/directive/orphans page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:04+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `orphans` directive is supplied by the [[!iki plugins/orphans " +"desc=orphans]] plugin." +msgstr "" +"Die `orphans`-Anweisung wird durch die [[!iki plugins/orphans " +"desc=orphans]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive generates a list of possibly orphaned pages -- pages that no " +"other page links to. Example:" +msgstr "" +"Diese Anweisung erzeugt eine Liste von möglicherweise verwaisten Seiten " +"– Seiten auf die von keiner anderen aus verlinkt wird. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!orphans pages=\"* and !blog/*\"]]\n" +msgstr "\t\\[[!orphans pages=\"* and !blog/*\"]]\n" + +#. type: Plain text +msgid "" +"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying " +"the pages to check for orphans, default is search them all." +msgstr "" +"Im optionalen Parameter `pages` kann durch eine [[ikiwiki/PageSpec]] " +"angegeben werden, welche Seiten auf Verwaistheit überprüft werden. In der " +"Voreinstellung werden alle geprüft." + +#. type: Plain text +msgid "" +"Note that it takes backlinks into account, but does not count inlining a " +"page as linking to it, so will generally count many blog-type pages as " +"orphans." +msgstr "" +"Dabei werden backlinks berücksichtigt, nicht aber Einbetten mit [[inline]]. " +"Viele blogartige Seiten werden also als Waisen eingestuft werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/pagecount.de.po b/po/underlays/directives/ikiwiki/directive/pagecount.de.po new file mode 100644 index 000000000..63aa98db5 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/pagecount.de.po @@ -0,0 +1,48 @@ +# German translation of directives/ikiwiki/directive/pagecount page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:05+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `pagecount` directive is supplied by the [[!iki plugins/pagecount " +"desc=pagecount]] plugin." +msgstr "" +"Die `pagecount`-Anweisung wird durch die [[!iki plugins/pagecount " +"desc=pagecount]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive counts pages currently in the wiki. Example:" +msgstr "" +"Diese Anweisung zählt die Seiten, die es gerade im Wiki gibt. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagecount pages=\"*\"]]\n" +msgstr "\t\\[[!pagecount pages=\"*\"]]\n" + +#. type: Plain text +msgid "" +"The optional parameter \"pages\" can be a [[ikiwiki/PageSpec]] specifying " +"the pages to count, default is to count them all." +msgstr "" +"Im optionalen Parameter `pages` kann mit einer [[ikiwiki/PageSpec]] " +"angegeben werden, welche Seiten gezählt werden sollen, ein der " +"Voreinstellung werden alle gezählt." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/pagestats.de.po b/po/underlays/directives/ikiwiki/directive/pagestats.de.po new file mode 100644 index 000000000..427f273ed --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/pagestats.de.po @@ -0,0 +1,99 @@ +# German translation of directives/ikiwiki/directive/pagestats page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:05+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `pagestats` directive is supplied by the [[!iki plugins/pagestats " +"desc=pagestats]] plugin." +msgstr "" +"Die `pagestats`-Anweisung wird durch die [[!iki plugins/pagestats " +"desc=pagestats]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive can generate stats about how pages link to each other. It can " +"produce either a tag cloud, or a table counting the number of links to each " +"page." +msgstr "" +"Diese Anweisung kann Statistiken darüber erzeugen, wie Seiten aufeinander " +"verlinken. Sie kann entweder eine Tag-Wolke erzeugen oder eine Tabelle mit " +"den Häufigkeiten, wie oft auf die einzelnen Seiten verwiesen wurde." + +#. type: Plain text +msgid "Here's how to use it to create a [[tag]] cloud:" +msgstr "So kann eine [[tag]]-Wolke erzeugt werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats pages=\"tags/*\"]]\n" +msgstr "\t\\[[!pagestats pages=\"tags/*\"]]\n" + +#. type: Plain text +msgid "And here's how to create a table of all the pages on the wiki:" +msgstr "Und so kann eine Tabelle mit allen Seiten im Wiki erzeugt werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats style=\"table\"]]\n" +msgstr "\t\\[[!pagestats style=\"table\"]]\n" + +#. type: Plain text +msgid "" +"The optional `among` parameter limits the pages whose outgoing links are " +"considered. For instance, to display a cloud of tags used on blog entries, " +"while ignoring other pages that use those tags, you could use:" +msgstr "" +"Der optionale Parameter `among` beschränkt die Seiten, deren ausgehende " +"Links berücksichtigt werden. Zum Beispiel kann folgendermaßen eine Tag-Wolke " +"erzeugt werden, die nur Vorkommen in Blogeinträgen berücksichtigt:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n" +msgstr "\t\\[[!pagestats pages=\"tags/*\" among=\"blog/posts/*\"]]\n" + +#. type: Plain text +msgid "Or to display a cloud of tags related to Linux, you could use:" +msgstr "Oder um eine Wolke mit Tags anzuzeigen, die mit Linux verwandt sind:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" " +"among=\"tagged(linux)\"]]\n" +msgstr "" +"\t\\[[!pagestats pages=\"tags/* and not tags/linux\" " +"among=\"tagged(linux)\"]]\n" + +#. type: Plain text +msgid "" +"The optional `show` parameter limits display to the specified number of " +"pages. For instance, to show a table of the top ten pages with the most " +"links:" +msgstr "" +"Der optionale Parameter `show` zeigt nur die angegebene Anzahl von Seiten an." +" Zum Beispiel kann man eine Tabelle mit den zehn häufigsten Links anzeigen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n" +msgstr "\t\\[[!pagestats style=\"table\" show=\"10\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po new file mode 100644 index 000000000..8fddac168 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/pagetemplate.de.po @@ -0,0 +1,64 @@ +# German translation of directives/ikiwiki/directive/pagetemplate page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:05+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `pagetemplate` directive is supplied by the [[!iki plugins/pagetemplate " +"desc=pagetemplate]] plugin." +msgstr "" +"Die `pagetemplate`-Anweisung wird durch die [[!iki plugins/pagetemplate " +"desc=pagetemplate]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows a page to be displayed using a different template than " +"the default `page.tmpl` template." +msgstr "" +"Diese Anweisung erlaubt es, für eine Seite eine andere als die " +"voreingestellte Vorlage `page.tmpl` zu verwenden." + +#. type: Plain text +msgid "" +"The page text is inserted into the template, so the template controls the " +"overall look and feel of the wiki page. This is in contrast to the " +"[[ikiwiki/directive/template]] directive, which allows inserting templates " +"_into_ the body of a page." +msgstr "" +"Der Seiteninhalt wird in die Vorlage eingefügt, die Vorlage steuert also das " +"allgemeine Erscheinungsbild der Seite. Im Gegensatz dazu erlaubt die " +"[[ikiwiki/directive/template]]-Anweisung, Vorlagen _in_ den Text einer Seite " +"einzufügen." + +#. type: Plain text +msgid "" +"This directive can only reference templates that are already installed by " +"the system administrator, typically into the `/usr/share/ikiwiki/templates` " +"directory. Example:" +msgstr "" +"Diese Anweisung kann nur auf Vorlagen zurückgreifen, die bereits durch den " +"Systemadministrator installiert wurden, typischerweise im Verzeichnis " +"`/usr/share/ikiwiki/templates`. Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n" +msgstr "\t\\[[!pagetemplate template=\"my_fancy.tmpl\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/paste.de.po b/po/underlays/directives/ikiwiki/directive/paste.de.po new file mode 100644 index 000000000..48a08bf29 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/paste.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/paste page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-13 23:32+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/cutpaste]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/ping.de.po b/po/underlays/directives/ikiwiki/directive/ping.de.po new file mode 100644 index 000000000..364813bb5 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/ping.de.po @@ -0,0 +1,69 @@ +# German translation of directives/ikiwiki/directive/ping page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:06+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `ping` directive is supplied by the [[!iki plugins/pinger desc=pinger]] " +"plugin." +msgstr "" +"Die `ping`-Anweisung wird durch die [[!iki plugins/pinger " +"desc=pinger]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows ikiwiki to be configured to hit a URL each time it " +"updates the wiki. One way to use this is in conjunction with the [[!iki " +"plugins/pingee desc=pingee]] plugin to set up a loosely coupled mirror " +"network, or a branched version of a wiki. By pinging the mirror or branch " +"each time the main wiki changes, it can be kept up-to-date." +msgstr "" +"Diese Anweisung erlaubt es ikiwiki so zu konfigurieren, dass eine bestimmte " +"URL jedes mal aufgerufen wird, wenn das Wiki aktualisiert wird. Dies kann " +"in Kombination mit der [[!iki plugins/pingee desc=pingee]]-Erweiterung dazu " +"verwendet werden, ein eng gekoppeltes Netzwerk mit gespiegelten oder " +"abgeleiteten Wikis einzurichten. Durch das Anpingen kann bei jeder Änderung " +"der Spiegel oder das abgeleitete Wiki aktuell gehalten werden." + +#. type: Plain text +#, no-wrap +msgid "" +" \\[[!ping from=\"http://mywiki.com/\"\n" +" to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n" +msgstr "" +" \\[[!ping from=\"http://mywiki.com/\"\n" +" to=\"http://otherwiki.com/ikiwiki.cgi?do=ping\"]]\n" + +#. type: Plain text +msgid "" +"The \"from\" parameter must be identical to the url of the wiki that is " +"doing the pinging. This is used to prevent ping loops." +msgstr "" +"Der Parameter `from` muss identisch zur URL des Wikis sein, dass den Ping " +"durchführt. Dies wird verwendet, um Schleifen zu verhindern." + +#. type: Plain text +msgid "" +"The \"to\" parameter is the url to ping. The example shows how to ping " +"another ikiwiki instance." +msgstr "" +"Der Parameter `to` ist die URL, die aufgerufen werden soll. Das Beispiel " +"zeigt, wie eine andere ikiwiki-Instanz angepingt werden kann." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/poll.de.po b/po/underlays/directives/ikiwiki/directive/poll.de.po new file mode 100644 index 000000000..1a4e6b5c4 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/poll.de.po @@ -0,0 +1,87 @@ +# German translation of directives/ikiwiki/directive/poll page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:06+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `poll` directive is supplied by the [[!iki plugins/poll desc=poll]] " +"plugin." +msgstr "" +"Die `poll`-Anweisung wird durch die [[!iki plugins/poll desc=poll]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows you to create online polls in the wiki. Here's an " +"example use:" +msgstr "" +"Diese Anweisung erlaubt es, Online-Umfragen im Wiki durchzuführen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n" +msgstr "\t\\[[!poll 0 \"red\" 0 \"green\" 0 \"blue\"]]\n" + +#. type: Plain text +msgid "" +"The numbers indicate how many users voted for that choice. When a user votes " +"for a choice in the poll, the page is modified and the number incremented." +msgstr "" +"Die Zahlen geben an, wie viele Benutzer für diese Möglichkeit gestimmt haben. " +"Wenn ein Benutzer seine Stimme abgibt, wird die Seite modifiziert und die " +"entsprechende Zahl hochgezählt." + +#. type: Plain text +msgid "" +"While some basic precautions are taken to prevent users from accidentially " +"voting twice, this sort of poll should not be counted on to be very " +"accurate; all the usual concerns about web based polling apply. Unless the " +"page that the poll is in is locked, users can even edit the page and change " +"the numbers!" +msgstr "" +"Obwohl einige einfache Vorsichtsmaßnahmen getroffen wurden, damit Benutzer nicht " +"ausversehen mehrmals abstimmen, sollte diese Art Umfrage nicht als besonders " +"verlässlich angesehen werden; alle üblichen Bedenken bezüglich webbasierten " +"Abstimmungen treffen zu. Wenn die Seite mit der Abstimmung nicht zum Bearbeiten " +"gesperrt ist, können Benutzer sogar direkt die Zahlen verändern!" + +#. type: Plain text +msgid "Parameters:" +msgstr "Parameter:" + +#. type: Bullet: '* ' +msgid "" +"`open` - Whether voting is still open. Set to \"no\" to close the poll to " +"voting." +msgstr "" +"`open` - Ob die Abstimmung noch offen ist. Beim Wert `no` werden keine weiteren " +"Stimmen angenommen." + +#. type: Bullet: '* ' +msgid "`total` - Show total number of votes at bottom of poll. Default is \"yes\"." +msgstr "" +"`total` - Zeige die bisherige Anzahl der Stimmen unterhalb des " +"Abstimmungsformulars an. Voreingestellt ist `yes`." + +#. type: Bullet: '* ' +msgid "`percent` - Whether to display percents. Default is \"yes\"." +msgstr "" +"`percent` - Ob Prozentzahlen angezeigt werden sollen. Voreingestellt ist `yes`." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/polygen.de.po b/po/underlays/directives/ikiwiki/directive/polygen.de.po new file mode 100644 index 000000000..8b7f46557 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/polygen.de.po @@ -0,0 +1,50 @@ +# German translation of directives/ikiwiki/directive/polygen page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:06+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `polygen` directive is supplied by the [[!iki plugins/polygen " +"desc=polygen]] plugin." +msgstr "" +"Die `polygen`-Anweisung wird durch die [[!iki plugins/polygen " +"desc=polygen]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows inserting text generated by polygen into a wiki page. " +"For example:" +msgstr "" +"Diese Anweisung erlaubt es, durch *polygen* erzeugten Text in eine " +"Wiki-Seite einzubinden. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!polygen grammar=\"genius\"]]\n" +msgstr "\t\\[[!polygen grammar=\"genius\"]]\n" + +#. type: Plain text +msgid "" +"It's also possible to specify a starting nonterminal for the grammar by " +"including `symbol=\"text\"` in the directive." +msgstr "" +"Es ist auch möglich, ein Start-Nichtterminal für die Grammatik anzugeben, " +"indem `symbol=\"text\"` mit in der Anweisung angegeben wird." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/postsparkline.de.po b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po new file mode 100644 index 000000000..140774bcc --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/postsparkline.de.po @@ -0,0 +1,149 @@ +# German translation of directives/ikiwiki/directive/postsparkline page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:07+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `postsparkline` directive is supplied by the [[!iki " +"plugins/postsparkline desc=postsparkline]] plugin." +msgstr "" +"Die `postsparkline`-Anweisung wird durch die [[!iki " +"plugins/postsparkline desc=postsparkline]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive uses the [[!iki plugins/sparkline desc=sparkline]] plugin to " +"create a [[sparkline]] of statistics about a set of pages, such as posts to " +"a blog." +msgstr "" +"Diese Anweisung verwendet die [[!iki plugins/sparkline " +"desc=sparkline]]-Erweiterung, um eine [[sparkline]] mit Statistiken über " +"bestimmte Seiten anzuzeigen, etwa über Einträge in einem Blog." + +#. type: Title # +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, no-wrap +msgid "" +"\tPost interval: \n" +"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n" +"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n" +msgstr "" +"\tIntervall der Einträge: \n" +"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=100\n" +"\tformula=interval style=bar barwidth=2 barspacing=1 height=13]]\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tPosts per month this year: \n" +"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n" +"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n" +msgstr "" +"\tEinträge pro Monat in diesem Jahr: \n" +"\t\\[[!postsparkline pages=\"blog/* and !*/Discussion\" max=12\n" +"\tformula=permonth style=bar barwidth=2 barspacing=1 height=13]]\n" + +#. type: Title # +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"All options aside from the `pages`, `max`, `formula`, `time`, and `color` " +"options are the same as in [[sparkline]] directive." +msgstr "" +"Alle Parameter außer `pages`, `max`, `formula`, `time` und `color` sind die " +"gleichen wie in der [[sparkline]]-Anweisung." + +#. type: Plain text +msgid "" +"You don't need to specify any data points (though you can if you want to). " +"Instead, data points are automatically generated based on the creation times " +"of pages matched by the specified `pages` [[ikiwiki/PageSpec]]. A maximum of " +"`max` data points will be generated." +msgstr "" +"Es müssen keine Datenpunkte angegeben werden (auch wenn dies möglich ist). " +"Stattdessen werden die Datenpunkte ausgehend vom Erstellungsdatum der durch " +"`pages` angegebenen Seiten (eine [[ikiwiki/PageSpec]]) automatisch generiert." +" Es werden höchstens `max` Datenpunkte erzeugt." + +#. type: Plain text +msgid "" +"The `formula` parameter controls the formula used to generate data points. " +"Available formulae:" +msgstr "" +"Der Parameter `formula` steuert die Formel, mit der die Datenpunkte erzeugt " +"werden. Verfügbare Formeln:" + +#. type: Bullet: '* ' +msgid "" +"`interval` - The height of each point represents how long it has been since " +"the previous post." +msgstr "" +"`interval` - Die Höhe jedes Punkts steht für den zeitlichen Abstand zum " +"vorherigen Eintrag." + +#. type: Bullet: '* ' +msgid "" +"`perday` - Each point represents a day; the height represents how many posts " +"were made that day." +msgstr "" +"`perday` - Jeder Punkt entspricht einem Tag; die Höhe stellt die Anzahl der " +"an diesem Tag gemachten Einträge dar." + +#. type: Bullet: '* ' +msgid "" +"`permonth` - Each point represents a month; the height represents how many " +"posts were made that month." +msgstr "" +"`permonth` - Jeder Punkt entspricht einem Monat; die Höhe stellt die Anzahl " +"der in diesem Monat gemachten Einträge dar." + +#. type: Bullet: '* ' +msgid "" +"`peryear` - Each point represents a year; the height represents how many " +"posts were made that year." +msgstr "" +"`peryear` - Jeder Punkt entspricht einem Jahr; die Höhe stellt die Anzahl " +"der in diesem Jahr gemachten Einträge dar." + +#. type: Plain text +msgid "" +"The `time` parameter has a default value of \"ctime\", since formulae use " +"the creation times of pages by default. If you instead want them to use the " +"modification times of pages, set it to \"mtime\"." +msgstr "" +"Der Parameter `time` hat standardmäßig den Wert `ctime` und es werden die " +"Erstellungszeiten der Seiten verwendet. Sollen stattdessen die " +"Änderungszeiten verwendet werden, kann `mtime` angegeben werden." + +#. type: Plain text +msgid "" +"To change the color used to draw the sparkline, use the `color` parameter. " +"For example, \"color=red\"." +msgstr "" +"Die Farbe der sparkline kann mit dem Parameter `color` verändert werden, " +"etwa durch `color=red`." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/progress.de.po b/po/underlays/directives/ikiwiki/directive/progress.de.po new file mode 100644 index 000000000..72ad7a134 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/progress.de.po @@ -0,0 +1,68 @@ +# German translation of directives/ikiwiki/directive/progress page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:07+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `progress` directive is supplied by the [[!iki plugins/progress " +"desc=progress]] plugin." +msgstr "" +"Die `progress`-Anweisung wird durch die [[!iki plugins/progress " +"desc=progress]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive generates a progress bar." +msgstr "Diese Anweisung erzeugt einen Fortschrittsbalken." + +#. type: Plain text +msgid "" +"There are two possible parameter sets. The first is a single parameter " +"\"percent\" which holds a percentage figure of how complete the progress bar " +"is." +msgstr "" +"Es gibt zwei mögliche Parameter-Mengen. Die erste besteht aus dem einzelnen " +"Parameter `percent`, der die Prozentzahl enthält, wie vollständig der " +"Fortschrittsbalken ist." + +#. type: Plain text +msgid "" +"The second possible set of parameters is a pair of [[ikiwiki/PageSpec]]s, " +"`totalpages` and `donepages`. The directive counts the number of pages in " +"each pagespec and shows the percentage of the total pages that are done." +msgstr "" +"Die zweite mögliche Parameter-Menge ist ein Paar von [[ikiwiki/PageSpec]]s, " +"`totalpages` und `donepages`. Die Anweisung zählt dann jeweils die passenden " +"Seiten und zeigt an, welcher Anteil der Seiten fertig ist." + +#. type: Plain text +msgid "For example, to show what percentage of pages have discussion pages:" +msgstr "" +"Zum Beispiel kann man anzeigen, welcher Anteil der Seiten eine " +"Diskussionsseite haben:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!progress totalpages=\"* and !*/Discussion\" " +"donepages=\"*/Discussion\"]]\n" +msgstr "" +"\t\\[[!progress totalpages=\"* and !*/Discussion\" " +"donepages=\"*/Discussion\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/shortcut.de.po b/po/underlays/directives/ikiwiki/directive/shortcut.de.po new file mode 100644 index 000000000..7d5616b3f --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/shortcut.de.po @@ -0,0 +1,46 @@ +# German translation of directives/ikiwiki/directive/shortcut page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:07+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `shortcut` directive is supplied by the [[!iki plugins/shortcut " +"desc=shortcut]] plugin." +msgstr "" +"Die `shortcut`-Anweisung wird durch die [[!iki plugins/shortcut " +"desc=shortcut]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows external links to commonly linked to sites to be made " +"more easily using shortcuts." +msgstr "" +"Diese Anweisung erlaubt es, Links auf häufig verwendete externe Seiten " +"einfacher zu setzen." + +#. type: Plain text +msgid "" +"The available shortcuts are defined on the [[shortcuts]] page in the " +"wiki. The `shortcut` directive can only be used on that page." +msgstr "" +"Die verfügbaren Abkürzungen werden im Wiki auf der Seite [[shortcuts]] " +"definiert. Die `shortcut`-Anweisung kann nur auf dieser Seite verwendet " +"werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/sparkline.de.po b/po/underlays/directives/ikiwiki/directive/sparkline.de.po new file mode 100644 index 000000000..f1a5ac44a --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/sparkline.de.po @@ -0,0 +1,178 @@ +# German translation of directives/ikiwiki/directive/sparkline page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:08+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `sparkline` directive is supplied by the [[!iki plugins/sparkline " +"desc=sparkline]] plugin." +msgstr "" +"Die `sparkline`-Anweisung wird durch die [[!iki plugins/sparkline " +"desc=sparkline]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows for embedding sparklines into wiki pages. A sparkline " +"is a small word-size graphic chart, that is designed to be displayed " +"alongside text." +msgstr "" +"Diese Anweisung erlaubt es, sparklines in Wiki-Seiten einzubetten. Eine " +"sparkline ist eine kleine Graphik, die so groß wie ein Wort ist und sich " +"deshalb zur Anzeige neben Text eignet." + +#. type: Title # +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n" +"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n" +msgstr "" +"\t\\[[!sparkline 1 3 5 -3 10 0 width=40 height=16\n" +"\tfeaturepoint=\"4,-3,red,3\" featurepoint=\"5,10,green,3\"]]\n" + +#. type: Plain text +msgid "" +"This creates a simple line graph, graphing several points. It will be drawn " +"40 pixels wide and 16 pixels high. The high point in the line has a green " +"marker, and the low point has a red marker." +msgstr "" +"Dies erzeugt eine einfache Liniengrafik, die aus mehreren Punkten besteht. " +"Sie wird mit 40 Pixel Breite und 16 Pixel Höhe erzeugt. Der hohe Punkt auf " +"der Linie hat eine grüne Markierung, der niedrige eine rote." + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar " +"barwidth=2\n" +"\tbarspacing=1 height=13]]\n" +msgstr "" +"\t\\[[!sparkline 1 -1(red) 1 -1(red) 1 1 1 -1(red) -1(red) style=bar " +"barwidth=2\n" +"\tbarspacing=1 height=13]]\n" + +#. type: Plain text +msgid "" +"This more complex example generates a bar graph. The bars are 2 pixels " +"wide, and separated by one pixel, and the graph is 13 pixels tall. Width is " +"determined automatically for bar graphs. The points with negative values are " +"colored red, instead of the default black." +msgstr "" +"Dies ist ein komplexeres Beispiel, das eine Balkengrafik erzeugt. Die Balken " +"sind 2 Pixel breit und werden durch ein Pixel getrennt; die Grafik ist 14 " +"Pixel hoch. Die Breite für Balkengrafiken automatisch bestimmt. Punkte mit " +"negativen Werten haben abweichend vom voreingestellten Schwarz die Farbe rot." + +#. type: Title # +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Plain text +msgid "" +"The form for the data points is \"x,y\", or just \"y\" if the x values don't " +"matter. Bar graphs can also add \"(color)\" to specify a color for that bar." +msgstr "" +"Die Form für Datenpunkte ist `x,y`, oder einfach nur `y`, wenn die x-Werte " +"unerheblich sind. Balkengrafiken können auch `(color)` hinzufügen, um eine " +"Farbe für den Balken anzugeben." + +#. type: Plain text +msgid "" +"The following named parameters are recognised. Most of these are the same as " +"those used by the underlying sparkline library, which is documented in more " +"detail in [its wiki](http://sparkline.wikispaces.com/usage)." +msgstr "" +"Die folgenden benannten Parameter werden erkannt. Die meisten entsprechen " +"denen der zugrundeliegenden sparkline-Bibliothek, die [in ihrem " +"Wiki](http://sparkline.wikispaces.com/usage) genauer beschrieben wird." + +#. type: Bullet: '* ' +msgid "`style` - Either \"line\" (the default) or \"bar\"." +msgstr "`style` - Entweder `line` (die Voreinstellung) oder `bar`." + +#. type: Bullet: '* ' +msgid "`width` - Width of the graph in pixels. Only needed for line graphs." +msgstr "" +"`width` - Die Breite der Grafik in Pixeln. Wird nur für Linien-Grafiken " +"benötigt." + +#. type: Bullet: '* ' +msgid "`height` - Height of the graph in pixels. Defaults to 16." +msgstr "`height` - Höhe des Grafen in Pixeln. Voreingestellt sind 16." + +#. type: Bullet: '* ' +msgid "`barwidth` - Width of bars in a bar graph. Default is 1 pixel." +msgstr "" +"`barwidth` - Breite der Balken in einer Balkengrafik. Voreingestellt ist 1 " +"Pixel." + +#. type: Bullet: '* ' +msgid "" +"`barspacing` - Spacing between bars in a bar graph, in pixels. Default is 1 " +"pixel." +msgstr "" +"`barspacing` - Abstand zwischen den Balken einer Balkengrafik in Pixeln. " +"Voreingestellt ist 1 Pixel." + +#. type: Bullet: '* ' +msgid "" +"`ymin`, `ymax` - Minimum and maximum values for the Y axis. This is normally " +"calculated automatically, but can be explicitly specified to get the same " +"values for multiple related graphs." +msgstr "" +"`ymin`, `ymax` - Minimaler und maximaler Wert für die y-Achse. Dies wird " +"normalerweise automatisch berechnet, kann aber auch explizit angegeben " +"werden, um mehrere verwandte Grafiken zu erhalten." + +#. type: Bullet: '* ' +msgid "" +"`featurepoint` - Adds a circular marker to a line graph, with optional " +"text. This can be used to label significant points." +msgstr "" +"`featurepoint` - Fügt eine kreisförmige Markierung zu einer Liniengrafik " +"hinzu, mit optionalem Text. So können bedeutsame Punkte beschriftet werden." + +#. type: Plain text +#, no-wrap +msgid "" +" The value is a comma-delimited list of parameters specifying the feature\n" +" point: X value, Y value, color name, circle diameter, text (optional),\n" +" and text location (optional). Example: `featurepoint=\"3,5,blue,3\"`\n" +msgstr "" +" Der Wert ist eine Komma-separierte Liste von Parametern, die den\n" +" hervorzuhebenden Punkt angeben: x-Wert, y-Wert, Farbname,\n" +" Kreisdurchmesser, Text (optional) und Platzierung des Textes (optional).\n" +" Beispiel: `featurepoint=\"3,5,blue,3\"`\n" + +#. type: Plain text +#, no-wrap +msgid "" +" Available values for the text location are: \"top\", \"right\", " +"\"bottom\", and\n" +" \"left\".\n" +msgstr "" +" Verfügbare Werte für die Platzierung des Textes sind `top`,\n" +" `right`, `bottom` und `left`.\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/table.de.po b/po/underlays/directives/ikiwiki/directive/table.de.po new file mode 100644 index 000000000..414bfc68c --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/table.de.po @@ -0,0 +1,147 @@ +# German translation of directives/ikiwiki/directive/table page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:08+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `table` directive is supplied by the [[!iki plugins/table desc=table]] " +"plugin." +msgstr "" +"Die `table`-Anweisung wird durch die [[!iki plugins/table " +"desc=table]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive can build HTML tables from data in CSV (comma-separated " +"values) or DSV (delimiter-separated values) format." +msgstr "" +"Diese Anweisung kann HTML-Tabellen aus Daten im CSV-Format (Komma-separierte " +"Werte) oder DSV-Format (Trennzeichen-separierte Werte) erzeugen." + +#. type: Title ## +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#: +#, no-wrap +msgid "\t\\[[!table data=\"\"\"\n" +msgstr "\t\\[[!table data=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tCustomer|Amount\n" +"\tFulanito|134,34\n" +"\tMenganito|234,56\n" +"\tMenganito|234,56\n" +msgstr "" +"\tKunde|Betrag\n" +"\tFulanito|134,34\n" +"\tMenganito|234,56\n" +"\tMenganito|234,56\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!table class=\"book_record\" format=csv " +"file=\"data/books/record1\"]]\n" +msgstr "" +"\t\\[[!table class=\"book_record\" format=csv " +"file=\"data/books/record1\"]]\n" + +#. type: Plain text +msgid "In this second example the `record1` page should be similar to:" +msgstr "" +"Im zweiten Beispiel sollte die `record1`-Seite ähnlich wie das Folgende " +"aussehen:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\"Title\",\"Perl Best Practices\"\n" +"\t\"Author\",\"Damian Conway\"\n" +"\t\"Publisher\",\"O’Reilly\"\n" +msgstr "" +"\t\"Title\",\"Perl Best Practices\"\n" +"\t\"Author\",\"Damian Conway\"\n" +"\t\"Publisher\",\"O’Reilly\"\n" + +#. type: Plain text +msgid "" +"To make a cell span multiple columns, follow it with one or more empty " +"cells. For example:" +msgstr "" +"Um eine Zelle zu erhalten, die über mehrere Spalten geht, kann man die " +"folgenden Zellen leer lassen. Zum Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\tleft||right|\n" +"\ta|b|c|d\n" +"\tthis cell spans 4 columns|||\n" +msgstr "" +"\tlinks||rechts|\n" +"\ta|b|c|d\n" +"\tdiese Zelle geht über 4 Spalten|||\n" + +#. type: Title ## +#, no-wrap +msgid "usage" +msgstr "Verwendung" + +#. type: Bullet: '* ' +msgid "`data` - Values for the table." +msgstr "`data` - Werte für die Tabelle." + +#. type: Bullet: '* ' +msgid "`file` - A file in the wiki containing the data." +msgstr "`file` - Eine Datei im Wiki, die die Daten enthält." + +#. type: Bullet: '* ' +msgid "" +"`format` - The format of the data, either \"csv\", \"dsv\", or \"auto\" (the " +"default)." +msgstr "" +"`format` - Das Format der Daten, entweder `csv`, `dsv` oder `auto` " +"(letzteres ist voreingestellt)." + +#. type: Plain text +#, no-wrap +msgid "" +"* `delimiter` - The character used to separate fields. By default,\n" +" DSV format uses a pipe (`|`), and CSV uses a comma (`,`).\n" +"* `class` - A CSS class for the table html element.\n" +"* `header` - By default, or if set to \"row\", the first data line is used\n" +" as the table header. Set it to \"no\" to make a table without a header, " +"or\n" +" \"column\" to make the first column be the header.\n" +msgstr "" +"* `delimiter` - Das Zeichen, durch das die Zellen getrennt werden.\n" +" Im DSV-Format ist der senkrechte Strich (`|`) voreingestellt, im\n" +" CSV-Format das Komma (`,`).\n" +"* `class` - Eine CSS-Klasse für das HTML-Element <table>.\n" +"* `header` - In der Voreinstellung, oder wenn `row` angegeben wird,\n" +" wird die erste Zeile der Daten als Tabellenüberschrift verwendet.\n" +" Mit `no` wird eine Tabelle ohne Überschrift erzeugt, mit `column`\n" +" wird die erste Spalte als Überschrift verwendet.\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/tag.de.po b/po/underlays/directives/ikiwiki/directive/tag.de.po new file mode 100644 index 000000000..226900b59 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/tag.de.po @@ -0,0 +1,112 @@ +# German translation of directives/ikiwiki/directive/tag page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:08+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `tag` and `taglink` directives are supplied by the [[!iki plugins/tag " +"desc=tag]] plugin." +msgstr "" +"Die `tag`- und `taglink`-Anweisungen werden durch die [[!iki plugins/tag " +"desc=tag]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "These directives allow tagging pages. List tags as follows:" +msgstr "" +"Diese Anweisungen erlauben es, Seiten mit einer Markierung (englisch *tag*) " +"zu versehen. Diese werden wie folgt angegeben:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!tag tech life linux]]\n" +msgstr "\t\\[[!tag tech life linux]]\n" + +#. type: Plain text +msgid "" +"The tags work the same as if you had put a (hidden) [[ikiwiki/WikiLink]] on " +"the page for each tag, so you can use a [[ikiwiki/PageSpec]] match all pages " +"that are tagged with a given tag, for example. The tags will also show up on " +"blog entries and at the bottom of the tagged pages, as well as in RSS and " +"Atom feeds." +msgstr "" +"Die Markierungen verhalten sich genauso, wie wenn ein (versteckter) " +"[[ikiwiki/WikiLink]] für jede Markierung vorhanden wäre. Man kann also zum " +"Beispiel eine [[ikiwiki/PageSpec]] verwenden, um alle Seiten zu erfassen, " +"die eine bestimmte Markierung tragen. In Blogeinträgen werden die " +"Markierungen auch am Ende der markierten Seiten und in RSS- und Atom-Feeds " +"angezeigt." + +#. type: Plain text +msgid "" +"If you want a visible [[ikiwiki/WikiLink]] along with the tag, use taglink " +"instead:" +msgstr "" +"Wenn gleichzeitig mit dem Tag ein sichtbarer [[ikiwiki/WikiLink]] erzeugt " +"werden soll, kann stattdessen `taglink` verwendet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!taglink foo]]\n" +"\t\\[[!taglink tagged_as_foo|foo]]\n" +msgstr "" +"\t\\[[!taglink foo]]\n" +"\t\\[[!taglink markiert_als_foo|foo]]\n" + +#. type: Plain text +msgid "" +"Note that if the wiki is configured to use a tagbase, then the tags will be " +"located under a base directory, such as \"tags/\". This is a useful way to " +"avoid having to write the full path to tags, if you want to keep them " +"grouped together out of the way." +msgstr "" +"Wenn im Wiki eine zu verwendende `tagbase` konfiguriert ist, tauchen die " +"Markierungen unterhalb dieses Verzeichnisses auf, etwa unter \"tags/\". Auf " +"diese Weise muss man nicht den kompletten Pfad zu den Markierungen angeben, " +"wenn man sie gruppieren und getrennt von den restlichen Seiten halten will." + +#. type: Plain text +msgid "" +"Bear in mind that specifying a tagbase means you will need to incorporate it " +"into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is " +"`tag`, you would match pages tagged \"foo\" with `link(tag/foo)`." +msgstr "" +"In der `link()`-[[ikiwiki/PageSpec]] muss diese `tagbase` allerdings " +"angegeben werden. Wenn zum Beispiel `tag` als `tagbase` verwendet wird, " +"können die mit \"foo\" markierten Seiten durch `link(tag/foo)` ausgewählt " +"werden." + +#. type: Plain text +msgid "" +"If you want to override the tagbase for a particular tag, you can use " +"something like this:" +msgstr "" +"Wenn für eine einzelne Markierung eine abweichende `tagbase` verwendet " +"werden soll, kann etwas wie das Folgende verwendet werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!tag ./foo]]\n" +"\t\\[[!taglink /foo]]\n" +msgstr "" +"\t\\[[!tag ./foo]]\n" +"\t\\[[!taglink /foo]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/taglink.de.po b/po/underlays/directives/ikiwiki/directive/taglink.de.po new file mode 100644 index 000000000..769347eeb --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/taglink.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/taglink page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 11:31+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/tag]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/tag]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/template.de.po b/po/underlays/directives/ikiwiki/directive/template.de.po new file mode 100644 index 000000000..a153cfc94 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/template.de.po @@ -0,0 +1,71 @@ +# German translation of directives/ikiwiki/directive/template page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:09+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `template` directive is supplied by the [[!iki plugins/template " +"desc=template]] plugin." +msgstr "" +"Die `template`-Anweisung wird durch die [[!iki plugins/template " +"desc=template]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"[[Templates]] are files that can be filled out and inserted into pages in " +"the wiki, by using the template directive. The directive has an `id` " +"parameter that identifies the template to use. The remaining parameters are " +"used to fill out the template." +msgstr "" +"[[Vorlagen|templates]] sind Dateien, die ausgefüllt und in Wiki-Seiten " +"eingefügt werden können, indem die template-Anweisung verwendet wird. Die " +"Anweisung hat einen `id`-Parameter, der die zu verwendende Vorlage " +"identifiziert. Die restlichen Parameter werden verwendet, um die Vorlage " +"auszufüllen." + +#. type: Plain text +msgid "Example:" +msgstr "Beispiel:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!template id=note text=\"\"\"Here is the text to insert into my " +"note.\"\"\"]]\n" +msgstr "" +"\t\\[[!template id=note text=\"\"\"Hier ist der Text, der in meine Notiz " +"eingefügt werden soll.\"\"\"]]\n" + +#. type: Plain text +msgid "" +"This fills out the `note` template, filling in the `text` field with the " +"specified value, and inserts the result into the page." +msgstr "" +"Dies füllt die Vorlage `note` aus, wobei das Feld `text` mit dem angegebenen " +"Wert gefüllt wird, und fügt das Ergebnis in die Seite ein." + +#. type: Plain text +msgid "" +"For a list of available templates, and details about how to create more, see " +"the [[templates]] page." +msgstr "" +"Auf der [[Vorlagen|templates]]-Seite gibt es eine Liste der verfügbaren " +"Vorlagen und auch eine Anleitung, wie weitere angelegt werden können." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/testpagespec.de.po b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po new file mode 100644 index 000000000..22da164e3 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/testpagespec.de.po @@ -0,0 +1,84 @@ +# German translation of directives/ikiwiki/directive/testpagespec page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:09+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `testpagespec` directive is supplied by the [[!iki plugins/testpagespec " +"desc=testpagespec]] plugin." +msgstr "" +"Die `testpagespec`-Anweisung wird durch die [[!iki plugins/testpagespec " +"desc=testpagespec]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"This directive allows testing a [[ikiwiki/PageSpec]] to see if it matches a " +"page, and to see the part that matches, or causes the match to fail." +msgstr "" +"Mit dieser Anweisung kann geprüft werden, ob eine [[ikiwiki/PageSpec]] auf eine " +"Seite passt. Sie zeigt außerdem an, welcher Teil das Passen oder Nicht-Passen " +"verursacht." + +#. type: Plain text +msgid "Example uses:" +msgstr "Beispiele zur Verwendung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n" +msgstr "" +"\t\\[[!testpagespec pagespec=\"foopage and barpage\" match=\"foopage\"]]\n" + +#. type: Plain text +msgid "" +"This will print out something like \"no match: barpage does not match " +"foopage\", highlighting which part of the [[ikiwiki/PageSpec]] is causing " +"the match to fail." +msgstr "" +"Dies wird etwas wie \"no match: barpage does not match foopage\" anzeigen und " +"damit darauf hinweisen, welcher Teil der [[ikiwiki/PageSpec]] ein Passen " +"verhindert." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n" +msgstr "\t\\[[!testpagespec pagespec=\"foopage or !bar*\" match=\"barpage\"]]\n" + +#. type: Plain text +msgid "" +"This will print out something like \"no match: bar* matches barpage\", since " +"the part of the [[ikiwiki/PageSpec]] that fails is this negated match." +msgstr "" +"Dies wird etwas wie \"no match: bar* matches barpage\" anzeigen, weil der Teil " +"der das Passen verhindert negiert ist." + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n" +msgstr "\t\\[[!testpagespec pagespec=\"foopage or barpage\" match=\"barpage\"]]\n" + +#. type: Plain text +msgid "" +"This will print out something like \"match: barpage matches barpage\", " +"indicating the part of the [[ikiwiki/PageSpec]] that caused it to match." +msgstr "" +"Dies wird etwas wie \"match: barpage matches barpage\" anzeigen und damit " +"angeben, welcher Teil der [[ikiwiki/PageSpec]] passt." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/teximg.de.po b/po/underlays/directives/ikiwiki/directive/teximg.de.po new file mode 100644 index 000000000..f0553e7c9 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/teximg.de.po @@ -0,0 +1,84 @@ +# German translation of directives/ikiwiki/directive/teximg page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:09+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `teximg` directive is supplied by the [[!iki plugins/teximg " +"desc=teximg]] plugin." +msgstr "" +"Die `teximg`-Anweisung wird durch die [[!iki plugins/teximg " +"desc=teximg]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive renders LaTeX formulas into images." +msgstr "Diese Anweisung wandelt LaTeX-Formeln in Bilder um." + +#. type: Title ## +#, no-wrap +msgid "examples" +msgstr "Beispiele" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n" +"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot \\mu \\cdot e^4}{32\\pi^2 " +"\\epsilon_0^2 \\hbar^2 n^2}\" ]]\n" +msgstr "" +"\t\\[[!teximg code=\"\\frac{1}{2}\"]]\n" +"\t\\[[!teximg code=\"E = - \\frac{Z^2 \\cdot \\mu \\cdot e^4}{32\\pi^2 " +"\\epsilon_0^2 \\hbar^2 n^2}\" ]]\n" + +#. type: Plain text +msgid "To scale the image, use height=x:" +msgstr "" +"Um die Größe des Bilds zu verändern, kann `height=y` angegeben werden:" + +#. type: Plain text +#, no-wrap +msgid "" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n" +msgstr "" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"17\"]]\n" +"\t\\[[!teximg code=\"\\frac{1}{2}\" height=\"8\"]]\n" + +#. type: Plain text +msgid "" +"If no height is chosen the default height 12 is used. Valid heights are: 8, " +"9, 10, 11, 12, 14, 17, 20. If another height is entered, the closest " +"available height is used." +msgstr "" +"Wenn keine Höhe angegeben wird, wird 12 verwendet. Zulässige Höhen sind 8, " +"9, 10, 11, 12, 14, 17 und 20. Wird eine andere Höhe angegeben, wird " +"stattdessen die nächste zulässige verwendet." + +#. type: Plain text +msgid "To add an alt text to the image, use alt=\"text\":" +msgstr "" +"Um einen `alt`-Text zu dem Bild hinzuzufügen, kann `alt=\"Text\"` verwendet " +"werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n" +msgstr "\t\\[[!teximg code=\"\\frac{1}{2}\" alt=\"1/2\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/toc.de.po b/po/underlays/directives/ikiwiki/directive/toc.de.po new file mode 100644 index 000000000..c2ddda74c --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/toc.de.po @@ -0,0 +1,85 @@ +# German translation of directives/ikiwiki/directive/toc page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:10+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "The `toc` directive is supplied by the [[!iki plugins/toc desc=toc]] plugin." +msgstr "" +"Die `toc`-Anweisung wird durch die [[!iki plugins/toc desc=toc]]-Erweiterung " +"bereitgestellt." + +#. type: Plain text +msgid "Add a table of contents to a page:" +msgstr "Sie fügt ein Inhaltsverzeichnis in eine Seite ein:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc ]]\n" +msgstr "\t\\[[!toc ]]\n" + +#. type: Plain text +msgid "" +"The table of contents will be automatically generated based on the headers " +"of the page. By default only the largest headers present on the page will be " +"shown; to control how many levels of headers are shown, use the `levels` " +"parameter:" +msgstr "" +"Das Inhaltsverzeichnis wird automatisch ausgehend von den Überschriften der Seite " +"erzeugt. In der Voreinstellung werden nur die größten Überschriften der Seite " +"angezeigt; mit dem Parameter `levels` kann aber die Anzahl der angezeigten " +"Überschriftsebenen gesteuert werden:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc levels=2]]\n" +msgstr "\t\\[[!toc levels=2]]\n" + +#. type: Plain text +msgid "" +"The toc directive will take the level of the first header as the topmost " +"level, even if there are higher levels seen later in the file." +msgstr "" +"Die `toc`-Anweisung verwendet die Ebene der ersten Überschrift als die oberste, " +"selbst wenn es weiter unten in der Datei höhere Überschriften gibt." + +#. type: Plain text +msgid "" +"To create a table of contents that only shows headers starting with a given " +"level, use the `startlevel` parameter. For example, to show only h2 and " +"smaller headers:" +msgstr "" +"Um in einem Inhaltsverzeichnis nur die Überschriften beginnend mit einer " +"bestimmten Ebene anzuzeigen, kann der `startlevel`-Parameter verwendet werden. " +"Zum Beispiel, um nur <h2>- und kleinere Überschriften anzuzeigen:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toc startlevel=2]]\n" +msgstr "\t\\[[!toc startlevel=2]]\n" + +#. type: Plain text +msgid "" +"The table of contents will be created as an ordered list. If you want an " +"unordered list instead, you can change the list-style in your local style " +"sheet." +msgstr "" +"Das Inhaltsverzeichnis wird als nummerierte Liste erzeugt. Um eine ungeordnete " +"Liste zu erhalten, kann `list-style` im lokalen Stylesheet verändert werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/toggle.de.po b/po/underlays/directives/ikiwiki/directive/toggle.de.po new file mode 100644 index 000000000..6c316c5e4 --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/toggle.de.po @@ -0,0 +1,113 @@ +# German translation of directives/ikiwiki/directive/toggle page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:10+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `toggle` and `toggleable` directives are supplied by the [[!iki " +"plugins/toggle desc=toggle]] plugin." +msgstr "" +"Die `toggle`- und `toggleable`-Anweisungen werden durch die [[!iki " +"plugins/toggle desc=toggle]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "" +"With these directives you can create links on pages that, when clicked, " +"toggle display of other parts of the page." +msgstr "" +"Mit diesen Anweisungen kann man auf Seiten Links erstellen, die beim " +"Anklicken andere Teile der Seite anzeigen." + +#. type: Plain text +msgid "" +"It uses javascript to accomplish this; browsers without javascript will " +"always see the full page content." +msgstr "" +"Um dies zu erreichen, wird Javascript verwendet; Browser ohne Javascript " +"sehen immer den kompletten Inhalt." + +#. type: Plain text +msgid "Example use:" +msgstr "Beispiel für die Benutzung:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toggle id=\"ipsum\" text=\"show\"]]\n" +msgstr "\t\\[[!toggle id=\"ipsum\" text=\"anzeigen\"]]\n" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n" +msgstr "\t\\[[!toggleable id=\"ipsum\" text=\"\"\"\n" + +#. type: Plain text +#, no-wrap +msgid "" +"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n" +"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n" +"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n" +"\taliquip ex ea commodo consequat.\n" +msgstr "" +"\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do\n" +"\teiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim\n" +"\tad minim veniam, quis nostrud exercitation ullamco laboris nisi ut\n" +"\taliquip ex ea commodo consequat.\n" + +#. type: Plain text +#, no-wrap +msgid "\t[[!toggle id=\"ipsum\" text=\"hide\"]]\n" +msgstr "\t[[!toggle id=\"ipsum\" text=\"verbergen\"]]\n" + +#. type: Plain text +msgid "" +"Note that you can include wiki markup in the toggleable text, including even " +"additional toggles, as shown in the above example." +msgstr "" +"In dem umschaltbaren Text können beliebige Wiki-Formatierungen verwendet " +"werden, sogar wie im obigen Beispiel weitere `toggle`-Anweisungen." + +#. type: Plain text +msgid "" +"Also, the toggle and the togglable definitions do not need to be next to " +"each other, but can be located anywhere on the page. There can also be " +"mutiple toggles that all toggle a single togglable." +msgstr "" +"Außerdem müssen die Definitionen von `toggle` und `toggleable` nicht " +"nebeneinander stehen, sondern können beliebig über die Seite verteilt werden." +" Es kann auch mehrere `toggle` geben, die das gleiche `toggleable` " +"umschalten." + +#. type: Plain text +msgid "" +"The id has a default value of \"default\", so can be omitted in simple " +"cases." +msgstr "" +"Als `id` ist \"default\" voreingestellt, sodass diese Angabe in einfachen " +"Fällen weggelassen werden kann." + +#. type: Plain text +msgid "" +"If you'd like a toggleable to be displayed by default, and toggle to hidden, " +"then pass a parameter \"open=yes\" when setting up the toggleable." +msgstr "" +"Wenn ein `toggleable` zu Beginn angezeigt werden soll (um es dann verbergen " +"zu können), kann bei seiner Einrichtung der Parameter `open=yes` angegeben " +"werden." + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/directives/ikiwiki/directive/toggleable.de.po b/po/underlays/directives/ikiwiki/directive/toggleable.de.po new file mode 100644 index 000000000..db99bdb5a --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/toggleable.de.po @@ -0,0 +1,25 @@ +# German translation of directives/ikiwiki/directive/toggleable page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 11:52+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta redir=/ikiwiki/directive/toggle]]\n" +msgstr "[[!meta redir=/ikiwiki/directive/toggle]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + diff --git a/po/underlays/directives/ikiwiki/directive/version.de.po b/po/underlays/directives/ikiwiki/directive/version.de.po new file mode 100644 index 000000000..eca114e4c --- /dev/null +++ b/po/underlays/directives/ikiwiki/directive/version.de.po @@ -0,0 +1,50 @@ +# German translation of directives/ikiwiki/directive/version page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-14 14:11+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"The `version` directive is supplied by the [[!iki plugins/version " +"desc=version]] plugin." +msgstr "" +"Die `version`-Anweisung wird durch die [[!iki plugins/version " +"desc=version]]-Erweiterung bereitgestellt." + +#. type: Plain text +msgid "This directive allows inserting the version of ikiwiki onto a page." +msgstr "Diese Anweisung fügt die Version von ikiwiki in eine Seite ein." + +#. type: Plain text +msgid "" +"Whenever ikiwiki is upgraded to a new version, the page will be rebuilt, " +"updating the version number." +msgstr "" +"Immer wenn ikiwiki auf eine neue Version aktualisiert wird, wird diese " +"Seite erneuert, um die Versionsnummer zu aktualisieren." + +#. type: Plain text +msgid "Use is simple:" +msgstr "Die Verwendung ist einfach:" + +#. type: Plain text +#, no-wrap +msgid "\t\\[[!version ]]\n" +msgstr "\t\\[[!version ]]\n" + +#. type: Plain text +#, no-wrap +msgid "[[!meta robots=\"noindex, follow\"]]\n" +msgstr "[[!meta robots=\"noindex, follow\"]]\n" + + diff --git a/po/underlays/smiley/smileys.de.po b/po/underlays/smiley/smileys.de.po new file mode 100644 index 000000000..3da3037f9 --- /dev/null +++ b/po/underlays/smiley/smileys.de.po @@ -0,0 +1,211 @@ +# German translation of smiley/smileys page for ikiwiki. +# Copyright © 2010 Sebastian Kuhnert +# Redistribution and use in source and compiled forms, with or without +# modification, are permitted under any circumstances. No warranty. +msgid "" +msgstr "" +"POT-Creation-Date: 2010-03-12 09:29+0530\n" +"PO-Revision-Date: 2010-03-12 20:57+0530\n" +"Last-Translator: Sebastian Kuhnert \n" +"Language-Team: None\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. type: Plain text +msgid "" +"This page is used to control what smileys are supported by the wiki. Just " +"write the text of a smiley to display it." +msgstr "" +"Diese Seite steuert, welche Smileys von ikiwiki unterstützt werden. " +"Schreibe einfach den Text eines Smileys in den Text, um es anzuzeigen." + +#. type: Bullet: '* ' +msgid "\\\\:)\t[[smileys/smile.png]]" +msgstr "\\\\:)\t[[smileys/smile.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-)\t[[smileys/smile.png]]" +msgstr "\\\\:-)\t[[smileys/smile.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:D\t[[smileys/biggrin.png]]" +msgstr "\\\\:D\t[[smileys/biggrin.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-D\t[[smileys/biggrin.png]]" +msgstr "\\\\:-D\t[[smileys/biggrin.png]]" + +#. type: Bullet: '* ' +msgid "\\\\B)\t[[smileys/smile2.png]]" +msgstr "\\\\B)\t[[smileys/smile2.png]]" + +#. type: Bullet: '* ' +msgid "\\\\B-)\t[[smileys/smile2.png]]" +msgstr "\\\\B-)\t[[smileys/smile2.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:))\t[[smileys/smile3.png]]" +msgstr "\\\\:))\t[[smileys/smile3.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-))\t[[smileys/smile3.png]]" +msgstr "\\\\:-))\t[[smileys/smile3.png]]" + +#. type: Bullet: '* ' +msgid "\\\\;)\t[[smileys/smile4.png]]" +msgstr "\\\\;)\t[[smileys/smile4.png]]" + +#. type: Bullet: '* ' +msgid "\\\\;-)\t[[smileys/smile4.png]]" +msgstr "\\\\;-)\t[[smileys/smile4.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:\\\t[[smileys/ohwell.png]]" +msgstr "\\\\:\\\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-\\\t[[smileys/ohwell.png]]" +msgstr "\\\\:-\\\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:/\t[[smileys/ohwell.png]]" +msgstr "\\\\:/\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-/\t[[smileys/ohwell.png]]" +msgstr "\\\\:-/\t[[smileys/ohwell.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:|\t[[smileys/neutral.png]]" +msgstr "\\\\:|\t[[smileys/neutral.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-|\t[[smileys/neutral.png]]" +msgstr "\\\\:-|\t[[smileys/neutral.png]]" + +#. type: Bullet: '* ' +msgid "\\\\>:>\t[[smileys/devil.png]]" +msgstr "\\\\>:>\t[[smileys/devil.png]]" + +#. type: Bullet: '* ' +msgid "\\\\X-(\t[[smileys/angry.png]]" +msgstr "\\\\X-(\t[[smileys/angry.png]]" + +#. type: Bullet: '* ' +msgid "\\\\<:(\t[[smileys/frown.png]]" +msgstr "\\\\<:(\t[[smileys/frown.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:(\t[[smileys/sad.png]]" +msgstr "\\\\:(\t[[smileys/sad.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-(\t[[smileys/sad.png]]" +msgstr "\\\\:-(\t[[smileys/sad.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-?\t[[smileys/tongue.png]]" +msgstr "\\\\:-?\t[[smileys/tongue.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:-P\t[[smileys/tongue.png]]" +msgstr "\\\\:-P\t[[smileys/tongue.png]]" + +#. type: Bullet: '* ' +msgid "\\\\:o\t[[smileys/redface.png]]" +msgstr "\\\\:o\t[[smileys/redface.png]]" + +#. type: Bullet: '* ' +msgid "\\\\|)\t[[smileys/tired.png]]" +msgstr "\\\\|)\t[[smileys/tired.png]]" + +#. type: Bullet: '* ' +msgid "\\\\|-)\t[[smileys/tired.png]]" +msgstr "\\\\|-)\t[[smileys/tired.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{OK}\t[[smileys/thumbs-up.png]]" +msgstr "\\\\{OK}\t[[smileys/thumbs-up.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{X}\t[[smileys/icon-error.png]]" +msgstr "\\\\{X}\t[[smileys/icon-error.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{i}\t[[smileys/icon-info.png]]" +msgstr "\\\\{i}\t[[smileys/icon-info.png]]" + +#. type: Bullet: '* ' +msgid "\\\\(./)\t[[smileys/checkmark.png]]" +msgstr "\\\\(./)\t[[smileys/checkmark.png]]" + +#. type: Bullet: '* ' +msgid "\\\\(!)\t[[smileys/idea.png]]" +msgstr "\\\\(!)\t[[smileys/idea.png]]" + +#. type: Bullet: '* ' +msgid "\\\\[!]\t[[smileys/attention.png]]" +msgstr "\\\\[!]\t[[smileys/attention.png]]" + +#. type: Bullet: '* ' +msgid "\\\\/!\\\t[[smileys/alert.png]]" +msgstr "\\\\/!\\\t[[smileys/alert.png]]" + +#. type: Bullet: '* ' +msgid "\\\\(?)\t[[smileys/question.png]]" +msgstr "\\\\(?)\t[[smileys/question.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{x}\t[[smileys/star_on.png]]" +msgstr "\\\\{x}\t[[smileys/star_on.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{*}\t[[smileys/star_on.png]]" +msgstr "\\\\{*}\t[[smileys/star_on.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{o}\t[[smileys/star_off.png]]" +msgstr "\\\\{o}\t[[smileys/star_off.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{1}\t[[smileys/prio1.png]]" +msgstr "\\\\{1}\t[[smileys/prio1.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{2}\t[[smileys/prio2.png]]" +msgstr "\\\\{2}\t[[smileys/prio2.png]]" + +#. type: Bullet: '* ' +msgid "\\\\{3}\t[[smileys/prio3.png]]" +msgstr "\\\\{3}\t[[smileys/prio3.png]]" + +#. type: Plain text +msgid "For example: {x} B) {x}" +msgstr "Zum Beispiel: {x} B) {x}" + +#. type: Plain text +msgid "" +"To change the supported smileys, just edit the lists on this page. Note " +"that the format is important; each list item should start with the text that " +"is turned into the smiley, escaped so that users can see what produces it, " +"followed by a [[ikiwiki/WikiLink]] to the image to display." +msgstr "" +"Um die unterstützten Simleys zu verändern, bearbeite einfach diese Seite. " +"Beachte dass das Format wichtig ist: Jeder Eintrag in der Liste sollte mit " +"dem Text zum Anzeige des Smileys beginnen (geschützt sodass Benutzer " +"sehen können, wodurch ein Smiley erzeugt wird), gefolgt von einem " +"[[ikiwiki/WikiLink]] auf das anzuzeigende Bild." + +#. type: Plain text +msgid "" +"/!\\ Bear in mind that the link to the image needs to be written in a way " +"that will work if it's copied to other pages on the wiki. So be sure to " +"include the smileys directory in the path to the file." +msgstr "" +"/!\\ Denke daran, dass der Link auf das Bild so geschrieben sein muss, dass " +"er auch dann funktioniert, wenn er in andere Teile des Wikis kopiert wird. " +"Stelle also sicher, dass das Verzeichnis der Smiley-Datei mit angegeben wird." + + -- cgit v1.2.3 From 823ec815d4fc9625d6fa3553ad03e9f2ff737659 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 14 Mar 2010 14:58:13 -0400 Subject: Add a include setting, which can be used to make ikiwiki process wiki source files, such as .htaccess, that would normally be skipped for security or other reasons. Closes: #447267 (Thanks to Aaron Wilson for the original patch.) --- IkiWiki.pm | 13 +++++++++++++ debian/changelog | 4 ++++ doc/tips/htaccess_file.mdwn | 30 ++++++++++++++++++++++++++++++ doc/todo/enable-htaccess-files.mdwn | 5 +++++ doc/usage.mdwn | 6 ++++++ ikiwiki.in | 3 +++ 6 files changed, 61 insertions(+) create mode 100644 doc/tips/htaccess_file.mdwn (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 251ed8cc8..ee94ce659 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -334,6 +334,15 @@ sub getsetup () { safe => 0, # paranoia rebuild => 0, }, + include => { + type => "string", + default => undef, + example => '^\.htaccess$', + description => "regexp of normally ignored source files to include", + advanced => 1, + safe => 0, # regexp + rebuild => 1, + }, exclude => { type => "string", default => undef, @@ -1820,6 +1829,10 @@ sub file_pruned ($;$) { $file =~ s#^\Q$base\E/+##; } + if (defined $config{include} && length $config{include}) { + return 0 if $file =~ m/$config{include}/; + } + my $regexp='('.join('|', @{$config{wiki_file_prune_regexps}}).')'; return $file =~ m/$regexp/; } diff --git a/debian/changelog b/debian/changelog index 92afe661f..e5347e2a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low as used by yahoo and google urls. * Add complete German basewiki and directives translation done by Sebastian Kuhnert. + * Add a include setting, which can be used to make ikiwiki process + wiki source files, such as .htaccess, that would normally be skipped + for security or other reasons. Closes: #447267 + (Thanks to Aaron Wilson for the original patch.) -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/tips/htaccess_file.mdwn b/doc/tips/htaccess_file.mdwn new file mode 100644 index 000000000..5266eba41 --- /dev/null +++ b/doc/tips/htaccess_file.mdwn @@ -0,0 +1,30 @@ +If you try to include a `.htaccess` file in your wiki's source, in order to +configure the web server, you'll find that ikiwiki excludes it from +processing. In fact, ikiwiki excludes any file starting with a dot, as well +as a lot of other files, for good security reasons. + +You can tell ikiwiki not to exclude the .htaccess file by adding this to +your setup file: + + include => '^\.htaccess$', + +Caution! Before you do that, please think for a minute about who can edit +your wiki. Are attachment uploads enabled? Can users commit changes +directly to the version control system? Do you trust everyone who can +make a change to not do Bad Things with the htaccess file? Do you trust +everyone who *might* be able to make a change in the future? Note that a +determined attacker who can write to the htaccess file can probably get a +shell on your web server. + +If any of these questions have given you pause, I suggest you find a +different way to configure the web server. One way is to not put the +`.htaccess` file under ikiwiki's control, and just manually install it +in the destdir. + +[Apache's documentation](http://httpd.apache.org/docs/1.3/howto/htaccess.html) +says +> In general, you should never use .htaccess files unless you don't have +> access to the main server configuration file. +This is good advice -- if you can edit apache's main configuration files, +then you should not use a htaccess file. +--[[Joey]] diff --git a/doc/todo/enable-htaccess-files.mdwn b/doc/todo/enable-htaccess-files.mdwn index 412cb5eba..c895db75d 100644 --- a/doc/todo/enable-htaccess-files.mdwn +++ b/doc/todo/enable-htaccess-files.mdwn @@ -61,3 +61,8 @@ It should be off by default of course. --Max +1 for various purposes (but sometimes the filename isn't `.htaccess`, so please make it configurable) --[[schmonz]] > I've described a workaround for one use case at the [[plugins/rsync]] [[plugins/rsync/discussion]] page. --[[schmonz]] + +--- + +[[done]], you can use the `include` setting to override the default +excludes now. Please use extreme caution when doing so. --[[Joey]] diff --git a/doc/usage.mdwn b/doc/usage.mdwn index a105d7e59..f735170f0 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -234,6 +234,12 @@ also be configured using a setup file. Specifies a rexexp of source files to exclude from processing. May be specified multiple times to add to exclude list. +* --include regexp + + Specifies a rexexp of source files, that would normally be excluded, + but that you wish to include in processing. + May be specified multiple times to add to include list. + * --adminuser name Specifies a username of a user (or, if openid is enabled, an openid) diff --git a/ikiwiki.in b/ikiwiki.in index ae1251ff6..da5555629 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -65,6 +65,9 @@ sub getconfig () { "exclude=s@" => sub { push @{$config{wiki_file_prune_regexps}}, $_[1]; }, + "include=s@" => sub { + $config{include}=defined $config{include} && length $config{include} ? "$config{include}|$_[1]" : $_[1]; + }, "adminuser=s@" => sub { push @{$config{adminuser}}, $_[1] }, -- cgit v1.2.3 From dddd6aa99055d8505f73e39b12f049633d9cb4c3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 18 Mar 2010 17:44:46 -0400 Subject: Allow wrappers to be built using tcc. --- IkiWiki/Wrapper.pm | 10 +++++++--- debian/changelog | 1 + .../post-update_hook_can__39__t_be_compiled_with_tcc.mdwn | 11 ++++++++--- 3 files changed, 16 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index 830b04877..f175b4a0b 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -101,7 +101,6 @@ EOF #include #include -extern char **environ; char *newenviron[$#envsave+6]; int i=0; @@ -121,8 +120,13 @@ $check_commit_hook $envsave newenviron[i++]="HOME=$ENV{HOME}"; newenviron[i++]="WRAPPED_OPTIONS=$configstring"; - newenviron[i]=NULL; - environ=newenviron; + + if (clearenv() != 0) { + perror("clearenv"); + exit(1); + } + for (; i>0; i--) + putenv(newenviron[i-1]); if (setregid(getegid(), -1) != 0 && setregid(getegid(), -1) != 0) { diff --git a/debian/changelog b/debian/changelog index e5347e2a1..73f6fcff8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low wiki source files, such as .htaccess, that would normally be skipped for security or other reasons. Closes: #447267 (Thanks to Aaron Wilson for the original patch.) + * Allow wrappers to be built using tcc. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn index 4226c026a..a8fb19888 100644 --- a/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn +++ b/doc/bugs/post-update_hook_can__39__t_be_compiled_with_tcc.mdwn @@ -9,6 +9,11 @@ Everything works fine with gcc. versions: Debian lenny + backports - - - +> Seems that tcc does not respect changing where `environ` points as a way +> to change the environment seen after `exec` +> +> Given that the man page for `clearenv` suggests using `environ=NULL` +> if `clearenv` is not available, I would be lerry or using tcc to compile +> stuff, since that could easily lead to a security compromise of code that +> expects that to work. However, I have fixed ikiwiki to use `clearenv`. +> --[[Joey]] [[done]] -- cgit v1.2.3 From bba513a3e52170dc06b545a44f2d859ae4b757b5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 19 Mar 2010 15:50:59 -0400 Subject: Add support for setup files written in YAML. Not the default. (Yet?) --- IkiWiki/Setup/Yaml.pm | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/changelog | 1 + 2 files changed, 44 insertions(+) create mode 100644 IkiWiki/Setup/Yaml.pm (limited to 'debian') diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm new file mode 100644 index 000000000..ba9192faf --- /dev/null +++ b/IkiWiki/Setup/Yaml.pm @@ -0,0 +1,43 @@ +#!/usr/bin/perl + +package IkiWiki::Setup::Yaml; + +use warnings; +use strict; +use IkiWiki; +use YAML; + +sub loaddump ($$) { + my $class=shift; + my $content=shift; + + IkiWiki::Setup::merge(Load($content)); +} + +sub gendump ($@) { + my $class=shift; + + "# IkiWiki::Setup::Yaml - YAML formatted setup file", + "#", + (map { "# $_" } @_), + "#", + IkiWiki::Setup::commented_dump(\&dumpline, "") +} + + +sub dumpline ($$$$) { + my $key=shift; + my $value=shift; + my $type=shift; + my $prefix=shift; + + $YAML::UseHeader=0; + my $dump=Dump({$key => $value}); + chomp $dump; + if (length $prefix) { + $dump=join("", map { $prefix.$_ } split(/\n/, $dump)); + } + return $dump; +} + +1 diff --git a/debian/changelog b/debian/changelog index 73f6fcff8..e020b380f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ikiwiki (3.20100313) UNRELEASED; urgency=low for security or other reasons. Closes: #447267 (Thanks to Aaron Wilson for the original patch.) * Allow wrappers to be built using tcc. + * Add support for setup files written in YAML. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 -- cgit v1.2.3 From 440e18bc15389780833fc8b9c04116a97eeaeaa2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 21 Mar 2010 14:59:21 -0400 Subject: reset setuptype first, actually so setup file can override default --- IkiWiki/Setup/Automator.pm | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm index 9f694e18e..e9a572450 100644 --- a/IkiWiki/Setup/Automator.pm +++ b/IkiWiki/Setup/Automator.pm @@ -38,8 +38,8 @@ sub sanitize_wikiname ($) { sub import (@) { my $this=shift; - IkiWiki::Setup::merge({@_}); $config{setuptype}='Standard'; + IkiWiki::Setup::merge({@_}); if (! $config{force_overwrite}) { # Avoid overwriting any existing files. diff --git a/debian/changelog b/debian/changelog index e020b380f..4d0639a58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100313) UNRELEASED; urgency=low +ikiwiki (3.20100320) UNRELEASED; urgency=low * websetup: Add websetup_unsafe to allow marking other settings as unsafe. -- cgit v1.2.3 From 4415686d0571a33d4ac7b887d1abdc019d398414 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Mar 2010 14:30:54 -0400 Subject: add YAML suggests --- Bundle/IkiWiki/Extras.pm | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm index 48bd127f1..5bbd7b8c6 100644 --- a/Bundle/IkiWiki/Extras.pm +++ b/Bundle/IkiWiki/Extras.pm @@ -35,6 +35,7 @@ Text::WikiCreole Term::ReadLine::Gnu HTML::Tree Sort::Naturally +YAML =head1 AUTHOR diff --git a/debian/control b/debian/control index b20f4db55..24c2c96a5 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, - po4a (>= 0.35-1), gettext + po4a (>= 0.35-1), gettext, libyaml-perl Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table Provides: ikiwiki-plugin-table -- cgit v1.2.3 From c64c4b99626286ee08f67999a18c43c769e21e6a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Mar 2010 14:39:50 -0400 Subject: Add --set-yaml switch for setting more complex config file options. --- debian/changelog | 1 + doc/usage.mdwn | 10 +++++++--- ikiwiki.in | 9 +++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d0639a58..e7499b6f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ ikiwiki (3.20100320) UNRELEASED; urgency=low (Thanks to Aaron Wilson for the original patch.) * Allow wrappers to be built using tcc. * Add support for setup files written in YAML. + * Add --set-yaml switch for setting more complex config file options. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/usage.mdwn b/doc/usage.mdwn index f735170f0..db1e36a10 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -331,9 +331,13 @@ also be configured using a setup file. * --set var=value This allows setting an arbitrary configuration variable, the same as if it - were set via a setup file. Since most options can be configured - using command-line switches, you will rarely need to use this, but it can be - useful for the odd option that lacks a command-line switch. + were set via a setup file. Since most options commonly used options can be + configured using command-line switches, you will rarely need to use this. + +* --set-yaml var=value + + This is like --set, but it allows setting configuration variables that + use complex data structures, by passing in a YAML document. # EXAMPLES diff --git a/ikiwiki.in b/ikiwiki.in index da5555629..7028bdb7d 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -96,6 +96,15 @@ sub getconfig () { } $config{$var}=$val; }, + "set-yaml=s" => sub { + my ($var, $val)=split('=', $_[1], 2); + if (! defined $var || ! defined $val) { + die gettext("usage: --set-yaml var=value"), "\n"; + } + eval q{use YAML::Any}; + die $@ if $@; + $config{$var}=Load($val); + }, "version" => sub { print "ikiwiki version $IkiWiki::version\n"; exit; -- cgit v1.2.3 From eb06a0135511fc5b5422f07ca5344ce114402a61 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 24 Mar 2010 16:12:35 -0400 Subject: use perl YAML for dumping Only it understands $YAML::UseHeader --- IkiWiki/Setup/Yaml.pm | 8 ++++---- debian/changelog | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Setup/Yaml.pm b/IkiWiki/Setup/Yaml.pm index 8ad44eb4a..8b876e297 100644 --- a/IkiWiki/Setup/Yaml.pm +++ b/IkiWiki/Setup/Yaml.pm @@ -19,10 +19,6 @@ sub loaddump ($$) { sub gendump ($@) { my $class=shift; - eval q{use YAML::Any}; - eval q{use YAML} if $@; - die $@ if $@; - "# IkiWiki::Setup::Yaml - YAML formatted setup file", "#", (map { "# $_" } @_), @@ -37,7 +33,11 @@ sub dumpline ($$$$) { my $type=shift; my $prefix=shift; + eval q{use YAML::Old}; + eval q{use YAML} if $@; + die $@ if $@; $YAML::UseHeader=0; + my $dump=Dump({$key => $value}); chomp $dump; if (length $prefix) { diff --git a/debian/changelog b/debian/changelog index e7499b6f2..12dd0dc02 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100320) UNRELEASED; urgency=low +ikiwiki (3.20100324) UNRELEASED; urgency=low * websetup: Add websetup_unsafe to allow marking other settings as unsafe. -- cgit v1.2.3 From 3d671ea8c1df4534d8ffa59b235dd6ded99bb13f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 25 Mar 2010 14:39:09 -0400 Subject: filecheck: Fix bug that prevented the pagespecs from matching when not called by attachment plugin. --- IkiWiki/Plugin/filecheck.pm | 16 ++++++++-------- debian/changelog | 2 ++ doc/bugs/filecheck_failing_to_find_files.mdwn | 5 +++++ 3 files changed, 15 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index 0501ba99c..1549b82db 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -75,9 +75,9 @@ sub match_maxsize ($$;@) { } my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } if (-s $file > $maxsize) { @@ -96,9 +96,9 @@ sub match_minsize ($$;@) { } my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } if (-s $file < $minsize) { @@ -114,9 +114,9 @@ sub match_mimetype ($$;@) { my $wanted=shift; my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } # Use ::magic to get the mime type, the idea is to only trust @@ -147,9 +147,9 @@ sub match_virusfree ($$;@) { my $wanted=shift; my %params=@_; - my $file=exists $params{file} ? $params{file} : $IkiWiki::pagesources{$page}; + my $file=exists $params{file} ? $params{file} : IkiWiki::srcfile($IkiWiki::pagesources{$page}); if (! defined $file) { - return IkiWiki::ErrorReason->new("no file specified"); + return IkiWiki::ErrorReason->new("file does not exist"); } if (! exists $IkiWiki::config{virus_checker} || diff --git a/debian/changelog b/debian/changelog index 12dd0dc02..7249cdfa4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low * Allow wrappers to be built using tcc. * Add support for setup files written in YAML. * Add --set-yaml switch for setting more complex config file options. + * filecheck: Fix bug that prevented the pagespecs from matching when + not called by attachment plugin. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn index be6cdbb20..e896f2129 100644 --- a/doc/bugs/filecheck_failing_to_find_files.mdwn +++ b/doc/bugs/filecheck_failing_to_find_files.mdwn @@ -10,6 +10,11 @@ It turns out that the filecheck plugin couldn't find the file, because it was me >> But if it is given `/path/to/srcdir/foo/bar.gif` instead, then it *can* find the file, and returns the mime-type correctly. >> --[[KathrynAndersen]] +>>> Ok, so it's not removal specific, can in fact be triggered by using +>>> testpagespec (or really anything besides attachment, which passes +>>> the filename parameter). Nor is it limited to mimetype, all the tests in +>>> filecheck have the problem. [[Fixed|done]] --[[Joey]] + The following patch fixes the problem: diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm -- cgit v1.2.3 From 243b0dd082cf4b66dfef55b2c9b459109bee7398 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 26 Mar 2010 00:16:21 -0400 Subject: fix the other half of the filecheck filename bug --- IkiWiki/Plugin/remove.pm | 2 +- IkiWiki/Plugin/rename.pm | 4 ++-- debian/changelog | 2 +- doc/bugs/filecheck_failing_to_find_files.mdwn | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index f59d0269e..0fc180f69 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -49,7 +49,7 @@ sub check_canremove ($$$) { # This is sorta overkill, but better safe than sorry. if (! defined pagetype($pagesources{$page})) { if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + IkiWiki::Plugin::attachment::check_canattach($session, $page, "$config{srcdir}/$file"); } else { error("removal of attachments is not allowed"); diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 3908443ca..1a9da6363 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -50,7 +50,7 @@ sub check_canrename ($$$$$$) { IkiWiki::check_canedit($src, $q, $session); if ($attachment) { if (IkiWiki::Plugin::attachment->can("check_canattach")) { - IkiWiki::Plugin::attachment::check_canattach($session, $src, $srcfile); + IkiWiki::Plugin::attachment::check_canattach($session, $src, "$config{srcdir}/$srcfile"); } else { error("renaming of attachments is not allowed"); @@ -85,7 +85,7 @@ sub check_canrename ($$$$$$) { if ($attachment) { # Note that $srcfile is used here, not $destfile, # because it wants the current file, to check it. - IkiWiki::Plugin::attachment::check_canattach($session, $dest, $srcfile); + IkiWiki::Plugin::attachment::check_canattach($session, $dest, "$config{srcdir}/$srcfile"); } } diff --git a/debian/changelog b/debian/changelog index 7249cdfa4..da1ab890e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,7 +15,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low * Allow wrappers to be built using tcc. * Add support for setup files written in YAML. * Add --set-yaml switch for setting more complex config file options. - * filecheck: Fix bug that prevented the pagespecs from matching when + * filecheck: Fix bugs that prevented the pagespecs from matching when not called by attachment plugin. -- Joey Hess Sat, 13 Mar 2010 14:48:10 -0500 diff --git a/doc/bugs/filecheck_failing_to_find_files.mdwn b/doc/bugs/filecheck_failing_to_find_files.mdwn index f8d8e83e6..6501508e4 100644 --- a/doc/bugs/filecheck_failing_to_find_files.mdwn +++ b/doc/bugs/filecheck_failing_to_find_files.mdwn @@ -25,6 +25,8 @@ It turns out that the filecheck plugin couldn't find the file, because it was me >>>>>> Yes, it works! --[[KathrynAndersen]] +applied && [[done]] +
     diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm
     index f59d026..0fc180f 100644
    -- 
    cgit v1.2.3
    
    
    From 0d524ad672333fd0bafa64e81e261fd297c25580 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Fri, 26 Mar 2010 01:38:53 -0400
    Subject: Fix incorrect influence info returned by a failing link() pagespec,
     that could lead to bad dependency handling in certian situations.
    
    ---
     IkiWiki.pm                         | 4 ++--
     debian/changelog                   | 2 ++
     doc/bugs/depends_simple_mixup.mdwn | 5 +++++
     t/pagespec_match.t                 | 8 +++++++-
     4 files changed, 16 insertions(+), 3 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki.pm b/IkiWiki.pm
    index 022bfe3bd..927d62940 100644
    --- a/IkiWiki.pm
    +++ b/IkiWiki.pm
    @@ -2215,7 +2215,7 @@ sub match_link ($$;@) {
     	my $from=exists $params{location} ? $params{location} : '';
     
     	my $links = $IkiWiki::links{$page};
    -	return IkiWiki::FailReason->new("$page has no links", "" => 1)
    +	return IkiWiki::FailReason->new("$page has no links", $page => $IkiWiki::DEPEND_LINKS, "" => 1)
     		unless $links && @{$links};
     	my $bestlink = IkiWiki::bestlink($from, $link);
     	foreach my $p (@{$links}) {
    @@ -2232,7 +2232,7 @@ sub match_link ($$;@) {
     				if match_glob($p_rel, $link, %params);
     		}
     	}
    -	return IkiWiki::FailReason->new("$page does not link to $link", "" => 1);
    +	return IkiWiki::FailReason->new("$page does not link to $link", $page => $IkiWiki::DEPEND_LINKS, "" => 1);
     }
     
     sub match_backlink ($$;@) {
    diff --git a/debian/changelog b/debian/changelog
    index da1ab890e..b9a105552 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -17,6 +17,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
       * Add --set-yaml switch for setting more complex config file options.
       * filecheck: Fix bugs that prevented the pagespecs from matching when
         not called by attachment plugin.
    +  * Fix incorrect influence info returned by a failing link() pagespec,
    +    that could lead to bad dependency handling in certian situations.
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    diff --git a/doc/bugs/depends_simple_mixup.mdwn b/doc/bugs/depends_simple_mixup.mdwn
    index c2845240d..2603ff04c 100644
    --- a/doc/bugs/depends_simple_mixup.mdwn
    +++ b/doc/bugs/depends_simple_mixup.mdwn
    @@ -15,4 +15,9 @@ dependency. But, it seems to me it should still be listed in
     
     Then re-add the done link, and the dependency calc code breaks down,
     not noticing that bugs dependeded on the page and needs to be updated.
    +
    +Ok.. Turns out this was not a problem with the actual influences
    +calculation or dependency calculation code. Whew! `match_link`
    +just didn't set the influence correctly when failing. [[fixed|done]]
    +
     --[[Joey]]
    diff --git a/t/pagespec_match.t b/t/pagespec_match.t
    index 8b0be4e8a..ade9bca5a 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 => 72;
    +use Test::More tests => 75;
     
     BEGIN { use_ok("IkiWiki"); }
     
    @@ -54,6 +54,7 @@ $config{userdir}="";
     $links{foo}=[qw{bar baz}];
     $links{bar}=[];
     $links{baz}=[];
    +$links{meh}=[];
     $links{"bugs/foo"}=[qw{bugs/done}];
     $links{"bugs/done"}=[];
     $links{"bugs/bar"}=[qw{done}];
    @@ -82,6 +83,7 @@ ok(! pagespec_match("bar", ""), "empty pagespec should match nothing");
     ok(! pagespec_match("bar", "    	"), "blank pagespec should match nothing");
     ok(pagespec_match("ook", "link(blog/tags/foo)"), "link internal absolute success");
     ok(pagespec_match("ook", "link(/blog/tags/foo)"), "link explicit absolute success");
    +ok(pagespec_match("meh", "!link(done)"), "negated failing match is a success");
     
     $IkiWiki::pagectime{foo}=1154532692; # Wed Aug  2 11:26 EDT 2006
     $IkiWiki::pagectime{bar}=1154532695; # after
    @@ -122,3 +124,7 @@ $i=pagespec_match("foo", "link(baz) and created_after(bar)")->influences;
     is(join(",", sort keys %$i), 'bar,foo', "influences add up over OR");
     $i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
     is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
    +$i=pagespec_match("foo", "!link(baz) and !created_after(bar)")->influences;
    +is(join(",", sort keys %$i), 'bar,foo', "influences unaffected by negation");
    +$i=pagespec_match("meh", "!link(done)")->influences;
    +is(join(",", sort keys %$i), 'meh', "a negated, failing link test is successful, so the page is a link influence");
    -- 
    cgit v1.2.3
    
    
    From 1273f1de52998cf54afb3445fd8c616bce53e698 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Fri, 26 Mar 2010 13:11:02 -0400
    Subject: Add preprocessed 'use lib' line to ikiwiki-transition and
     ikiwiki-calendar if necessary for unusual install.
    
    ---
     .gitignore                                         |   3 +-
     Makefile.PL                                        |  16 +-
     debian/changelog                                   |   2 +
     ...on_does_not_set_perl_moduels_path_properly.mdwn |   2 +
     ikiwiki-calendar                                   |  57 ----
     ikiwiki-calendar.in                                |  58 ++++
     ikiwiki-transition                                 | 348 --------------------
     ikiwiki-transition.in                              | 349 +++++++++++++++++++++
     ikiwiki.spec                                       |   2 +-
     9 files changed, 423 insertions(+), 414 deletions(-)
     delete mode 100755 ikiwiki-calendar
     create mode 100755 ikiwiki-calendar.in
     delete mode 100755 ikiwiki-transition
     create mode 100755 ikiwiki-transition.in
    
    (limited to 'debian')
    
    diff --git a/.gitignore b/.gitignore
    index 8de36e2c8..e9ab152b6 100644
    --- a/.gitignore
    +++ b/.gitignore
    @@ -5,9 +5,10 @@ blib/*
     doc/.ikiwiki/*
     html/*
     ikiwiki.out
    +ikiwiki-transition.out
    +ikiwiki-calendar.out
     pm_to_blib
     *.man
    -build-stamp
     po/po2wiki_stamp
     po/underlays/*/*.mdwn
     po/underlays/basewiki/*/*.mdwn
    diff --git a/Makefile.PL b/Makefile.PL
    index 52421a711..5a9028b51 100755
    --- a/Makefile.PL
    +++ b/Makefile.PL
    @@ -28,15 +28,16 @@ W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
     
     tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
     extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
    +outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
     
    -ikiwiki.out: ikiwiki.in
    -	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < ikiwiki.in > ikiwiki.out
    -	chmod +x ikiwiki.out
    +%.out: %.in
    +	./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
    +	chmod +x $@
     
     ikiwiki.setup: ikiwiki.out
     	HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
     
    -extra_build: ikiwiki.out ikiwiki.setup docwiki
    +extra_build: $(outprogs) ikiwiki.setup docwiki
     	./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
     	./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
     	./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
    @@ -52,7 +53,7 @@ docwiki: ikiwiki.out
     
     extra_clean:
     	$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
    -	rm -f *.man ikiwiki.out ikiwiki.setup plugins/*.pyc
    +	rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
     	$(MAKE) -C po clean
     
     underlay_install:
    @@ -115,8 +116,9 @@ extra_install: underlay_install
     	install ikiwiki-w3m.cgi $(DESTDIR)$(W3M_CGI_BIN)
     
     	install -d $(DESTDIR)$(PREFIX)/bin
    -	install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki
    -	install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist ikiwiki-calendar $(DESTDIR)$(PREFIX)/bin/
    +	for prog in $(outprogs); do \
    +		install $$prog $(DESTDIR)$(PREFIX)/bin/$$(shell echo $$prog | sed 's/\.out//'); \
    +	done
     
     	$(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
     	
    diff --git a/debian/changelog b/debian/changelog
    index b9a105552..57406c6d3 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -19,6 +19,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
         not called by attachment plugin.
       * Fix incorrect influence info returned by a failing link() pagespec,
         that could lead to bad dependency handling in certian situations.
    +  * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
    +    if necessary for unusual install.
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    diff --git a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
    index 5dd4bc780..b3e87b529 100644
    --- a/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
    +++ b/doc/bugs/ikiwiki-transition_does_not_set_perl_moduels_path_properly.mdwn
    @@ -13,3 +13,5 @@ This is not true for ikiwiki-transition:
     The missing line should be added.
     
     Thanks!
    +
    +[[done]] --[[Joey]] 
    diff --git a/ikiwiki-calendar b/ikiwiki-calendar
    deleted file mode 100755
    index a9548d6ec..000000000
    --- a/ikiwiki-calendar
    +++ /dev/null
    @@ -1,57 +0,0 @@
    -#!/usr/bin/perl
    -use warnings;
    -use strict;
    -use IkiWiki;
    -use IkiWiki::Setup;
    -use Getopt::Long;
    -
    -sub usage () {
    -	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
    -}
    -
    -my $force=0;
    -GetOptions(
    -	"force" => \$force,
    -) || usage();
    -my $setup=shift		|| usage();
    -my $pagespec=shift	|| "*";
    -my $startyear=shift	|| 1900+(localtime(time))[5];
    -my $endyear=shift	|| $startyear;
    -
    -%config=IkiWiki::defaultconfig();
    -IkiWiki::Setup::load($setup);
    -IkiWiki::loadplugins();
    -IkiWiki::checkconfig();
    -
    -my $archivebase = 'archives';
    -$archivebase = $config{archivebase} if defined $config{archivebase};
    -
    -sub writearchive ($$;$) {
    -	my $template=template(shift);
    -	my $year=shift;
    -	my $month=shift;
    -
    -	my $page=defined $month ? "$year/$month" : $year;
    -
    -	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
    -	$template->param(pagespec => $pagespec);
    -	$template->param(year => $year);
    -	$template->param(month => $month) if defined $month;
    -
    -	if ($force || ! -e "$config{srcdir}/$pagefile") {
    -		writefile($pagefile, $config{srcdir}, $template->output);
    -		IkiWiki::rcs_add($pagefile) if $config{rcs};
    -	}
    -}
    -
    -foreach my $y ($startyear..$endyear) {
    -	writearchive("calendaryear.tmpl", $y);
    -	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
    -		writearchive("calendarmonth.tmpl", $y, $m);
    -	}
    -}
    -
    -IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
    -	if $config{rcs};
    -
    -system("ikiwiki", "-setup", $setup, "-refresh");
    diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
    new file mode 100755
    index 000000000..9738ea5f7
    --- /dev/null
    +++ b/ikiwiki-calendar.in
    @@ -0,0 +1,58 @@
    +#!/usr/bin/perl
    +use warnings;
    +use strict;
    +use lib '.'; # For use in nonstandard directory, munged by Makefile.
    +use IkiWiki;
    +use IkiWiki::Setup;
    +use Getopt::Long;
    +
    +sub usage () {
    +	die gettext("usage: ikiwiki-calendar [-f] your.setup [pagespec] [year]"), "\n";
    +}
    +
    +my $force=0;
    +GetOptions(
    +	"force" => \$force,
    +) || usage();
    +my $setup=shift		|| usage();
    +my $pagespec=shift	|| "*";
    +my $startyear=shift	|| 1900+(localtime(time))[5];
    +my $endyear=shift	|| $startyear;
    +
    +%config=IkiWiki::defaultconfig();
    +IkiWiki::Setup::load($setup);
    +IkiWiki::loadplugins();
    +IkiWiki::checkconfig();
    +
    +my $archivebase = 'archives';
    +$archivebase = $config{archivebase} if defined $config{archivebase};
    +
    +sub writearchive ($$;$) {
    +	my $template=template(shift);
    +	my $year=shift;
    +	my $month=shift;
    +
    +	my $page=defined $month ? "$year/$month" : $year;
    +
    +	my $pagefile=newpagefile("$archivebase/$page", $config{default_pageext});
    +	$template->param(pagespec => $pagespec);
    +	$template->param(year => $year);
    +	$template->param(month => $month) if defined $month;
    +
    +	if ($force || ! -e "$config{srcdir}/$pagefile") {
    +		writefile($pagefile, $config{srcdir}, $template->output);
    +		IkiWiki::rcs_add($pagefile) if $config{rcs};
    +	}
    +}
    +
    +foreach my $y ($startyear..$endyear) {
    +	writearchive("calendaryear.tmpl", $y);
    +	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
    +		writearchive("calendarmonth.tmpl", $y, $m);
    +	}
    +}
    +
    +IkiWiki::rcs_commit_staged(gettext("calendar update"), undef, undef)
    +	if $config{rcs};
    +
    +system("ikiwiki", "-setup", $setup, "-refresh");
    diff --git a/ikiwiki-transition b/ikiwiki-transition
    deleted file mode 100755
    index 1bebb1176..000000000
    --- a/ikiwiki-transition
    +++ /dev/null
    @@ -1,348 +0,0 @@
    -#!/usr/bin/perl
    -use warnings;
    -use strict;
    -use IkiWiki;
    -use HTML::Entities;
    -
    -my $regex = qr{
    -	(\\?)		# 1: escape?
    -	\[\[(!?)	# directive open; 2: optional prefix
    -	([-\w]+)	# 3: command
    -	(		# 4: the parameters (including initial whitespace)
    -	\s+
    -		(?:
    -			(?:[-\w]+=)?		# named parameter key?
    -			(?:
    -				""".*?"""	# triple-quoted value
    -				|
    -				"[^"]+"		# single-quoted value
    -				|
    -				[^\s\]]+	# unquoted value
    -			)
    -			\s*			# whitespace or end
    -						# of directive
    -		)
    -	*)		# 0 or more parameters
    -	\]\]		# directive closed
    -}sx;
    -
    -sub handle_directive {
    -	my $escape = shift;
    -	my $prefix = shift;
    -	my $directive = shift;
    -	my $args = shift;
    -
    -	if (length $escape) {
    -		return "${escape}[[${prefix}${directive}${args}]]"
    -	}
    -	if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
    -		$args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
    -	}
    -	return "[[!${directive}${args}]]"
    -}
    -
    -sub prefix_directives {
    -	loadsetup(shift);
    -
    -	IkiWiki::loadplugins();
    -	IkiWiki::checkconfig();
    -	IkiWiki::loadindex();
    -
    -	if (! %pagesources) {
    -		error "ikiwiki has not built this wiki yet, cannot transition";
    -	}
    -
    -	foreach my $page (values %pagesources) {
    -		next unless defined pagetype($page) &&
    -		            -f $config{srcdir}."/".$page;
    -		my $content=readfile($config{srcdir}."/".$page);
    -		my $oldcontent=$content;
    -		$content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
    -		if ($oldcontent ne $content) {
    -			writefile($page, $config{srcdir}, $content);
    -		}
    -	}
    -}
    -
    -sub indexdb {
    -	setstatedir(shift);
    -
    -	# Note: No lockwiki here because ikiwiki already locks it
    -	# before calling this.	
    -	if (! IkiWiki::oldloadindex()) {
    -		die "failed to load index\n";
    -	}
    -	if (! IkiWiki::saveindex()) {
    -		die "failed to save indexdb\n"
    -	}
    -	if (! IkiWiki::loadindex()) {
    -		die "transition failed, cannot load new indexdb\n";
    -	}
    -	if (! unlink("$config{wikistatedir}/index")) {
    -		die "unlink failed: $!\n";
    -	}
    -}
    -
    -sub hashpassword {
    -	setstatedir(shift);
    -
    -	eval q{use IkiWiki::UserInfo};
    -	eval q{use Authen::Passphrase::BlowfishCrypt};
    -	if ($@) {
    -		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
    -	}
    -
    -	IkiWiki::lockwiki();
    -	IkiWiki::loadplugin("passwordauth");
    -	my $userinfo = IkiWiki::userinfo_retrieve();
    -	foreach my $user (keys %{$userinfo}) {
    -		if (ref $userinfo->{$user} &&
    -		    exists $userinfo->{$user}->{password} &&
    -		    length $userinfo->{$user}->{password} &&
    -		    ! exists $userinfo->{$user}->{cryptpassword}) {
    -			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
    -		}
    -	}
    -}
    -
    -sub aggregateinternal {
    -	loadsetup(shift);
    -	require IkiWiki::Plugin::aggregate;
    -	IkiWiki::checkconfig();
    -	IkiWiki::Plugin::aggregate::migrate_to_internal();
    -}
    -
    -sub setupformat {
    -	my $setup=shift;
    -
    -	loadsetup($setup);
    -	IkiWiki::checkconfig();
    -	
    -	# unpack old-format wrappers setting into new fields
    -	my $cgi_seen=0;
    -	my $rcs_seen=0;
    -	foreach my $wrapper (@{$config{wrappers}}) {
    -		if ($wrapper->{cgi}) {
    -			if ($cgi_seen) {
    -				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
    -			}
    -			$cgi_seen++;
    -			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
    -			$config{cgi_wrapper}=$wrapper->{wrapper};
    -			$config{cgi_wrappermode}=$wrapper->{wrappermode}
    -				if exists $wrapper->{wrappermode};
    -		}
    -		elsif ($config{rcs}) {
    -			if ($rcs_seen) {
    -				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
    -			}
    -			$rcs_seen++;
    -			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
    -			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
    -			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
    -				if exists $wrapper->{wrappermode};
    -		}
    -		else {
    -			die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
    -		}
    -	}
    -
    -	IkiWiki::Setup::dump($setup);
    -}
    -
    -sub moveprefs {
    -	my $setup=shift;
    -
    -	loadsetup($setup);
    -	IkiWiki::checkconfig();
    -
    -	eval q{use IkiWiki::UserInfo};
    -	error $@ if $@;
    -
    -	foreach my $field (qw{allowed_attachments locked_pages}) {
    -		my $orig=$config{$field};
    -		foreach my $admin (@{$config{adminuser}}) {
    -			my $a=IkiWiki::userinfo_get($admin, $field);
    -			if (defined $a && length $a &&
    -			    # might already have been moved
    -			    (! defined $orig || $a ne $orig)) {
    -			    	if (defined $config{$field} &&
    -				    length $config{$field}) {
    -					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
    -				}
    -				else {
    -					$config{$field}=$a;
    -				}
    -			}
    -		}
    -	}
    -
    -	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
    -	$config{banned_users}=[sort keys %banned];
    -
    -	IkiWiki::Setup::dump($setup);
    -}
    -
    -sub deduplinks {
    -	loadsetup(shift);
    -	IkiWiki::loadplugins();
    -	IkiWiki::checkconfig();
    -	IkiWiki::loadindex();
    -	foreach my $page (keys %links) {
    -		my %l;
    -		$l{$_}=1 foreach @{$links{$page}};
    -		$links{$page}=[keys %l]
    -	}
    -	IkiWiki::saveindex();
    -}
    -
    -sub setstatedir {
    -	my $dirorsetup=shift;
    -
    -	if (! defined $dirorsetup) {
    -		usage();		
    -	}
    -
    -	if (-d $dirorsetup) {
    -		$config{wikistatedir}=$dirorsetup."/.ikiwiki";
    -	}
    -	elsif (-f $dirorsetup) {
    -		loadsetup($dirorsetup);
    -	}
    -	else {
    -		error("ikiwiki-transition: $dirorsetup does not exist");
    -	}
    -
    -	if (! -d $config{wikistatedir}) {
    -		error("ikiwiki-transition: $config{wikistatedir} does not exist");
    -	}
    -}
    -	
    -sub loadsetup {
    -	my $setup=shift;
    -	if (! defined $setup) {
    -		usage();
    -	}
    -
    -	require IkiWiki::Setup;
    -
    -	%config = IkiWiki::defaultconfig();
    -	IkiWiki::Setup::load($setup);
    -}
    -
    -sub usage {
    -	print STDERR "Usage: ikiwiki-transition type ...\n";
    -	print STDERR "Currently supported transition subcommands:\n";
    -	print STDERR "\tprefix_directives setupfile ...\n";
    -	print STDERR "\taggregateinternal setupfile\n";
    -	print STDERR "\tsetupformat setupfile\n";
    -	print STDERR "\tmoveprefs setupfile\n";
    -	print STDERR "\thashpassword setupfile|srcdir\n";
    -	print STDERR "\tindexdb setupfile|srcdir\n";
    -	print STDERR "\tdeduplinks setupfile\n";
    -	exit 1;
    -}
    -
    -usage() unless @ARGV;
    -
    -my $mode=shift;
    -if ($mode eq 'prefix_directives') {
    -	prefix_directives(@ARGV);
    -}
    -elsif ($mode eq 'hashpassword') {
    -	hashpassword(@ARGV);
    -}
    -elsif ($mode eq 'indexdb') {
    -	indexdb(@ARGV);
    -}
    -elsif ($mode eq 'aggregateinternal') {
    -	aggregateinternal(@ARGV);
    -}
    -elsif ($mode eq 'setupformat') {
    -	setupformat(@ARGV);
    -}
    -elsif ($mode eq 'moveprefs') {
    -	moveprefs(@ARGV);
    -}
    -elsif ($mode eq 'deduplinks') {
    -	deduplinks(@ARGV);
    -}
    -else {
    -	usage();
    -}
    -
    -package IkiWiki;
    -
    -# A slightly modified version of the old loadindex function.
    -sub oldloadindex {
    -	%oldrenderedfiles=%pagectime=();
    -	if (! $config{rebuild}) {
    -		%pagesources=%pagemtime=%oldlinks=%links=%depends=
    -			%destsources=%renderedfiles=%pagecase=%pagestate=();
    -	}
    -	open (my $in, "<", "$config{wikistatedir}/index") || return;
    -	while (<$in>) {
    -		chomp;
    -		my %items;
    -		$items{link}=[];
    -		$items{dest}=[];
    -		foreach my $i (split(/ /, $_)) {
    -			my ($item, $val)=split(/=/, $i, 2);
    -			push @{$items{$item}}, decode_entities($val);
    -		}
    -
    -		next unless exists $items{src}; # skip bad lines for now
    -
    -		my $page=pagename($items{src}[0]);
    -		if (! $config{rebuild}) {
    -			$pagesources{$page}=$items{src}[0];
    -			$pagemtime{$page}=$items{mtime}[0];
    -			$oldlinks{$page}=[@{$items{link}}];
    -			$links{$page}=[@{$items{link}}];
    -			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
    -			$destsources{$_}=$page foreach @{$items{dest}};
    -			$renderedfiles{$page}=[@{$items{dest}}];
    -			$pagecase{lc $page}=$page;
    -			foreach my $k (grep /_/, keys %items) {
    -				my ($id, $key)=split(/_/, $k, 2);
    -				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
    -			}
    -		}
    -		$oldrenderedfiles{$page}=[@{$items{dest}}];
    -		$pagectime{$page}=$items{ctime}[0];
    -	}
    -
    -	# saveindex relies on %hooks being populated, else it won't save
    -	# the page state owned by a given hook. But no plugins are loaded
    -	# by this program, so populate %hooks with all hook ids that
    -	# currently have page state.
    -	foreach my $page (keys %pagemtime) {
    -		foreach my $id (keys %{$pagestate{$page}}) {
    -			$hooks{_dummy}{$id}=1;
    -		}
    -	}
    -	
    -	return close($in);
    -}
    -
    -# Used to be in IkiWiki/UserInfo, but only used here now.
    -sub get_banned_users () {
    -	my @ret;
    -	my $userinfo=userinfo_retrieve();
    -	foreach my $user (keys %{$userinfo}) {
    -		push @ret, $user if $userinfo->{$user}->{banned};
    -	}
    -	return @ret;
    -}
    -
    -# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
    -# setup file) now.
    -sub pagespec_merge ($$) {
    -	my $a=shift;
    -	my $b=shift;
    -
    -	return $a if $a eq $b;
    -	return "($a) or ($b)";
    -}
    -
    -1
    diff --git a/ikiwiki-transition.in b/ikiwiki-transition.in
    new file mode 100755
    index 000000000..e3be645cc
    --- /dev/null
    +++ b/ikiwiki-transition.in
    @@ -0,0 +1,349 @@
    +#!/usr/bin/perl
    +use warnings;
    +use strict;
    +use lib '.'; # For use in nonstandard directory, munged by Makefile.
    +use IkiWiki;
    +use HTML::Entities;
    +
    +my $regex = qr{
    +	(\\?)		# 1: escape?
    +	\[\[(!?)	# directive open; 2: optional prefix
    +	([-\w]+)	# 3: command
    +	(		# 4: the parameters (including initial whitespace)
    +	\s+
    +		(?:
    +			(?:[-\w]+=)?		# named parameter key?
    +			(?:
    +				""".*?"""	# triple-quoted value
    +				|
    +				"[^"]+"		# single-quoted value
    +				|
    +				[^\s\]]+	# unquoted value
    +			)
    +			\s*			# whitespace or end
    +						# of directive
    +		)
    +	*)		# 0 or more parameters
    +	\]\]		# directive closed
    +}sx;
    +
    +sub handle_directive {
    +	my $escape = shift;
    +	my $prefix = shift;
    +	my $directive = shift;
    +	my $args = shift;
    +
    +	if (length $escape) {
    +		return "${escape}[[${prefix}${directive}${args}]]"
    +	}
    +	if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
    +		$args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
    +	}
    +	return "[[!${directive}${args}]]"
    +}
    +
    +sub prefix_directives {
    +	loadsetup(shift);
    +
    +	IkiWiki::loadplugins();
    +	IkiWiki::checkconfig();
    +	IkiWiki::loadindex();
    +
    +	if (! %pagesources) {
    +		error "ikiwiki has not built this wiki yet, cannot transition";
    +	}
    +
    +	foreach my $page (values %pagesources) {
    +		next unless defined pagetype($page) &&
    +		            -f $config{srcdir}."/".$page;
    +		my $content=readfile($config{srcdir}."/".$page);
    +		my $oldcontent=$content;
    +		$content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
    +		if ($oldcontent ne $content) {
    +			writefile($page, $config{srcdir}, $content);
    +		}
    +	}
    +}
    +
    +sub indexdb {
    +	setstatedir(shift);
    +
    +	# Note: No lockwiki here because ikiwiki already locks it
    +	# before calling this.	
    +	if (! IkiWiki::oldloadindex()) {
    +		die "failed to load index\n";
    +	}
    +	if (! IkiWiki::saveindex()) {
    +		die "failed to save indexdb\n"
    +	}
    +	if (! IkiWiki::loadindex()) {
    +		die "transition failed, cannot load new indexdb\n";
    +	}
    +	if (! unlink("$config{wikistatedir}/index")) {
    +		die "unlink failed: $!\n";
    +	}
    +}
    +
    +sub hashpassword {
    +	setstatedir(shift);
    +
    +	eval q{use IkiWiki::UserInfo};
    +	eval q{use Authen::Passphrase::BlowfishCrypt};
    +	if ($@) {
    +		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
    +	}
    +
    +	IkiWiki::lockwiki();
    +	IkiWiki::loadplugin("passwordauth");
    +	my $userinfo = IkiWiki::userinfo_retrieve();
    +	foreach my $user (keys %{$userinfo}) {
    +		if (ref $userinfo->{$user} &&
    +		    exists $userinfo->{$user}->{password} &&
    +		    length $userinfo->{$user}->{password} &&
    +		    ! exists $userinfo->{$user}->{cryptpassword}) {
    +			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
    +		}
    +	}
    +}
    +
    +sub aggregateinternal {
    +	loadsetup(shift);
    +	require IkiWiki::Plugin::aggregate;
    +	IkiWiki::checkconfig();
    +	IkiWiki::Plugin::aggregate::migrate_to_internal();
    +}
    +
    +sub setupformat {
    +	my $setup=shift;
    +
    +	loadsetup($setup);
    +	IkiWiki::checkconfig();
    +	
    +	# unpack old-format wrappers setting into new fields
    +	my $cgi_seen=0;
    +	my $rcs_seen=0;
    +	foreach my $wrapper (@{$config{wrappers}}) {
    +		if ($wrapper->{cgi}) {
    +			if ($cgi_seen) {
    +				die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
    +			}
    +			$cgi_seen++;
    +			print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
    +			$config{cgi_wrapper}=$wrapper->{wrapper};
    +			$config{cgi_wrappermode}=$wrapper->{wrappermode}
    +				if exists $wrapper->{wrappermode};
    +		}
    +		elsif ($config{rcs}) {
    +			if ($rcs_seen) {
    +				die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
    +			}
    +			$rcs_seen++;
    +			print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
    +			$config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
    +			$config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
    +				if exists $wrapper->{wrappermode};
    +		}
    +		else {
    +			die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
    +		}
    +	}
    +
    +	IkiWiki::Setup::dump($setup);
    +}
    +
    +sub moveprefs {
    +	my $setup=shift;
    +
    +	loadsetup($setup);
    +	IkiWiki::checkconfig();
    +
    +	eval q{use IkiWiki::UserInfo};
    +	error $@ if $@;
    +
    +	foreach my $field (qw{allowed_attachments locked_pages}) {
    +		my $orig=$config{$field};
    +		foreach my $admin (@{$config{adminuser}}) {
    +			my $a=IkiWiki::userinfo_get($admin, $field);
    +			if (defined $a && length $a &&
    +			    # might already have been moved
    +			    (! defined $orig || $a ne $orig)) {
    +			    	if (defined $config{$field} &&
    +				    length $config{$field}) {
    +					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
    +				}
    +				else {
    +					$config{$field}=$a;
    +				}
    +			}
    +		}
    +	}
    +
    +	my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
    +	$config{banned_users}=[sort keys %banned];
    +
    +	IkiWiki::Setup::dump($setup);
    +}
    +
    +sub deduplinks {
    +	loadsetup(shift);
    +	IkiWiki::loadplugins();
    +	IkiWiki::checkconfig();
    +	IkiWiki::loadindex();
    +	foreach my $page (keys %links) {
    +		my %l;
    +		$l{$_}=1 foreach @{$links{$page}};
    +		$links{$page}=[keys %l]
    +	}
    +	IkiWiki::saveindex();
    +}
    +
    +sub setstatedir {
    +	my $dirorsetup=shift;
    +
    +	if (! defined $dirorsetup) {
    +		usage();		
    +	}
    +
    +	if (-d $dirorsetup) {
    +		$config{wikistatedir}=$dirorsetup."/.ikiwiki";
    +	}
    +	elsif (-f $dirorsetup) {
    +		loadsetup($dirorsetup);
    +	}
    +	else {
    +		error("ikiwiki-transition: $dirorsetup does not exist");
    +	}
    +
    +	if (! -d $config{wikistatedir}) {
    +		error("ikiwiki-transition: $config{wikistatedir} does not exist");
    +	}
    +}
    +	
    +sub loadsetup {
    +	my $setup=shift;
    +	if (! defined $setup) {
    +		usage();
    +	}
    +
    +	require IkiWiki::Setup;
    +
    +	%config = IkiWiki::defaultconfig();
    +	IkiWiki::Setup::load($setup);
    +}
    +
    +sub usage {
    +	print STDERR "Usage: ikiwiki-transition type ...\n";
    +	print STDERR "Currently supported transition subcommands:\n";
    +	print STDERR "\tprefix_directives setupfile ...\n";
    +	print STDERR "\taggregateinternal setupfile\n";
    +	print STDERR "\tsetupformat setupfile\n";
    +	print STDERR "\tmoveprefs setupfile\n";
    +	print STDERR "\thashpassword setupfile|srcdir\n";
    +	print STDERR "\tindexdb setupfile|srcdir\n";
    +	print STDERR "\tdeduplinks setupfile\n";
    +	exit 1;
    +}
    +
    +usage() unless @ARGV;
    +
    +my $mode=shift;
    +if ($mode eq 'prefix_directives') {
    +	prefix_directives(@ARGV);
    +}
    +elsif ($mode eq 'hashpassword') {
    +	hashpassword(@ARGV);
    +}
    +elsif ($mode eq 'indexdb') {
    +	indexdb(@ARGV);
    +}
    +elsif ($mode eq 'aggregateinternal') {
    +	aggregateinternal(@ARGV);
    +}
    +elsif ($mode eq 'setupformat') {
    +	setupformat(@ARGV);
    +}
    +elsif ($mode eq 'moveprefs') {
    +	moveprefs(@ARGV);
    +}
    +elsif ($mode eq 'deduplinks') {
    +	deduplinks(@ARGV);
    +}
    +else {
    +	usage();
    +}
    +
    +package IkiWiki;
    +
    +# A slightly modified version of the old loadindex function.
    +sub oldloadindex {
    +	%oldrenderedfiles=%pagectime=();
    +	if (! $config{rebuild}) {
    +		%pagesources=%pagemtime=%oldlinks=%links=%depends=
    +			%destsources=%renderedfiles=%pagecase=%pagestate=();
    +	}
    +	open (my $in, "<", "$config{wikistatedir}/index") || return;
    +	while (<$in>) {
    +		chomp;
    +		my %items;
    +		$items{link}=[];
    +		$items{dest}=[];
    +		foreach my $i (split(/ /, $_)) {
    +			my ($item, $val)=split(/=/, $i, 2);
    +			push @{$items{$item}}, decode_entities($val);
    +		}
    +
    +		next unless exists $items{src}; # skip bad lines for now
    +
    +		my $page=pagename($items{src}[0]);
    +		if (! $config{rebuild}) {
    +			$pagesources{$page}=$items{src}[0];
    +			$pagemtime{$page}=$items{mtime}[0];
    +			$oldlinks{$page}=[@{$items{link}}];
    +			$links{$page}=[@{$items{link}}];
    +			$depends{$page}={ $items{depends}[0] => $IkiWiki::DEPEND_CONTENT } if exists $items{depends};
    +			$destsources{$_}=$page foreach @{$items{dest}};
    +			$renderedfiles{$page}=[@{$items{dest}}];
    +			$pagecase{lc $page}=$page;
    +			foreach my $k (grep /_/, keys %items) {
    +				my ($id, $key)=split(/_/, $k, 2);
    +				$pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
    +			}
    +		}
    +		$oldrenderedfiles{$page}=[@{$items{dest}}];
    +		$pagectime{$page}=$items{ctime}[0];
    +	}
    +
    +	# saveindex relies on %hooks being populated, else it won't save
    +	# the page state owned by a given hook. But no plugins are loaded
    +	# by this program, so populate %hooks with all hook ids that
    +	# currently have page state.
    +	foreach my $page (keys %pagemtime) {
    +		foreach my $id (keys %{$pagestate{$page}}) {
    +			$hooks{_dummy}{$id}=1;
    +		}
    +	}
    +	
    +	return close($in);
    +}
    +
    +# Used to be in IkiWiki/UserInfo, but only used here now.
    +sub get_banned_users () {
    +	my @ret;
    +	my $userinfo=userinfo_retrieve();
    +	foreach my $user (keys %{$userinfo}) {
    +		push @ret, $user if $userinfo->{$user}->{banned};
    +	}
    +	return @ret;
    +}
    +
    +# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
    +# setup file) now.
    +sub pagespec_merge ($$) {
    +	my $a=shift;
    +	my $b=shift;
    +
    +	return $a if $a eq $b;
    +	return "($a) or ($b)";
    +}
    +
    +1
    diff --git a/ikiwiki.spec b/ikiwiki.spec
    index 2bb87724d..532a91885 100644
    --- a/ikiwiki.spec
    +++ b/ikiwiki.spec
    @@ -1,5 +1,5 @@
     Name:           ikiwiki
    -Version: 3.20100312
    +Version: 3.20100324
     Release:        1%{?dist}
     Summary:        A wiki compiler
     
    -- 
    cgit v1.2.3
    
    
    From 6e7bfbe7bb8ba4b94d0e8c203b2117477b217384 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sun, 28 Mar 2010 19:23:34 -0400
    Subject: auto-blog.setup: Set tagbase by default, since most bloggers will
     want it.
    
    Also modified first_post page to use a tag format that will work whether
    or not tagbase is set.
    ---
     auto-blog.setup                         | 1 +
     debian/changelog                        | 1 +
     doc/examples/blog/posts/first_post.mdwn | 2 +-
     3 files changed, 3 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/auto-blog.setup b/auto-blog.setup
    index 7ff413187..95347167f 100644
    --- a/auto-blog.setup
    +++ b/auto-blog.setup
    @@ -48,4 +48,5 @@ IkiWiki::Setup::Automator->import(
     	blogspam_pagespec => "postcomment(*)",
     	discussion => 0,
     	locked_pages => "*",
    +	tagbase => "tags",
     )
    diff --git a/debian/changelog b/debian/changelog
    index 57406c6d3..2d82c4dba 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -21,6 +21,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
         that could lead to bad dependency handling in certian situations.
       * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
         if necessary for unusual install.
    +  * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    diff --git a/doc/examples/blog/posts/first_post.mdwn b/doc/examples/blog/posts/first_post.mdwn
    index d49432341..7f814fbb1 100644
    --- a/doc/examples/blog/posts/first_post.mdwn
    +++ b/doc/examples/blog/posts/first_post.mdwn
    @@ -1,4 +1,4 @@
     This is the first post to this example blog. To add new posts, just add
     files to the posts/ subdirectory, or use the web form.
     
    -[[!tag tags/tech]]
    +[[!tag ./tags/tech]]
    -- 
    cgit v1.2.3
    
    
    From aa116d67ab315dcc3e2150bb080958753df5dfca Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Mon, 29 Mar 2010 13:37:16 -0400
    Subject: update
    
    ---
     debian/changelog | 7 ++++---
     1 file changed, 4 insertions(+), 3 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 2d82c4dba..5ec52d3c0 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -2,8 +2,6 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
     
       * websetup: Add websetup_unsafe to allow marking other settings
         as unsafe.
    -  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
    -    to get the user's email address and username.
       * Improve openid url munging; do not display anchors and cgi parameters,
         as used by yahoo and google urls.
       * Add complete German basewiki and directives translation done by
    @@ -12,7 +10,6 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
         wiki source files, such as .htaccess, that would normally be skipped
         for security or other reasons. Closes: #447267
         (Thanks to Aaron Wilson for the original patch.)
    -  * Allow wrappers to be built using tcc.
       * Add support for setup files written in YAML.
       * Add --set-yaml switch for setting more complex config file options.
       * filecheck: Fix bugs that prevented the pagespecs from matching when
    @@ -22,6 +19,10 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
       * Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar
         if necessary for unusual install.
       * auto-blog.setup: Set tagbase by default, since most bloggers will want it.
    +  * Allow wrappers to be built using tcc. (Workaround #452876)
    +  * openid: Use Openid Simple Registration or OpenID Attribute Exchange
    +    to get the user's email address and username. (Neither is yet
    +    used, but they are available in the session object now.)
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    -- 
    cgit v1.2.3
    
    
    From 4dcea6207d03fcdc25bc1c172d69c30673b7254a Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Wed, 31 Mar 2010 17:51:46 -0400
    Subject: page.tmpl: Add Cache-Control must-revalidate to ensure that users
     (especially of Firefox) see fresh page content.
    
    Since Firefox version 3, it's done aggressive caching of visited pages, and
    does not, by default, check if the cached content is still valid when
    reloading or revisiting a page. By default, Firefox seems to not re-contact
    the web server at all. Compare with eg, Epiphany and Chromium, which appear
    to always check, and get back a 304 when the page is unchanged.
    
    This header makes Firefox do the right thing, at least for html files. It
    still over-caches if css, javascript, images, etc, are changed.
    ---
     debian/changelog    | 2 ++
     templates/page.tmpl | 1 +
     2 files changed, 3 insertions(+)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 5ec52d3c0..bbca7cffe 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -23,6 +23,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
       * openid: Use Openid Simple Registration or OpenID Attribute Exchange
         to get the user's email address and username. (Neither is yet
         used, but they are available in the session object now.)
    +  * page.tmpl: Add Cache-Control must-revalidate to ensure that users
    +    (especially of Firefox) see fresh page content.
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    diff --git a/templates/page.tmpl b/templates/page.tmpl
    index 968066a19..c24f88823 100644
    --- a/templates/page.tmpl
    +++ b/templates/page.tmpl
    @@ -3,6 +3,7 @@
     
     
     
    +
     <TMPL_VAR TITLE>
     
     
    -- 
    cgit v1.2.3
    
    
    From 104919ee07b70b166c6c6be13b4f6e5bc5225179 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Fri, 2 Apr 2010 16:05:14 -0400
    Subject: htmlscrubber: Allow colons in url fragments after '?'
    
    Colons are not allowed at the start of urls, because it can be interpreted
    as a protocol, and allowing arbitrary protocols can be unsafe
    (CVE-2008-0809). However, this check was too restrictive, not allowing
    use of eg, "video.ogv?t=0:03:00/0:04:00" to seek to a given place in a
    video, or "somecgi?foo=bar:baz" to pass parameters with colons.
    
    It's still not allowed to have a filename with a colon in it (ie
    "foo:bar.png") -- to link to such a file, a fully qualified url must be
    used.
    ---
     IkiWiki/Plugin/htmlscrubber.pm | 2 +-
     debian/changelog               | 1 +
     2 files changed, 2 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
    index 26e18ffc7..9f40c752f 100644
    --- a/IkiWiki/Plugin/htmlscrubber.pm
    +++ b/IkiWiki/Plugin/htmlscrubber.pm
    @@ -32,7 +32,7 @@ sub import {
     	);
     	# data is a special case. Allow a few data:image/ types,
     	# but disallow data:text/javascript and everything else.
    -	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|\/))/i;
    +	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
     }
     
     sub getsetup () {
    diff --git a/debian/changelog b/debian/changelog
    index bbca7cffe..adf0dfed6 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -25,6 +25,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
         used, but they are available in the session object now.)
       * page.tmpl: Add Cache-Control must-revalidate to ensure that users
         (especially of Firefox) see fresh page content.
    +  * htmlscrubber: Allow colons in urls after '?'
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    -- 
    cgit v1.2.3
    
    
    From 59ba938822ba0752e8d97e769c0d14f2eb0bbeb3 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Fri, 2 Apr 2010 16:54:06 -0400
    Subject: template: Search for templates in the templatedir, if they are not
     found as pages in the wiki.
    
    ---
     IkiWiki/Plugin/template.pm                            | 10 ++++++++--
     debian/changelog                                      |  2 ++
     doc/templates.mdwn                                    |  6 ++++++
     doc/todo/user-defined_templates_outside_the_wiki.mdwn |  2 ++
     doc/wikitemplates.mdwn                                |  6 ++++--
     5 files changed, 22 insertions(+), 4 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm
    index 3e024c5f8..36282055a 100644
    --- a/IkiWiki/Plugin/template.pm
    +++ b/IkiWiki/Plugin/template.pm
    @@ -37,7 +37,13 @@ sub preprocess (@) {
     	my $template_page="templates/$params{id}";
     	add_depends($params{page}, $template_page);
     
    -	my $template_file=$pagesources{$template_page};
    +	my $template_file;
    +	if (exists $pagesources{$template_page}) {
    +		$template_file=srcfile($pagesources{$template_page});
    +	}
    +	else {
    +		$template_file=template_file("$params{id}.tmpl")
    +	}
     	return sprintf(gettext("template %s not found"),
     		htmllink($params{page}, $params{destpage}, "/".$template_page))
     			unless defined $template_file;
    @@ -50,7 +56,7 @@ sub preprocess (@) {
     	                        $$text_ref=&Encode::decode_utf8($$text_ref);
     				chomp $$text_ref;
     	                },
    -	                filename => srcfile($template_file),
    +	                filename => $template_file,
            			die_on_bad_params => 0,
     			no_includes => 1,
     			blind_cache => 1,
    diff --git a/debian/changelog b/debian/changelog
    index adf0dfed6..362ba54ab 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -26,6 +26,8 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
       * page.tmpl: Add Cache-Control must-revalidate to ensure that users
         (especially of Firefox) see fresh page content.
       * htmlscrubber: Allow colons in urls after '?'
    +  * template: Search for templates in the templatedir, if they are not
    +    found as pages in the wiki.
     
      -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
     
    diff --git a/doc/templates.mdwn b/doc/templates.mdwn
    index eff0e15e9..07531ae98 100644
    --- a/doc/templates.mdwn
    +++ b/doc/templates.mdwn
    @@ -43,6 +43,12 @@ page will provide a link that can be used to create the template. The template
     is a regular wiki page, located in the `templates/` subdirectory inside
     the source directory of the wiki.
     
    +(Alternatively, templates can be stored in a directory outside the wiki,
    +as files with the extension ".tmpl".
    +By default, these are searched for in `/usr/share/ikiwiki/templates`;
    +the `templatedir` setting can be used to make another directory be searched
    +first.)
    +
     The template uses the syntax used by the [[!cpan HTML::Template]] perl
     module, which allows for some fairly complex things to be done. Consult its
     documentation for the full syntax, but all you really need to know are a
    diff --git a/doc/todo/user-defined_templates_outside_the_wiki.mdwn b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
    index 880ad6493..1d72aa6a7 100644
    --- a/doc/todo/user-defined_templates_outside_the_wiki.mdwn
    +++ b/doc/todo/user-defined_templates_outside_the_wiki.mdwn
    @@ -6,3 +6,5 @@ source, but also looks in the system templates directory (the one with
     invoked via `\[[!template]]`, but don't have to "work" as wiki pages in their
     own right. I think the normal [[plugins/template]] plugin could benefit from
     this functionality.
    +
    +[[done]] --[[Joey]] 
    diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
    index 6c0480cea..6e5a7261d 100644
    --- a/doc/wikitemplates.mdwn
    +++ b/doc/wikitemplates.mdwn
    @@ -5,7 +5,8 @@ to learn.
     The aim is to keep almost all html out of ikiwiki and in the templates.
     
     It ships with some basic templates which can be customised. These are
    -located in /usr/share/ikiwiki/templates by default.
    +located in `/usr/share/ikiwiki/templates` by default; the `templatedir`
    +setting can be used to make another directory be searched first.
     
     * `page.tmpl` - Used for displaying all regular wiki pages.
     * `misc.tmpl` - Generic template used for any page that doesn't
    @@ -43,7 +44,8 @@ The [[plugins/pagetemplate]] plugin can allow individual pages to use a
     different template than `page.tmpl`.
     
     The [[plugins/template]] plugin also uses templates, though those
    -[[templates]] are stored in the wiki and inserted into pages.
    +[[templates]] are typically stored as pages in the wiki, and are inserted
    +into pages.
     
     The [[plugins/edittemplate]] plugin is used to make new pages default to
     containing text from a template, which can be filled as out the page is
    -- 
    cgit v1.2.3
    
    
    From a875ee8be702bd4575e009dc652015c1157c7c2e Mon Sep 17 00:00:00 2001
    From: Simon McVittie 
    Date: Sat, 3 Apr 2010 13:48:30 +0100
    Subject: Split out sortnaturally into a plugin
    
    ---
     IkiWiki.pm                        | 11 -----------
     IkiWiki/Plugin/sortnaturally.pm   | 32 ++++++++++++++++++++++++++++++++
     debian/NEWS                       |  8 ++++++++
     doc/ikiwiki/pagespec/sorting.mdwn |  5 +++--
     doc/plugins/sortnaturally.mdwn    |  5 +++++
     5 files changed, 48 insertions(+), 13 deletions(-)
     create mode 100644 IkiWiki/Plugin/sortnaturally.pm
     create mode 100644 doc/plugins/sortnaturally.mdwn
    
    (limited to 'debian')
    
    diff --git a/IkiWiki.pm b/IkiWiki.pm
    index a89c14058..8f36f5818 100644
    --- a/IkiWiki.pm
    +++ b/IkiWiki.pm
    @@ -2423,15 +2423,4 @@ sub cmp_title {
     sub cmp_mtime { $IkiWiki::pagemtime{$_[1]} <=> $IkiWiki::pagemtime{$_[0]} }
     sub cmp_age { $IkiWiki::pagectime{$_[1]} <=> $IkiWiki::pagectime{$_[0]} }
     
    -sub check_cmp_title_natural {
    -	eval q{use Sort::Naturally};
    -	if ($@) {
    -		error(gettext("Sort::Naturally needed for title_natural sort"));
    -	}
    -}
    -sub cmp_title_natural {
    -	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
    -		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
    -}
    -
     1
    diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm
    new file mode 100644
    index 000000000..0023f31f9
    --- /dev/null
    +++ b/IkiWiki/Plugin/sortnaturally.pm
    @@ -0,0 +1,32 @@
    +#!/usr/bin/perl
    +# Sort::Naturally-powered title_natural sort order for IkiWiki
    +package IkiWiki::Plugin::sortnaturally;
    +
    +use IkiWiki 3.00;
    +no warnings;
    +
    +sub import {
    +	hook(type => "getsetup", id => "sortnaturally", call => \&getsetup);
    +}
    +
    +sub getsetup {
    +	return
    +		plugin => {
    +			safe => 1,
    +			rebuild => 1,
    +		},
    +}
    +
    +sub checkconfig () {
    +	eval q{use Sort::Naturally};
    +	error $@ if $@;
    +}
    +
    +package IkiWiki::PageSpec;
    +
    +sub cmp_title_natural {
    +	Sort::Naturally::ncmp(IkiWiki::pagetitle(IkiWiki::basename($_[0])),
    +		IkiWiki::pagetitle(IkiWiki::basename($_[1])))
    +}
    +
    +1;
    diff --git a/debian/NEWS b/debian/NEWS
    index 50332670f..614eb11f8 100644
    --- a/debian/NEWS
    +++ b/debian/NEWS
    @@ -1,3 +1,11 @@
    +ikiwiki (3.20100320) UNRELEASED; urgency=low
    +
    +  The sort="title_natural" option on [[!inline]] etc. now requires the
    +  new sortnaturally plugin. This is not enabled by default, because it requires
    +  the Sort::Naturally module.
    +
    + -- Simon McVittie   Sat, 03 Apr 2010 13:46:08 +0100
    +
     ikiwiki (3.20091017) unstable; urgency=low
     
       To take advantage of significant performance improvements, all
    diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn
    index f27972d4e..ba995a521 100644
    --- a/doc/ikiwiki/pagespec/sorting.mdwn
    +++ b/doc/ikiwiki/pagespec/sorting.mdwn
    @@ -6,9 +6,10 @@ orders can be specified.
     * `age` - List pages from the most recently created to the oldest.
     * `mtime` - List pages with the most recently modified first.
     * `title` - Order by title (page name).
    -* `title_natural` - Only available if [[!cpan Sort::Naturally]] is
    -  installed. Orders by title, but numbers in the title are treated
    +[[!if test="enabled(sortnaturally)" then="""
    +* `title_natural` - Orders by title, but numbers in the title are treated
       as such, ("1 2 9 10 20" instead of "1 10 2 20 9")
    +"""]]
     [[!if test="enabled(meta)" then="""
     * `meta_title` - Order according to the `\[[!meta title="foo" sort="bar"]]`
       or `\[[!meta title="foo"]]` [[ikiwiki/directive]], or the page name if no
    diff --git a/doc/plugins/sortnaturally.mdwn b/doc/plugins/sortnaturally.mdwn
    new file mode 100644
    index 000000000..91f373f6b
    --- /dev/null
    +++ b/doc/plugins/sortnaturally.mdwn
    @@ -0,0 +1,5 @@
    +[[!template id=plugin name=sortnaturally core=1 author="[[chrysn]], [[smcv]]"]]
    +[[!tag type/meta]]
    +
    +This plugin provides the `title_natural` [[ikiwiki/pagespec/sorting]] order,
    +which uses Sort::Naturally to sort numbered pages in a more natural order.
    -- 
    cgit v1.2.3
    
    
    From 0f82fe522560353bb6133ce1bea632a48cd7db13 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sat, 3 Apr 2010 15:15:04 -0400
    Subject: releasing version 3.20100403
    
    ---
     debian/changelog |  4 +--
     ikiwiki.spec     |  2 +-
     po/bg.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
     po/cs.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
     po/da.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
     po/de.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
     po/es.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
     po/fr.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
     po/gu.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
     po/ikiwiki.pot   | 78 +++++++++++++++++++++++++++++--------------------
     po/it.po         | 89 +++++++++++++++++++++++++++++++++-----------------------
     po/pl.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
     po/sv.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
     po/tr.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
     po/vi.po         | 88 ++++++++++++++++++++++++++++++++-----------------------
     15 files changed, 667 insertions(+), 479 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 362ba54ab..32a38925d 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -1,4 +1,4 @@
    -ikiwiki (3.20100324) UNRELEASED; urgency=low
    +ikiwiki (3.20100403) unstable; urgency=low
     
       * websetup: Add websetup_unsafe to allow marking other settings
         as unsafe.
    @@ -29,7 +29,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low
       * template: Search for templates in the templatedir, if they are not
         found as pages in the wiki.
     
    - -- Joey Hess   Sat, 13 Mar 2010 14:48:10 -0500
    + -- Joey Hess   Sat, 03 Apr 2010 14:17:28 -0400
     
     ikiwiki (3.20100312) unstable; urgency=HIGH
     
    diff --git a/ikiwiki.spec b/ikiwiki.spec
    index 532a91885..fb7971b27 100644
    --- a/ikiwiki.spec
    +++ b/ikiwiki.spec
    @@ -1,5 +1,5 @@
     Name:           ikiwiki
    -Version: 3.20100324
    +Version: 3.20100403
     Release:        1%{?dist}
     Summary:        A wiki compiler
     
    diff --git a/po/bg.po b/po/bg.po
    index 0e2108597..5585a10d6 100644
    --- a/po/bg.po
    +++ b/po/bg.po
    @@ -7,7 +7,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki-bg\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2007-01-12 01:19+0200\n"
     "Last-Translator: Damyan Ivanov \n"
     "Language-Team: Bulgarian \n"
    @@ -55,7 +55,7 @@ msgstr "Предпочитанията са запазени."
     msgid "You are banned."
     msgstr "Достъпът ви е забранен."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Грешка"
     
    @@ -137,7 +137,7 @@ msgstr "създаване на нова страницa „%s”"
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "готово"
     
    @@ -246,7 +246,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -517,7 +517,7 @@ msgstr "Огледала"
     msgid "Mirror"
     msgstr "Огледало"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr ""
     
    @@ -893,12 +893,12 @@ msgstr "грешка при запис на файла „%s”: %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr ""
     
    @@ -988,60 +988,60 @@ msgstr "грешка при запис на файла „%s”: %s"
     msgid "missing id parameter"
     msgstr "липсващ параметър „id” на шаблона"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "шаблонът „%s” не е намерен"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     #, fuzzy
     msgid "failed to process:"
     msgstr "грешка при обработване на шаблона"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     #, fuzzy
     msgid "failed to generate image from code"
     msgstr "грешка при запис на файла „%s”: %s"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1110,25 +1110,35 @@ msgstr "ikiwiki: неуспех при обновяване на страниц
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "грешка при четене на „%s”: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "грешка при четене на „%s”: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "крешка при компилиране на файла %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1147,13 +1157,13 @@ msgid "wrapper filename not specified"
     msgstr "не е указан файл на обвивката"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "крешка при компилиране на файла %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "успешно генериране на %s"
    @@ -1166,19 +1176,23 @@ msgstr "формат: ikiwiki [опции] източник местоназна
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "генериране на обвивки..."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "обновяване на уики..."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "осъвременяване на уики..."
     
    @@ -1186,40 +1200,40 @@ msgstr "осъвременяване на уики..."
     msgid "Discussion"
     msgstr "Дискусия"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr ""
     "При използване на пареметъра „--cgi” е необходимо да се укаже и "
     "местоположението на уикито чрез параметъра „--url”"
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, fuzzy, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "непознат вид сортиране „%s”"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, fuzzy, perl-format
     msgid "cannot match pages: %s"
     msgstr "грешка при четене на „%s”: %s"
    diff --git a/po/cs.po b/po/cs.po
    index 09d411e98..0b45bb97a 100644
    --- a/po/cs.po
    +++ b/po/cs.po
    @@ -7,7 +7,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2009-09-11 20:23+0200\n"
     "Last-Translator: Miroslav Kure \n"
     "Language-Team: Czech \n"
    @@ -55,7 +55,7 @@ msgstr "Nastavení uloženo."
     msgid "You are banned."
     msgstr "Jste vyhoštěni."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Chyba"
     
    @@ -136,7 +136,7 @@ msgstr "vytvářím novou stránku %s"
     msgid "deleting bucket.."
     msgstr "mažu bucket..."
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "hotovo"
     
    @@ -244,7 +244,7 @@ msgstr "Přidán komentář"
     msgid "Added a comment: %s"
     msgstr "Přidán komentář: %s"
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr "nejste přihlášeni jako správce"
     
    @@ -498,7 +498,7 @@ msgstr "Zrcadla"
     msgid "Mirror"
     msgstr "Zrcadlo"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     #, fuzzy
     msgid "comment needs moderation"
     msgstr "schvalování komentářů"
    @@ -877,12 +877,12 @@ msgstr "nepodařilo se přečíst %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr "pro indexování %s je potřeba Digest::SHA1"
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr "hledání"
     
    @@ -964,52 +964,52 @@ msgstr "zpracovávání selhalo na řádku %d: %s"
     msgid "missing id parameter"
     msgstr "chybí parametr id"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "šablona %s nebyla nalezena"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "nepodařilo se zpracovat:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr "chybí TeXový kód"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr "z kódu se nepodařilo vygenerovat obrázek"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, fuzzy, perl-format
     msgid "%s plugin:"
     msgstr "modul"
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, fuzzy, perl-format
     msgid "%s plugins"
     msgstr "moduly"
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr "povolit %s?"
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr "konfigurační soubor této wiki je neznámý"
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr "hlavní"
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki."
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
    @@ -1017,7 +1017,7 @@ msgstr ""
     "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset "
     "znovusestavit wiki."
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1090,25 +1090,35 @@ msgstr "ikiwiki: nelze sestavit %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "nemohu číst %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "nemohu číst %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "nepodařilo se aktualizovat %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr "musíte zadat název wiki (který obsahuje alfanumerické znaky)"
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr "nepodporovaný systém pro správu verzí: %s"
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo"
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:"
    @@ -1127,13 +1137,13 @@ msgid "wrapper filename not specified"
     msgstr "jméno souboru s obalem nebylo zadáno"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "nelze zkompilovat %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "%s byl úspěšně vytvořen"
    @@ -1146,19 +1156,24 @@ msgstr "použití: ikiwiki [volby] zdroj cíl"
     msgid "       ikiwiki --setup configfile"
     msgstr "       ikiwiki --setup konfigurační.soubor"
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr "použití: --set proměnná=hodnota"
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +#, fuzzy
    +msgid "usage: --set-yaml var=value"
    +msgstr "použití: --set proměnná=hodnota"
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "generuji obaly..."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "znovusestavuji wiki..."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "obnovuji wiki..."
     
    @@ -1166,38 +1181,38 @@ msgstr "obnovuji wiki..."
     msgid "Discussion"
     msgstr "Diskuse"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     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:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr "nelze použít několik rcs modulů"
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s"
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "Byla rozpoznána smyčka na %s v hloubce %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr "ano"
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr "Pro řazení pomocí title_natural je nutný modul Sort::Naturally"
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "neznámý typ řazení %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr "nelze vybrat stránky: %s"
    diff --git a/po/da.po b/po/da.po
    index 13d1dca59..be7a95e6a 100644
    --- a/po/da.po
    +++ b/po/da.po
    @@ -7,7 +7,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki 3.14159\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2009-07-23 01:07+0200\n"
     "Last-Translator: Jonas Smedegaard \n"
     "Language-Team: None\n"
    @@ -59,7 +59,7 @@ msgstr "Indstillinger gemt"
     msgid "You are banned."
     msgstr "Du er banlyst."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Fejl"
     
    @@ -140,7 +140,7 @@ msgstr "opretter ny side %s"
     msgid "deleting bucket.."
     msgstr "sletter bundt.."
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "færdig"
     
    @@ -251,7 +251,7 @@ msgstr "Tilføjede en kommentar"
     msgid "Added a comment: %s"
     msgstr "Tilføjede en kommentar: %s"
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr "du er ikke logget på som en administrator"
     
    @@ -511,7 +511,7 @@ msgstr "Spejle"
     msgid "Mirror"
     msgstr "Spejl"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     #, fuzzy
     msgid "comment needs moderation"
     msgstr "kommentarkoderering"
    @@ -892,12 +892,12 @@ msgstr "læsning af %s mislykkedes"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr "behøver Digest::SHA1 til indeks %s"
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr "søg"
     
    @@ -979,54 +979,54 @@ msgstr "afkodningsfejl på linje %d: %s"
     msgid "missing id parameter"
     msgstr "manglende id-parameter"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "skabelon %s ikke fundet"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "dannelsen mislykkedes:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr "manglende tex-kode"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr "billedopbygning fra kode mislykkedes"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, fuzzy, perl-format
     msgid "%s plugin:"
     msgstr "udvidelse"
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, fuzzy, perl-format
     msgid "%s plugins"
     msgstr "udvidelser"
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr "aktivér %s?"
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr "opsætningsfilen for denne wiki er ukendt"
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr "primær"
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i "
     "kraft."
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
    @@ -1034,7 +1034,7 @@ msgstr ""
     "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du "
     "muligvis genopbygge wikien."
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer."
    @@ -1105,25 +1105,35 @@ msgstr "ikiwiki: kan ikke danne %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "kan ikke læse %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "kan ikke læse %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "opdatering af %s mislykkedes"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr "du skal angive et wikinavn (som indeholder alfanumeriske tegn)"
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr "revisionskontrolsystem %s ikke understøttet"
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes"
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:"
    @@ -1142,13 +1152,13 @@ msgid "wrapper filename not specified"
     msgstr "wrapper-navn ikke angivet"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "kompilering af %s mislykkedes"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "Korrekt bygget %s"
    @@ -1161,19 +1171,24 @@ msgstr "brug: ikiwiki [valg] kilde mål"
     msgid "       ikiwiki --setup configfile"
     msgstr "       ikiwiki --setup opsætningsfil"
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr "brug: --set var=værdi"
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +#, fuzzy
    +msgid "usage: --set-yaml var=value"
    +msgstr "brug: --set var=værdi"
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "bygger wrappers.."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "genopbygger wiki..."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "genopfrisker wiki..."
     
    @@ -1181,39 +1196,39 @@ msgstr "genopfrisker wiki..."
     msgid "Discussion"
     msgstr "Diskussion"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     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:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr "kan ikke bruge flere samtidige RCS-udvidelser"
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s"
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "forudberegningssløkke fundet på %s ved dybde %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr "ja"
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr "Sort::Naturally krævet for title_natural sortering"
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "ukendt sorteringsform %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr "kan ikke få sider til at passe sammen: %s"
    diff --git a/po/de.po b/po/de.po
    index f69b98603..e5a18d47b 100644
    --- a/po/de.po
    +++ b/po/de.po
    @@ -7,7 +7,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki 3.14159\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2010-03-14 16:09+0530\n"
     "Last-Translator: Sebastian Kuhnert \n"
     "Language-Team: German \n"
    @@ -56,7 +56,7 @@ msgstr "Einstellungen gespeichert."
     msgid "You are banned."
     msgstr "Sie sind ausgeschlossen worden."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Fehler"
     
    @@ -137,7 +137,7 @@ msgstr "erstelle neue Seite %s"
     msgid "deleting bucket.."
     msgstr "lösche Behälter (bucket)..."
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "fertig"
     
    @@ -247,7 +247,7 @@ msgstr "Kommentar hinzugefügt"
     msgid "Added a comment: %s"
     msgstr "Kommentar hinzugefügt: %s"
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr "Sie sind nicht als Administrator angemeldet"
     
    @@ -507,7 +507,7 @@ msgstr "Spiegel"
     msgid "Mirror"
     msgstr "Spiegel"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr "Kommentar muss moderiert werden"
     
    @@ -891,12 +891,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s"
     msgid "rsync_command exited %d"
     msgstr "rsync_command gibt Fehler %d zurück"
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen"
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr "suchen"
     
    @@ -978,54 +978,54 @@ msgstr "Auswertungsfehler in Zeile %d: %s"
     msgid "missing id parameter"
     msgstr "fehlender Parameter id"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "Vorlage %s nicht gefunden"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "Fehler beim Ablauf:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr "fehlender TeX-Code"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr "konnte kein Bild aus dem Code erzeugen"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr "%s-Erweiterung:"
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, fuzzy, perl-format
     msgid "%s plugins"
     msgstr "%s-Erweiterungen"
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr "%s aktivieren?"
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt"
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr "Hauptseite"
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des "
     "Wikis, um wirksam zu werden."
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
    @@ -1033,7 +1033,7 @@ msgstr ""
     "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam "
     "werden, kann es notwendig sein, das Wikis neu zu bauen."
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1107,26 +1107,36 @@ msgstr "ikiwiki: kann %s nicht erzeugen"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "kann %s nicht lesen: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "kann %s nicht lesen: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "aktualisieren von %s fehlgeschlagen"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     "Sie müssen einen Wiki-Namen eingeben (der alphanumerische Zeichen enthält)"
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr "nicht unterstütztes Versionskontrollsystem %s"
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr "erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen"
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1147,13 +1157,13 @@ msgid "wrapper filename not specified"
     msgstr "Dateiname des Wrappers nicht angegeben"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "erzeugen von %s fehlgeschlagen"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "%s wurde erfolgreich erstellt"
    @@ -1166,19 +1176,24 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel"
     msgid "       ikiwiki --setup configfile"
     msgstr "       ikiwiki --setup Konfigurationsdatei"
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr "Aufruf: --set Variable=Wert"
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +#, fuzzy
    +msgid "usage: --set-yaml var=value"
    +msgstr "Aufruf: --set Variable=Wert"
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "erzeuge Wrapper.."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "erzeuge Wiki neu.."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "aktualisiere Wiki.."
     
    @@ -1186,41 +1201,41 @@ msgstr "aktualisiere Wiki.."
     msgid "Discussion"
     msgstr "Diskussion"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr ""
     "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt "
     "wird"
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden"
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s"
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr "ja"
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr "Sort::Naturally wird benötigt für title_natural sort"
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "Unbekannter Sortierungstyp %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr "Kann die Seiten nicht zuordnen: %s"
    diff --git a/po/es.po b/po/es.po
    index 465e9c1a1..413572866 100644
    --- a/po/es.po
    +++ b/po/es.po
    @@ -9,7 +9,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: es\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2009-06-14 12:32+0200\n"
     "Last-Translator: Victor Moral \n"
     "Language-Team:  \n"
    @@ -60,7 +60,7 @@ msgstr "Las preferencias se han guardado."
     msgid "You are banned."
     msgstr "Ha sido expulsado."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Error"
     
    @@ -142,7 +142,7 @@ msgstr "creando nueva página %s"
     msgid "deleting bucket.."
     msgstr "borrando el directorio.."
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "completado"
     
    @@ -253,7 +253,7 @@ msgstr "Añadir un comentario"
     msgid "Added a comment: %s"
     msgstr "Comentario añadido: %s"
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr "No está registrado como un administrador"
     
    @@ -515,7 +515,7 @@ msgstr "Réplicas"
     msgid "Mirror"
     msgstr "Réplica"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     #, fuzzy
     msgid "comment needs moderation"
     msgstr "aprobación de comentarios"
    @@ -892,12 +892,12 @@ msgstr "no puedo leer de %s: %s "
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr "se necesita la instalación de Digest::SHA1 para indexar %s"
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr "buscar"
     
    @@ -983,54 +983,54 @@ msgstr "error de análisis en la línea %d: %s"
     msgid "missing id parameter"
     msgstr "falta el parámetro \"id\""
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "no he encontrado la plantilla %s"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "se ha producido un error fatal mientras procesaba la plantilla:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr "falta el código tex"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr "no he podido crear la imagen desde el código"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, fuzzy, perl-format
     msgid "%s plugin:"
     msgstr "complemento"
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, fuzzy, perl-format
     msgid "%s plugins"
     msgstr "complementos"
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr "¿ activar %s ?"
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr "El archivo de configuración para este wiki es desconocido"
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr "principal"
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     "Los cambios en la configuración que se muestran más abajo precisan una "
     "reconstrucción del wiki para tener efecto."
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
    @@ -1038,7 +1038,7 @@ msgstr ""
     "Para que los cambios en la configuración mostrados más abajo tengan efecto, "
     "es posible que necesite reconstruir el wiki."
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1113,25 +1113,35 @@ msgstr "ikiwiki: no puedo convertir la página %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "no puedo leer el archivo %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "no puedo leer el archivo %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "ha fallado la compilación del programa %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr "debe escribir un nombre wiki (que contiene caracteres alfanuméricos)"
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr "el sistema de control de versiones %s no está soportado"
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo"
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1152,13 +1162,13 @@ msgid "wrapper filename not specified"
     msgstr "el programa envoltorio no ha sido especificado"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, 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:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "creado con éxito el programa envoltorio %s"
    @@ -1171,19 +1181,24 @@ msgstr "uso: ikiwiki [opciones] origen destino"
     msgid "       ikiwiki --setup configfile"
     msgstr "       ikiwiki --setup archivo_de_configuración"
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr "uso: --set variable=valor"
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +#, fuzzy
    +msgid "usage: --set-yaml var=value"
    +msgstr "uso: --set variable=valor"
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "generando programas auxiliares.."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "reconstruyendo el wiki.."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "actualizando el wiki.."
     
    @@ -1191,44 +1206,44 @@ msgstr "actualizando el wiki.."
     msgid "Discussion"
     msgstr "Comentarios"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     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:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr "no puedo emplear varios complementos rcs"
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr "no he podido cargar el complemento externo %s necesario para %s"
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr ""
     "se ha detectado en la página %s un bucle de preprocesado en la iteración "
     "número %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr "si"
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     "Se necesita el módulo Sort::Naturally para el tipo de ordenación "
     "title_natural"
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "no conozco este tipo de ordenación %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr "no encuentro páginas coincidentes: %s"
    diff --git a/po/fr.po b/po/fr.po
    index 723d3a036..6be9482ce 100644
    --- a/po/fr.po
    +++ b/po/fr.po
    @@ -9,7 +9,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki 3.141\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2009-08-17 10:06+0200\n"
     "Last-Translator: Philippe Batailler \n"
     "Language-Team: French \n"
    @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées."
     msgid "You are banned."
     msgstr "Vous avez été banni."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Erreur"
     
    @@ -138,7 +138,7 @@ msgstr "Création de la nouvelle page %s"
     msgid "deleting bucket.."
     msgstr "Suppression du compartiment S3 (« bucket »)..."
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "Terminé"
     
    @@ -246,7 +246,7 @@ msgstr "Commentaire ajouté"
     msgid "Added a comment: %s"
     msgstr "Commentaire ajouté : %s"
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr "Vous n'êtes pas authentifié comme administrateur"
     
    @@ -506,7 +506,7 @@ msgstr "Miroirs"
     msgid "Mirror"
     msgstr "Miroir"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     #, fuzzy
     msgid "comment needs moderation"
     msgstr "modération du commentaire"
    @@ -896,12 +896,12 @@ msgstr "Impossible de lire %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr "Digest::SHA1 est nécessaire pour indexer %s"
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr "recherche"
     
    @@ -983,54 +983,54 @@ msgstr "Erreur d'analyse à la ligne %d : %s"
     msgid "missing id parameter"
     msgstr "Paramètre d'identification manquant"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "Modèle de page %s introuvable"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "Échec du traitement :"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr "Il manque le code TeX"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr "Échec de la création de l'image à partir du code"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, fuzzy, perl-format
     msgid "%s plugin:"
     msgstr "greffon"
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, fuzzy, perl-format
     msgid "%s plugins"
     msgstr "Greffons"
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr "activer %s ?"
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr "Le fichier de configuration de ce wiki n'est pas connu"
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr "Partie principale"
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     "Les changements de configuration ci-dessous nécessitent une recompilation du "
     "wiki pour prendre effet"
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
    @@ -1038,7 +1038,7 @@ msgstr ""
     "Pour que les changements de configuration ci-dessous prennent effet vous "
     "devez recompiler le wiki"
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées."
    @@ -1110,27 +1110,37 @@ msgstr "ikiwiki : impossible de reconstruire %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "Lecture impossible de %s : %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "Lecture impossible de %s : %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "Impossible de mettre à jour %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     "Vous devez spécifier un nom de wiki (contenant des caractères "
     "alphanumériques)"
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr "Système de contrôle de version non reconnu : %s"
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo"
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1152,13 +1162,13 @@ msgid "wrapper filename not specified"
     msgstr "Le nom du fichier CGI n'a pas été indiqué"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "Échec de la compilation de %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "%s a été créé avec succès"
    @@ -1171,19 +1181,24 @@ msgstr "Syntaxe : ikiwiki [options] source destination"
     msgid "       ikiwiki --setup configfile"
     msgstr "       ikiwiki --setup fichier de configuration"
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr "Syntaxe : -- set var=valeur"
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +#, fuzzy
    +msgid "usage: --set-yaml var=value"
    +msgstr "Syntaxe : -- set var=valeur"
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "Création des fichiers CGI..."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "Reconstruction du wiki..."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "Rafraîchissement du wiki..."
     
    @@ -1191,39 +1206,39 @@ msgstr "Rafraîchissement du wiki..."
     msgid "Discussion"
     msgstr "Discussion"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr ""
     "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi"
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions"
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s"
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr "oui"
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »"
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "Type de tri %s inconnu"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr "Impossible de trouver les pages %s"
    diff --git a/po/gu.po b/po/gu.po
    index f7725abb9..d4bfd42c0 100644
    --- a/po/gu.po
    +++ b/po/gu.po
    @@ -7,7 +7,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki-gu\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2007-01-11 16:05+0530\n"
     "Last-Translator: Kartik Mistry \n"
     "Language-Team: Gujarati \n"
    @@ -54,7 +54,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
     msgid "You are banned."
     msgstr "તમારા પર પ્રતિબંધ છે."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "ક્ષતિ"
     
    @@ -135,7 +135,7 @@ msgstr "નવું પાનું %s બનાવે છે"
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "સંપૂર્ણ"
     
    @@ -244,7 +244,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -507,7 +507,7 @@ msgstr "મિરરો"
     msgid "Mirror"
     msgstr "મિરર"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr ""
     
    @@ -883,12 +883,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr ""
     
    @@ -974,60 +974,60 @@ msgstr "ઉકેલવાનું લીટી %d પર નિષ્ફળ: %
     msgid "missing id parameter"
     msgstr "ખોવાયેલ આઇડી વિકલ્પ"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "ટેમ્પલેટ %s મળ્યું નહી"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "ક્રિયા કરવામાં નિષ્ફળ:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     #, fuzzy
     msgid "missing tex code"
     msgstr "ખોવાયેલ કિંમતો"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     #, fuzzy
     msgid "failed to generate image from code"
     msgstr "માપ બદલવામાં નિષ્ફળ: %s"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1096,25 +1096,35 @@ msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "વાંચી શકાતી નથી %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "વાંચી શકાતી નથી %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1133,13 +1143,13 @@ msgid "wrapper filename not specified"
     msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s"
    @@ -1152,19 +1162,23 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest"
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "આવરણ બનાવે છે.."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "વીકી ફરીથી બનાવે છે.."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "વીકીને તાજી કરે છે.."
     
    @@ -1172,38 +1186,38 @@ msgstr "વીકીને તાજી કરે છે.."
     msgid "Discussion"
     msgstr "ચર્ચા"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે"
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, fuzzy, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, fuzzy, perl-format
     msgid "cannot match pages: %s"
     msgstr "વાંચી શકાતી નથી %s: %s"
    diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
    index df3000feb..c2f4e24a9 100644
    --- a/po/ikiwiki.pot
    +++ b/po/ikiwiki.pot
    @@ -8,7 +8,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: PACKAGE VERSION\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-12 15:02-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
     "Last-Translator: FULL NAME \n"
     "Language-Team: LANGUAGE \n"
    @@ -55,7 +55,7 @@ msgstr ""
     msgid "You are banned."
     msgstr ""
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr ""
     
    @@ -136,7 +136,7 @@ msgstr ""
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr ""
     
    @@ -242,7 +242,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -951,12 +951,12 @@ msgstr ""
     msgid "missing id parameter"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr ""
     
    @@ -968,41 +968,41 @@ msgstr ""
     msgid "failed to generate image from code"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1071,25 +1071,35 @@ msgstr ""
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr ""
     
    +#: ../IkiWiki/Setup.pm:34
    +#, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr ""
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, perl-format
    +msgid "failed to parse %s"
    +msgstr ""
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1108,13 +1118,13 @@ msgid "wrapper filename not specified"
     msgstr ""
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr ""
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr ""
    @@ -1127,19 +1137,23 @@ msgstr ""
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr ""
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr ""
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr ""
     
    @@ -1147,38 +1161,38 @@ msgstr ""
     msgid "Discussion"
     msgstr ""
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr ""
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr ""
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr ""
    diff --git a/po/it.po b/po/it.po
    index d664c4d30..b1b3dbd55 100644
    --- a/po/it.po
    +++ b/po/it.po
    @@ -5,7 +5,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: Ikiwiki\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2009-08-16 11:01+0100\n"
     "Last-Translator: Luca Bruno \n"
     "Language-Team: Italian TP \n"
    @@ -53,7 +53,7 @@ msgstr "Preferenze salvate."
     msgid "You are banned."
     msgstr "Avete ricevuto un ban."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Errore"
     
    @@ -135,7 +135,7 @@ msgstr "creazione nuova pagina %s"
     msgid "deleting bucket.."
     msgstr "eliminazione contenitore..."
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "fatto"
     
    @@ -243,7 +243,7 @@ msgstr "Aggiunto commento"
     msgid "Added a comment: %s"
     msgstr "Aggiunto commento: %s"
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr "non siete autenticati come amministratore"
     
    @@ -501,7 +501,7 @@ msgstr "Mirror"
     msgid "Mirror"
     msgstr "Mirror"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     #, fuzzy
     msgid "comment needs moderation"
     msgstr "moderazione commento"
    @@ -888,12 +888,12 @@ msgstr "impossibile leggere %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr "è necessario Digest::SHA1 per l'indice di %s"
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr "cerca"
     
    @@ -975,54 +975,54 @@ msgstr "errore di interpretazione alla riga %d: %s"
     msgid "missing id parameter"
     msgstr "parametro id mancante"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "modello %s non trovato"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr "errore nell'elaborazione:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr "codice tex mancante"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr "impossibile generare l'immagine dal codice"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, fuzzy, perl-format
     msgid "%s plugin:"
     msgstr "plugin"
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, fuzzy, perl-format
     msgid "%s plugins"
     msgstr "plugin"
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr "abilitare %s?"
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr "il file di setup di questo wiki non è noto"
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr "principale"
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     "Le sottostanti modifiche alla configurazione richiedono la ricompilazione "
     "del wiki."
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
    @@ -1030,7 +1030,7 @@ msgstr ""
     "Affinché le sottostanti modifiche alla configurazione abbiano effetto, "
     "occorre ricostruire il wiki."
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate."
    @@ -1101,25 +1101,35 @@ msgstr "ikiwiki: impossibile compilare %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "impossibile leggere %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "impossibile leggere %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "impossibile aggiornare %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr "occorre inserire un wikiname (contente caratteri alfanumerici)"
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr "sistema di controllo di revisione %s non supportato"
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr "impossibile creare un repository tramite ikiwiki-makerepo"
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1139,13 +1149,13 @@ msgid "wrapper filename not specified"
     msgstr "nome del file del contenitore non specificato"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "errore nel compilare %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "%s generato con successo"
    @@ -1158,19 +1168,24 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione"
     msgid "       ikiwiki --setup configfile"
     msgstr "       ikiwiki --setup configfile"
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr "utilizzo: --set var=valore"
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +#, fuzzy
    +msgid "usage: --set-yaml var=value"
    +msgstr "utilizzo: --set var=valore"
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "generazione contenitori..."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "ricostruzione wiki..."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "aggiornamento wiki..."
     
    @@ -1178,38 +1193,38 @@ msgstr "aggiornamento wiki..."
     msgid "Discussion"
     msgstr "Discussione"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi"
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr "impossibile usare più plugin rcs"
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr "impossibile caricare il plugin esterno per il plugin %s: %s"
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "ciclo del preprocessore individuato su %s alla profondità %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr "sì"
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural"
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "ordinamento %s sconosciuto"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr "impossibile trovare pagine corrispondenti: %s"
    diff --git a/po/pl.po b/po/pl.po
    index 77e1537f4..9fb3cacc0 100644
    --- a/po/pl.po
    +++ b/po/pl.po
    @@ -8,7 +8,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki 1.51\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2007-04-27 22:05+0200\n"
     "Last-Translator: Pawel Tecza \n"
     "Language-Team: Debian L10n Polish \n"
    @@ -57,7 +57,7 @@ msgstr "Preferencje zapisane."
     msgid "You are banned."
     msgstr "Twój dostęp został zabroniony przez administratora."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Błąd"
     
    @@ -139,7 +139,7 @@ msgstr "tworzenie nowej strony %s"
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "gotowe"
     
    @@ -248,7 +248,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -520,7 +520,7 @@ msgstr "Kopie lustrzane"
     msgid "Mirror"
     msgstr "Kopia lustrzana"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr ""
     
    @@ -898,12 +898,12 @@ msgstr "awaria w trakcie odczytu %s: %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr ""
     
    @@ -995,61 +995,61 @@ msgstr "awaria w trakcie przetwarzania linii %d: %s"
     msgid "missing id parameter"
     msgstr "brakujący parametr id"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "nieznaleziony szablon %s"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     #, fuzzy
     msgid "failed to process:"
     msgstr "awaria w trakcie przetwarzania:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     #, fuzzy
     msgid "missing tex code"
     msgstr "brakujące wartości"
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     #, fuzzy
     msgid "failed to generate image from code"
     msgstr "awaria w trakcie zmiany rozmiaru: %s"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1118,25 +1118,35 @@ msgstr "ikiwiki: awaria w trakcie tworzenia %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "awaria w trakcie odczytu %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "awaria w trakcie odczytu %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "awaria w trakcie kompilowania %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1155,13 +1165,13 @@ msgid "wrapper filename not specified"
     msgstr "nieokreślona nazwa pliku osłony"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "awaria w trakcie kompilowania %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "pomyślnie utworzono %s"
    @@ -1174,19 +1184,23 @@ msgstr "użycie: ikiwiki [parametry] źródło cel"
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "tworzenie osłon..."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "przebudowywanie wiki..."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "odświeżanie wiki..."
     
    @@ -1194,40 +1208,40 @@ msgstr "odświeżanie wiki..."
     msgid "Discussion"
     msgstr "Dyskusja"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     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:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, fuzzy, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "nieznany sposób sortowania %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, fuzzy, perl-format
     msgid "cannot match pages: %s"
     msgstr "awaria w trakcie odczytu %s: %s"
    diff --git a/po/sv.po b/po/sv.po
    index 20a8020c1..0d4c6202e 100644
    --- a/po/sv.po
    +++ b/po/sv.po
    @@ -7,7 +7,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2007-01-10 23:47+0100\n"
     "Last-Translator: Daniel Nylander \n"
     "Language-Team: Swedish \n"
    @@ -54,7 +54,7 @@ msgstr "Inställningar sparades."
     msgid "You are banned."
     msgstr "Du är bannlyst."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Fel"
     
    @@ -136,7 +136,7 @@ msgstr "skapar nya sidan %s"
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "klar"
     
    @@ -245,7 +245,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -513,7 +513,7 @@ msgstr "Speglar"
     msgid "Mirror"
     msgstr "Spegel"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr ""
     
    @@ -888,12 +888,12 @@ msgstr "misslyckades med att skriva %s: %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr ""
     
    @@ -983,60 +983,60 @@ msgstr "misslyckades med att skriva %s: %s"
     msgid "missing id parameter"
     msgstr "mall saknar id-parameter"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "mallen %s hittades inte"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     #, fuzzy
     msgid "failed to process:"
     msgstr "misslyckades med att behandla mall:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     #, fuzzy
     msgid "failed to generate image from code"
     msgstr "misslyckades med att skriva %s: %s"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1105,25 +1105,35 @@ msgstr "ikiwiki: kan inte rita upp %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "kan inte läsa %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "kan inte läsa %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "misslyckades med att kompilera %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1142,13 +1152,13 @@ msgid "wrapper filename not specified"
     msgstr "filnamn för wrapper har inte angivits"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "misslyckades med att kompilera %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "generering av %s lyckades"
    @@ -1161,19 +1171,23 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "genererar wrappers.."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "bygger om wiki.."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "uppdaterar wiki.."
     
    @@ -1181,38 +1195,38 @@ msgstr "uppdaterar wiki.."
     msgid "Discussion"
     msgstr "Diskussion"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     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:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, fuzzy, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "okänd sorteringstyp %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, fuzzy, perl-format
     msgid "cannot match pages: %s"
     msgstr "kan inte läsa %s: %s"
    diff --git a/po/tr.po b/po/tr.po
    index b3742ca36..b59f5e941 100644
    --- a/po/tr.po
    +++ b/po/tr.po
    @@ -5,7 +5,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki 3.20091031\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2009-11-08 03:04+0200\n"
     "Last-Translator: Recai Oktaş \n"
     "Language-Team: Turkish \n"
    @@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi."
     msgid "You are banned."
     msgstr ""
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Hata"
     
    @@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor"
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr ""
     
    @@ -238,7 +238,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -490,7 +490,7 @@ msgstr ""
     msgid "Mirror"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr ""
     
    @@ -860,12 +860,12 @@ msgstr ""
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr ""
     
    @@ -947,58 +947,58 @@ msgstr ""
     msgid "missing id parameter"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     msgid "failed to process:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     msgid "failed to generate image from code"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1067,25 +1067,35 @@ msgstr ""
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr ""
     
    +#: ../IkiWiki/Setup.pm:34
    +#, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr ""
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, perl-format
    +msgid "failed to parse %s"
    +msgstr ""
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1104,13 +1114,13 @@ msgid "wrapper filename not specified"
     msgstr ""
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr ""
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr ""
    @@ -1123,19 +1133,23 @@ msgstr ""
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr ""
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr ""
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr ""
     
    @@ -1143,38 +1157,38 @@ msgstr ""
     msgid "Discussion"
     msgstr ""
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     msgid "Must specify url to wiki with --url when using --cgi"
     msgstr ""
     
    -#: ../IkiWiki.pm:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr ""
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, perl-format
     msgid "cannot match pages: %s"
     msgstr ""
    diff --git a/po/vi.po b/po/vi.po
    index cfc7184ef..5f968ccb3 100644
    --- a/po/vi.po
    +++ b/po/vi.po
    @@ -6,7 +6,7 @@ msgid ""
     msgstr ""
     "Project-Id-Version: ikiwiki\n"
     "Report-Msgid-Bugs-To: \n"
    -"POT-Creation-Date: 2010-03-02 22:18-0500\n"
    +"POT-Creation-Date: 2010-04-03 14:18-0400\n"
     "PO-Revision-Date: 2007-01-13 15:31+1030\n"
     "Last-Translator: Clytie Siddall \n"
     "Language-Team: Vietnamese \n"
    @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu."
     msgid "You are banned."
     msgstr "Bạn bị cấm ra."
     
    -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280
    +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296
     msgid "Error"
     msgstr "Lỗi"
     
    @@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s"
     msgid "deleting bucket.."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216
    +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230
     msgid "done"
     msgstr "xong"
     
    @@ -246,7 +246,7 @@ msgstr ""
     msgid "Added a comment: %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256
    +#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270
     msgid "you are not logged in as an admin"
     msgstr ""
     
    @@ -513,7 +513,7 @@ msgstr "Nhân bản"
     msgid "Mirror"
     msgstr "Nhân bản"
     
    -#: ../IkiWiki/Plugin/moderatedcomments.pm:42
    +#: ../IkiWiki/Plugin/moderatedcomments.pm:57
     msgid "comment needs moderation"
     msgstr ""
     
    @@ -888,12 +888,12 @@ msgstr "lỗi ghi %s: %s"
     msgid "rsync_command exited %d"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:183
    +#: ../IkiWiki/Plugin/search.pm:184
     #, perl-format
     msgid "need Digest::SHA1 to index %s"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/search.pm:218
    +#: ../IkiWiki/Plugin/search.pm:221
     msgid "search"
     msgstr ""
     
    @@ -983,60 +983,60 @@ msgstr "lỗi ghi %s: %s"
     msgid "missing id parameter"
     msgstr "mẫu thiếu tham số id"
     
    -#: ../IkiWiki/Plugin/template.pm:41
    +#: ../IkiWiki/Plugin/template.pm:47
     #, perl-format
     msgid "template %s not found"
     msgstr "không tìm thấy mẫu %s"
     
    -#: ../IkiWiki/Plugin/template.pm:60
    +#: ../IkiWiki/Plugin/template.pm:66
     #, fuzzy
     msgid "failed to process:"
     msgstr "mẫu không xử lý được:"
     
    -#: ../IkiWiki/Plugin/teximg.pm:71
    +#: ../IkiWiki/Plugin/teximg.pm:72
     msgid "missing tex code"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/teximg.pm:123
    +#: ../IkiWiki/Plugin/teximg.pm:124
     #, fuzzy
     msgid "failed to generate image from code"
     msgstr "lỗi ghi %s: %s"
     
    -#: ../IkiWiki/Plugin/websetup.pm:91
    +#: ../IkiWiki/Plugin/websetup.pm:105
     #, perl-format
     msgid "%s plugin:"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:107
    +#: ../IkiWiki/Plugin/websetup.pm:121
     #, perl-format
     msgid "%s plugins"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:121
    +#: ../IkiWiki/Plugin/websetup.pm:135
     #, perl-format
     msgid "enable %s?"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:260
    +#: ../IkiWiki/Plugin/websetup.pm:274
     msgid "setup file for this wiki is not known"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:276
    +#: ../IkiWiki/Plugin/websetup.pm:290
     msgid "main"
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:419
    +#: ../IkiWiki/Plugin/websetup.pm:433
     msgid ""
     "The configuration changes shown below require a wiki rebuild to take effect."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:423
    +#: ../IkiWiki/Plugin/websetup.pm:437
     msgid ""
     "For the configuration changes shown below to fully take effect, you may need "
     "to rebuild the wiki."
     msgstr ""
     
    -#: ../IkiWiki/Plugin/websetup.pm:460
    +#: ../IkiWiki/Plugin/websetup.pm:474
     #, perl-format
     msgid "Error: %s exited nonzero (%s). Discarding setup changes."
     msgstr ""
    @@ -1105,25 +1105,35 @@ msgstr "ikiwiki: không thể vẽ %s"
     
     #. translators: The first parameter is a filename, and the second
     #. translators: is a (probably not translated) error message.
    -#: ../IkiWiki/Setup.pm:19
    +#: ../IkiWiki/Setup.pm:23
     #, perl-format
     msgid "cannot read %s: %s"
     msgstr "không thể đọc %s: %s"
     
    +#: ../IkiWiki/Setup.pm:34
    +#, fuzzy, perl-format
    +msgid "cannot load %s in safe mode"
    +msgstr "không thể đọc %s: %s"
    +
    +#: ../IkiWiki/Setup.pm:46
    +#, fuzzy, perl-format
    +msgid "failed to parse %s"
    +msgstr "lỗi biên dịch %s"
    +
     #: ../IkiWiki/Setup/Automator.pm:34
     msgid "you must enter a wikiname (that contains alphanumerics)"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:82
    +#: ../IkiWiki/Setup/Automator.pm:89
     #, perl-format
     msgid "unsupported revision control system %s"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:108
    +#: ../IkiWiki/Setup/Automator.pm:115
     msgid "failed to set up the repository with ikiwiki-makerepo"
     msgstr ""
     
    -#: ../IkiWiki/Setup/Automator.pm:126
    +#: ../IkiWiki/Setup/Automator.pm:134
     #, perl-format
     msgid "** Disabling plugin %s, since it is failing with this message:"
     msgstr ""
    @@ -1142,13 +1152,13 @@ msgid "wrapper filename not specified"
     msgstr "chưa xác định tên tập tin bộ bao bọc"
     
     #. translators: The parameter is a C filename.
    -#: ../IkiWiki/Wrapper.pm:149
    +#: ../IkiWiki/Wrapper.pm:159
     #, perl-format
     msgid "failed to compile %s"
     msgstr "lỗi biên dịch %s"
     
     #. translators: The parameter is a filename.
    -#: ../IkiWiki/Wrapper.pm:169
    +#: ../IkiWiki/Wrapper.pm:179
     #, perl-format
     msgid "successfully generated %s"
     msgstr "%s đã được tạo ra"
    @@ -1161,19 +1171,23 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích"
     msgid "       ikiwiki --setup configfile"
     msgstr ""
     
    -#: ../ikiwiki.in:92
    +#: ../ikiwiki.in:95
     msgid "usage: --set var=value"
     msgstr ""
     
    -#: ../ikiwiki.in:142
    +#: ../ikiwiki.in:102
    +msgid "usage: --set-yaml var=value"
    +msgstr ""
    +
    +#: ../ikiwiki.in:156
     msgid "generating wrappers.."
     msgstr "đang tạo ra các bộ bao bọc.."
     
    -#: ../ikiwiki.in:205
    +#: ../ikiwiki.in:219
     msgid "rebuilding wiki.."
     msgstr "đang xây dựng lại wiki.."
     
    -#: ../ikiwiki.in:208
    +#: ../ikiwiki.in:222
     msgid "refreshing wiki.."
     msgstr "đang làm tươi wiki.."
     
    @@ -1181,38 +1195,38 @@ msgstr "đang làm tươi wiki.."
     msgid "Discussion"
     msgstr "Thảo luận"
     
    -#: ../IkiWiki.pm:514
    +#: ../IkiWiki.pm:530
     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:560
    +#: ../IkiWiki.pm:576
     msgid "cannot use multiple rcs plugins"
     msgstr ""
     
    -#: ../IkiWiki.pm:589
    +#: ../IkiWiki.pm:605
     #, perl-format
     msgid "failed to load external plugin needed for %s plugin: %s"
     msgstr ""
     
    -#: ../IkiWiki.pm:1262
    +#: ../IkiWiki.pm:1278
     #, fuzzy, perl-format
     msgid "preprocessing loop detected on %s at depth %i"
     msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
     
    -#: ../IkiWiki.pm:1877
    +#: ../IkiWiki.pm:1901
     msgid "yes"
     msgstr ""
     
    -#: ../IkiWiki.pm:2020
    +#: ../IkiWiki.pm:2044
     msgid "Sort::Naturally needed for title_natural sort"
     msgstr ""
     
    -#: ../IkiWiki.pm:2031
    +#: ../IkiWiki.pm:2055
     #, perl-format
     msgid "unknown sort type %s"
     msgstr "kiểu sắp xếp không rõ %s"
     
    -#: ../IkiWiki.pm:2050
    +#: ../IkiWiki.pm:2074
     #, fuzzy, perl-format
     msgid "cannot match pages: %s"
     msgstr "không thể đọc %s: %s"
    -- 
    cgit v1.2.3
    
    
    From 195943e588b8c7b6a3a43d10404d2d40a503c1d5 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sat, 3 Apr 2010 16:07:32 -0400
    Subject: slightly more consistent capitalisation of ikiwiki
    
    For a while, I was avoiding capitalizing ikiwiki at the beginning of a
    sentence. I now think that's a bad idea (unless explicitly referring to
    the `ikiwiki` command). Still, I don't go all the way and always cap it,
    as a proper noun. That would make the logo look bad. ;)
    
    I also tend to avoid capping it as IkiWiki, except when referring to the
    perl internals, which do use that capitalization. (Too late to change
    that.) However, it's also reasonable to do so in a WikiLink, as a nod to
    historical camelcase wikis.
    ---
     debian/control                     |  6 +++---
     doc/download.mdwn                  |  2 +-
     doc/features.mdwn                  | 12 ++++++------
     doc/forum/speeding_up_ikiwiki.mdwn |  2 +-
     doc/index.mdwn                     |  2 +-
     5 files changed, 12 insertions(+), 12 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/control b/debian/control
    index 24c2c96a5..d7ce9a178 100644
    --- a/debian/control
    +++ b/debian/control
    @@ -42,17 +42,17 @@ Conflicts: ikiwiki-plugin-table
     Replaces: ikiwiki-plugin-table
     Provides: ikiwiki-plugin-table
     Description: a wiki compiler
    - ikiwiki converts a directory full of wiki pages into HTML pages suitable
    + Ikiwiki converts a directory full of wiki pages into HTML pages suitable
      for publishing on a website. Unlike many wikis, ikiwiki does not have its
      own ad-hoc means of storing page history, and instead uses a revision control
      system such as Subversion or Git.
      .
    - ikiwiki implements all of the other standard features of a wiki, including
    + Ikiwiki implements all of the other standard features of a wiki, including
      web-based page editing, user registration and logins, a RecentChanges
      page, BackLinks, search, Discussion pages, tags, smart merging and conflict
      resolution, and page locking.
      .
    - ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
    + Ikiwiki also supports generating news feeds (RSS and Atom) and blogging.
      ikiwiki provides a plugin system which allows many other features to be
      added. Some of the plugins have additional dependencies, found among the
      Recommends and Suggests of this package.
    diff --git a/doc/download.mdwn b/doc/download.mdwn
    index 45d0d7870..92c8a4f75 100644
    --- a/doc/download.mdwn
    +++ b/doc/download.mdwn
    @@ -35,7 +35,7 @@ own RPM.
     
     ## BSD ports
     
    -IkiWiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
    +Ikiwiki can be installed [from macports](http://www.macports.org/ports.php?by=name&substr=ikiwiki)
     by running `sudo port install ikiwiki`.
     
     NetBSD and many other platforms: pkgsrc has an [ikiwiki package](ftp://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/www/ikiwiki/README.html).
    diff --git a/doc/features.mdwn b/doc/features.mdwn
    index 3925d78ef..ab521213d 100644
    --- a/doc/features.mdwn
    +++ b/doc/features.mdwn
    @@ -13,7 +13,7 @@ Instead of editing pages in a stupid web form, you can use vim and commit
     changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
     [[Revision_Control_Systems|rcs]].
     
    -ikiwiki can be run from a [[post-commit]] hook to update your wiki
    +Ikiwiki can be run from a [[post-commit]] hook to update your wiki
     immediately whenever you commit a change using the RCS.
     
     It's even possible to securely let
    @@ -25,7 +25,7 @@ run a simple wiki without page history, it can do that too.
     
     ## A wiki compiler
     
    -ikiwiki is a wiki compiler; it builds a static website for your wiki, and
    +Ikiwiki is a wiki compiler; it builds a static website for your wiki, and
     updates it as pages are edited. It is fast and smart about updating a wiki,
     it only builds pages that have changed (and tracks things like creation of
     new pages and links that can indirectly cause a page to need a rebuild)
    @@ -45,7 +45,7 @@ easily be added by [[plugins]]. For example it also supports traditional
     [[plugins/HTML]], or pages written in [[reStructuredText|plugins/rst]]
     or [[Textile|plugins/textile]].
     
    -ikiwiki also supports files of any other type, including plain text,
    +Ikiwiki also supports files of any other type, including plain text,
     images, etc. These are not converted to wiki pages, they are just copied
     unchanged by ikiwiki as it builds your wiki. So you can check in an image,
     program, or other special file and link to it from your wiki pages.
    @@ -70,8 +70,8 @@ you would care to syndicate.
     
     ## Valid html and [[css]]
     
    -ikiwiki aims to produce 
    -[valid XHTML 1.0](http://validator.w3.org/check?url=referer). ikiwiki
    +Ikiwiki aims to produce 
    +[valid XHTML 1.0](http://validator.w3.org/check?url=referer). Ikiwiki
     generates html using [[templates|wikitemplates]], and uses [[css]], so you
     can change the look and layout of all pages in any way you would like.
     
    @@ -163,7 +163,7 @@ Well, sorta. Rather than implementing YA history browser, it can link to
     
     ### Full text search
     
    -ikiwiki can use the xapian search engine to add powerful
    +Ikiwiki can use the xapian search engine to add powerful
     full text [[plugins/search]] capabilities to your wiki.
     
     ### Translation via po files
    diff --git a/doc/forum/speeding_up_ikiwiki.mdwn b/doc/forum/speeding_up_ikiwiki.mdwn
    index 2c2ac240e..799186cf8 100644
    --- a/doc/forum/speeding_up_ikiwiki.mdwn
    +++ b/doc/forum/speeding_up_ikiwiki.mdwn
    @@ -56,7 +56,7 @@ number is still too large to really visualize: the graphviz PNG and PDF output
     engines segfault for me, the PS one works but I can't get any PS software to
     render it without exploding.
     
    -Now, the relations in the links hash are not the same thing as IkiWiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
    +Now, the relations in the links hash are not the same thing as Ikiwiki's notion of dependencies. Can anyone point me at  that data structure / where I might be able to add some debugging foo to generate a graph of it?
     
     Once I've figured out that I might be able to optimize some pagespecs. I
     understand pagespecs are essentially translated into sequential perl code. I
    diff --git a/doc/index.mdwn b/doc/index.mdwn
    index 732cf7a89..06acc9cec 100644
    --- a/doc/index.mdwn
    +++ b/doc/index.mdwn
    @@ -24,5 +24,5 @@ The [[forum]] is open for discussions.
     [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]]
     can be submitted and tracked using this wiki.
     
    -ikiwiki is developed by [[Joey]] and many contributors,
    +Ikiwiki is developed by [[Joey]] and many contributors,
     and is [[FreeSoftware]].
    -- 
    cgit v1.2.3
    
    
    From 992c2c6bca9a8ada45b043c6418b00d295012324 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sun, 4 Apr 2010 12:17:36 -0400
    Subject: changelog
    
    ---
     debian/changelog | 6 ++++++
     1 file changed, 6 insertions(+)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 32a38925d..b7b614604 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -1,3 +1,9 @@
    +ikiwiki (3.20100404) UNRELEASED; urgency=low
    +
    +  * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
    +
    + -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
    +
     ikiwiki (3.20100403) unstable; urgency=low
     
       * websetup: Add websetup_unsafe to allow marking other settings
    -- 
    cgit v1.2.3
    
    
    From 09d4e9d6bb7a049b0721ffbf7dc6e64bee4404cc Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Mon, 5 Apr 2010 16:34:49 -0400
    Subject: comments: Fix missing entity encoding in title.
    
    The meta title data set by comments needs to be encoded the same way that
    meta encodes it. (NB The security implications of the missing encoding
    are small.)
    
    Note that meta's encoding of title, description, and guid data, and not
    other data, is probably a special case that should be removed. Instead,
    these values should be encoded when used. I have avoided doing so here
    because that would mean forcing a wiki rebuild on upgrade to have the data
    consitently encoded.
    ---
     IkiWiki/Plugin/comments.pm | 4 +++-
     debian/changelog           | 1 +
     2 files changed, 4 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
    index 98786f432..460341710 100644
    --- a/IkiWiki/Plugin/comments.pm
    +++ b/IkiWiki/Plugin/comments.pm
    @@ -221,7 +221,9 @@ sub preprocess {
     	}
     
     	if (defined $params{subject}) {
    -		$pagestate{$page}{meta}{title} = $params{subject};
    +		# encode title the same way meta does
    +		eval q{use HTML::Entities};
    +		$pagestate{$page}{meta}{title} = HTML::Entities::encode_numeric(decode_entities($params{subject}));
     	}
     
     	if ($params{page} =~ m/\/\Q$config{comments_pagename}\E\d+_/) {
    diff --git a/debian/changelog b/debian/changelog
    index b7b614604..be89d0918 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -1,6 +1,7 @@
     ikiwiki (3.20100404) UNRELEASED; urgency=low
     
       * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
    +  * comments: Fix missing entity encoding in title.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    -- 
    cgit v1.2.3
    
    
    From a01028ae8156679a108a40c62aa6b4cc3e2b3ae7 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Mon, 5 Apr 2010 17:02:10 -0400
    Subject: txt: Add a special case for robots.txt.
    
    ---
     IkiWiki/Plugin/txt.pm | 9 ++++++++-
     debian/changelog      | 1 +
     doc/plugins/txt.mdwn  | 5 +++++
     3 files changed, 14 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/txt.pm b/IkiWiki/Plugin/txt.pm
    index 1ed9f0856..0d9a0b35b 100644
    --- a/IkiWiki/Plugin/txt.pm
    +++ b/IkiWiki/Plugin/txt.pm
    @@ -39,7 +39,14 @@ sub filter (@) {
     	my %params = @_;
     	my $content = $params{content};
     
    -	if (defined $pagesources{$params{page}} && $pagesources{$params{page}} =~ /\.txt$/) {
    +	if (defined $pagesources{$params{page}} &&
    +	    $pagesources{$params{page}} =~ /\.txt$/) {
    +		if ($pagesources{$params{page}} eq 'robots.txt' &&
    +		    $params{page} eq $params{destpage}) {
    +			will_render($params{page}, 'robots.txt');
    +			writefile('robots.txt', $config{destdir}, $content);
    +		}
    +
     		encode_entities($content, "<>&");
     		if ($findurl) {
     			my $finder = URI::Find->new(sub {
    diff --git a/debian/changelog b/debian/changelog
    index be89d0918..77d17f566 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -2,6 +2,7 @@ ikiwiki (3.20100404) UNRELEASED; urgency=low
     
       * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
       * comments: Fix missing entity encoding in title.
    +  * txt: Add a special case for robots.txt.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
    index 420898d09..a3087c9e0 100644
    --- a/doc/plugins/txt.mdwn
    +++ b/doc/plugins/txt.mdwn
    @@ -12,3 +12,8 @@ The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and
     [[directives|ikiwiki/directive]] are still expanded by
     ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs
     in the txt file are converted to hyperlinks.
    +
    +----
    +
    +As a special case, a file `robots.txt` will be copied intact into the
    +`destdir`, as well as creating a wiki page named "robots".
    -- 
    cgit v1.2.3
    
    
    From 48178c48ed63f1004e44b2e7850bcef773f0a1e5 Mon Sep 17 00:00:00 2001
    From: Simon McVittie 
    Date: Tue, 6 Apr 2010 20:59:45 +0100
    Subject: Auto-rebuild wikis on upgrade due to the taglink change
    
    debian/NEWS and debian/postinst should be edited before release to have
    an appropriate version number.
    ---
     debian/NEWS     | 10 ++++++++++
     debian/postinst |  2 +-
     2 files changed, 11 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/debian/NEWS b/debian/NEWS
    index 50332670f..afb3a8652 100644
    --- a/debian/NEWS
    +++ b/debian/NEWS
    @@ -1,3 +1,13 @@
    +ikiwiki (3.UNRELEASED) UNRELEASED; urgency=low
    +
    +  Starting from this version, the tagged(x) pagespec only matches links that
    +  were set up by the [[!tag]] or [[!taglink]] directives. To make this change,
    +  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.
    +
    + -- Simon McVittie   Tue, 06 Apr 2010 20:53:07 +0100
    +
     ikiwiki (3.20091017) unstable; urgency=low
     
       To take advantage of significant performance improvements, all
    diff --git a/debian/postinst b/debian/postinst
    index bf1825ab7..90b9e8a42 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=3.20091010
    +firstcompat=3.20100401
     
     if [ "$1" = configure ] && \
        dpkg --compare-versions "$2" lt "$firstcompat"; then
    -- 
    cgit v1.2.3
    
    
    From c0ca1967586234ae4e84e485af53804df2198bcd Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Tue, 6 Apr 2010 22:58:22 -0400
    Subject: tweak wording and versions and add changelog entry
    
    ---
     debian/NEWS      | 12 ++++++------
     debian/changelog |  6 +++++-
     debian/postinst  |  2 +-
     3 files changed, 12 insertions(+), 8 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/NEWS b/debian/NEWS
    index afb3a8652..4e433fd37 100644
    --- a/debian/NEWS
    +++ b/debian/NEWS
    @@ -1,10 +1,10 @@
    -ikiwiki (3.UNRELEASED) UNRELEASED; urgency=low
    +ikiwiki (3.20100406) unstable; urgency=low
     
    -  Starting from this version, the tagged(x) pagespec only matches links that
    -  were set up by the [[!tag]] or [[!taglink]] directives. To make this change,
    -  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.
    +  Starting from this version, the tagged() pagespec only matches tags,
    +  not regular wikilinks. To support this change, 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.
     
      -- Simon McVittie   Tue, 06 Apr 2010 20:53:07 +0100
     
    diff --git a/debian/changelog b/debian/changelog
    index 77d17f566..435b7982f 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -1,8 +1,12 @@
    -ikiwiki (3.20100404) UNRELEASED; urgency=low
    +ikiwiki (3.20100406) UNRELEASED; urgency=low
     
       * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
       * comments: Fix missing entity encoding in title.
       * txt: Add a special case for robots.txt.
    +  * Add support for link types, and make the the tagged() pagespec only
    +    match tags, not regular links (a bugfix). 
    +  * Rebuild wikis on upgrade to this version to get tag link types recorded
    +    correctly.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    diff --git a/debian/postinst b/debian/postinst
    index 90b9e8a42..8eac26361 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=3.20100401
    +firstcompat=3.20100406
     
     if [ "$1" = configure ] && \
        dpkg --compare-versions "$2" lt "$firstcompat"; then
    -- 
    cgit v1.2.3
    
    
    From 25f3dd88180b1f96c7626f93f7f8841ef7df6f59 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Tue, 6 Apr 2010 23:02:18 -0400
    Subject: add note about minor back compat issue
    
    ---
     debian/NEWS | 13 ++++++++-----
     1 file changed, 8 insertions(+), 5 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/NEWS b/debian/NEWS
    index 4e433fd37..e1cb00473 100644
    --- a/debian/NEWS
    +++ b/debian/NEWS
    @@ -1,10 +1,13 @@
     ikiwiki (3.20100406) unstable; urgency=low
     
    -  Starting from this version, the tagged() pagespec only matches tags,
    -  not regular wikilinks. To support this change, 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.
    +  Starting from this version, the `tagged()` pagespec only matches tags,
    +  not regular wikilinks. If your wiki accidentially relied on the old,
    +  buggy behavior, you might need to change pagespecs to use `link()`.
    +
    +  To support the above change, 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.
     
      -- Simon McVittie   Tue, 06 Apr 2010 20:53:07 +0100
     
    -- 
    cgit v1.2.3
    
    
    From 425ffc34f730c76ff964111a65055b62739928d4 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Tue, 6 Apr 2010 23:35:14 -0400
    Subject: update for sort changes
    
    ---
     debian/changelog | 13 ++++++++++++-
     1 file changed, 12 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 435b7982f..5a9c85ac7 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -1,12 +1,23 @@
     ikiwiki (3.20100406) UNRELEASED; urgency=low
     
    +  [ Joey Hess ]
       * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
       * comments: Fix missing entity encoding in title.
       * txt: Add a special case for robots.txt.
    +
    +  [ Simon McVittie ]
       * Add support for link types, and make the the tagged() pagespec only
    -    match tags, not regular links (a bugfix). 
    +    match tags, not regular links (a bugfix).
       * Rebuild wikis on upgrade to this version to get tag link types recorded
         correctly.
    +  * Revamp sorting system; allow new sort methods to be added by plugins,
    +    and add a "sortspec" syntax that can combine, reverse, etc sort methods
    +  * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
    +    by metadata.
    +  * meta: Add optional sortas parameter to author and title meta directives.
    +    This can be used to get names sorted by last name without displaying
    +    them last name first.
    +  * sortnarurally: New plugin; the title_natural sort method has moved here.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    -- 
    cgit v1.2.3
    
    
    From 196851d4e2ff608e80855ae6ba12178a24595e5b Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Tue, 6 Apr 2010 23:37:46 -0400
    Subject: typo
    
    ---
     debian/changelog | 4 ++--
     1 file changed, 2 insertions(+), 2 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 5a9c85ac7..9acd11e60 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -11,13 +11,13 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
       * Rebuild wikis on upgrade to this version to get tag link types recorded
         correctly.
       * Revamp sorting system; allow new sort methods to be added by plugins,
    -    and add a "sortspec" syntax that can combine, reverse, etc sort methods
    +    and add a "sortspec" syntax that can combine, reverse, etc sort methods.
       * meta: Add `meta(author)`, `meta(title)` etc sortspecs to allow sorting
         by metadata.
       * meta: Add optional sortas parameter to author and title meta directives.
         This can be used to get names sorted by last name without displaying
         them last name first.
    -  * sortnarurally: New plugin; the title_natural sort method has moved here.
    +  * sortnaturally: New plugin; the title_natural sort method has moved here.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    -- 
    cgit v1.2.3
    
    
    From a4a63cb7f9dcafb72810ba1a2ad69654cb8199d2 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Thu, 8 Apr 2010 16:07:43 -0400
    Subject: Update dependency for git-core to git transition.
    
    ---
     debian/changelog | 3 +++
     debian/control   | 2 +-
     2 files changed, 4 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 9acd11e60..e14cc91f5 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -19,6 +19,9 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
         them last name first.
       * sortnaturally: New plugin; the title_natural sort method has moved here.
     
    +  [ Joey Hess ]
    +  * Update dependency for git-core to git transition.
    +
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
     ikiwiki (3.20100403) unstable; urgency=low
    diff --git a/debian/control b/debian/control
    index d7ce9a178..b8fe81914 100644
    --- a/debian/control
    +++ b/debian/control
    @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends},
       libhtml-parser-perl, liburi-perl
     Recommends: gcc | c-compiler, 
       libc6-dev | libc-dev,
    -  subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
    +  subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs,
       libxml-simple-perl, libnet-openid-consumer-perl,
       liblwpx-paranoidagent-perl, libtimedate-perl,
       libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1),
    -- 
    cgit v1.2.3
    
    
    From d1a616df2ed79b1602658c5d10d54ee00afc537e Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Fri, 9 Apr 2010 18:43:25 -0400
    Subject: po: Check that translated underlay directories exist before using
     them for master language.
    
    ---
     IkiWiki/Plugin/po.pm | 4 +++-
     debian/changelog     | 2 ++
     2 files changed, 5 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
    index 2250a7f9f..00c58fbe5 100644
    --- a/IkiWiki/Plugin/po.pm
    +++ b/IkiWiki/Plugin/po.pm
    @@ -174,7 +174,9 @@ sub checkconfig () {
     		if ($config{po_master_language}{code} ne 'en') {
     			# Add underlay containing translated source files
     			# for the master language.
    -			add_underlay("locale/$config{po_master_language}{code}/$underlay");
    +print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
    +			add_underlay("locale/$config{po_master_language}{code}/$underlay")
    +				if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
     		}
     	}
     }
    diff --git a/debian/changelog b/debian/changelog
    index e14cc91f5..e985a5da8 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -21,6 +21,8 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
     
       [ Joey Hess ]
       * Update dependency for git-core to git transition.
    +  * po: Check that translated underlay directories exist before using them
    +    for master language.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    -- 
    cgit v1.2.3
    
    
    From 61cbcb049fd1eb6a57ca2f51c78767a25d22820b Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sat, 10 Apr 2010 14:35:45 -0400
    Subject: update changelog, update rebuild version
    
    ---
     debian/NEWS      | 8 ++++----
     debian/changelog | 4 +++-
     debian/postinst  | 2 +-
     3 files changed, 8 insertions(+), 6 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/NEWS b/debian/NEWS
    index b796154fa..25ebed0b4 100644
    --- a/debian/NEWS
    +++ b/debian/NEWS
    @@ -8,10 +8,10 @@ ikiwiki (3.20100406) unstable; urgency=low
       not regular wikilinks. If your wiki accidentially relied on the old,
       buggy behavior, you might need to change pagespecs to use `link()`.
     
    -  To support the above change, 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.
    +  Due to the above and other changes, 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.
     
      -- Simon McVittie   Tue, 06 Apr 2010 20:53:07 +0100
     
    diff --git a/debian/changelog b/debian/changelog
    index e985a5da8..113138358 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -1,4 +1,4 @@
    -ikiwiki (3.20100406) UNRELEASED; urgency=low
    +ikiwiki (3.20100410) UNRELEASED; urgency=low
     
       [ Joey Hess ]
       * bzr: Fix bzr log parsing to work with bzr 2.0. (liw)
    @@ -18,6 +18,8 @@ ikiwiki (3.20100406) UNRELEASED; urgency=low
         This can be used to get names sorted by last name without displaying
         them last name first.
       * sortnaturally: New plugin; the title_natural sort method has moved here.
    +  * meta: store fields consistently unescaped, and escape on use
    +    A wiki rebuild is also needed due to this change.
     
       [ Joey Hess ]
       * Update dependency for git-core to git transition.
    diff --git a/debian/postinst b/debian/postinst
    index 8eac26361..fa0591153 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=3.20100406
    +firstcompat=3.20100410
     
     if [ "$1" = configure ] && \
        dpkg --compare-versions "$2" lt "$firstcompat"; then
    -- 
    cgit v1.2.3
    
    
    From d5eb5401496db1d7374a23f996e6924338d14ae2 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sat, 10 Apr 2010 18:28:15 -0400
    Subject: po: Configuring the same language as master and slave confuses
     processing; so filter out such a misconfiguration.
    
    ---
     IkiWiki/Plugin/po.pm | 2 +-
     debian/changelog     | 2 ++
     2 files changed, 3 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
    index 00c58fbe5..759e812e6 100644
    --- a/IkiWiki/Plugin/po.pm
    +++ b/IkiWiki/Plugin/po.pm
    @@ -133,6 +133,7 @@ sub checkconfig () {
     				      $field, 'po'));
     		}
     	}
    +	delete $config{po_slave_languages}{$config{po_master_language}{code}};;
     
     	map {
     		islanguagecode($_)
    @@ -174,7 +175,6 @@ sub checkconfig () {
     		if ($config{po_master_language}{code} ne 'en') {
     			# Add underlay containing translated source files
     			# for the master language.
    -print STDERR "added underlay locale/$config{po_master_language}{code}/$underlay\n";
     			add_underlay("locale/$config{po_master_language}{code}/$underlay")
     				if -d "$config{underlaydirbase}/locale/$config{po_master_language}{code}/$underlay";
     		}
    diff --git a/debian/changelog b/debian/changelog
    index 113138358..208578527 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -25,6 +25,8 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
       * Update dependency for git-core to git transition.
       * po: Check that translated underlay directories exist before using them
         for master language.
    +  * po: Configuring the same language as master and slave confuses processing;
    +    so filter out such a misconfiguration.
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    -- 
    cgit v1.2.3
    
    
    From 1be32275837760c65ef96e40893fb8ba540bc939 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Sat, 10 Apr 2010 22:04:48 -0400
    Subject: formatting
    
    ---
     debian/changelog | 4 ++--
     1 file changed, 2 insertions(+), 2 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/debian/changelog b/debian/changelog
    index 208578527..26b00a07c 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -18,8 +18,8 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
         This can be used to get names sorted by last name without displaying
         them last name first.
       * sortnaturally: New plugin; the title_natural sort method has moved here.
    -  * meta: store fields consistently unescaped, and escape on use
    -    A wiki rebuild is also needed due to this change.
    +  * meta: store fields consistently unescaped, and escape on use.
    +    (A wiki rebuild is also needed due to this change.)
     
       [ Joey Hess ]
       * Update dependency for git-core to git transition.
    -- 
    cgit v1.2.3
    
    
    From 3131433f64235ad5425eb93d5773580b607876fb Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Thu, 15 Apr 2010 13:40:53 -0400
    Subject: calendar: Add archive_pagespec, which is used by ikiwiki-calendar to
     specify which pages to include on the calendar archive pages. (The pagespec
     can still also be specified on the ikiwiki-calendar command line.)
    
    ---
     IkiWiki/Plugin/calendar.pm          | 8 ++++++++
     debian/changelog                    | 4 ++++
     doc/ikiwiki-calendar.mdwn           | 8 +++++---
     doc/ikiwiki/directive/calendar.mdwn | 7 +++++--
     ikiwiki-calendar.in                 | 6 +++++-
     5 files changed, 27 insertions(+), 6 deletions(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
    index ff84bc440..0f0e9518a 100644
    --- a/IkiWiki/Plugin/calendar.pm
    +++ b/IkiWiki/Plugin/calendar.pm
    @@ -47,6 +47,14 @@ sub getsetup () {
     			safe => 1,
     			rebuild => 1,
     		},
    +		archive_pagespec => {
    +			type => "pagespec",
    +			example => "posts/* and !*/Discussion",
    +			description => "PageSpec of pages to include in the archives; used by ikiwiki-calendar command",
    +			link => 'ikiwiki/PageSpec',
    +			safe => 1,
    +			rebuild => 0,
    +		},
     }
     
     sub is_leap_year (@) {
    diff --git a/debian/changelog b/debian/changelog
    index 26b00a07c..7c607b2a5 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -27,6 +27,10 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low
         for master language.
       * po: Configuring the same language as master and slave confuses processing;
         so filter out such a misconfiguration.
    +  * calendar: Add archive_pagespec, which is used by ikiwiki-calendar to
    +    specify which pages to include on the calendar archive pages.
    +    (The pagespec can still also be specified on the ikiwiki-calendar command
    +    line.)
     
      -- Joey Hess   Sun, 04 Apr 2010 12:17:11 -0400
     
    diff --git a/doc/ikiwiki-calendar.mdwn b/doc/ikiwiki-calendar.mdwn
    index 982892fca..c1f4d7267 100644
    --- a/doc/ikiwiki-calendar.mdwn
    +++ b/doc/ikiwiki-calendar.mdwn
    @@ -16,9 +16,11 @@ You must specify the setup file for your wiki. The pages will
     be created inside its `srcdir`, beneath the `archivebase`
     directory used by the calendar plugin (default "archives").
     
    -You will probably want to specify a [[ikiwiki/PageSpec]]
    -to control which pages are included on the calendars. The
    -default is all pages. To limit it to only posts in a blog,
    +To control which pages are included on the calendars,
    +a [[ikiwiki/PageSpec]] can be specified. The default is
    +all pages, or the pages specified by the `comments_pagespec`
    +setting in the config file. A pagespec can also be specified
    +on the command line. To limit it to only posts in a blog,
     use something like "posts/* and !*/Discussion".
     
     It defaults to creating calendar pages for the current
    diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
    index b2ac75b11..8a08081ee 100644
    --- a/doc/ikiwiki/directive/calendar.mdwn
    +++ b/doc/ikiwiki/directive/calendar.mdwn
    @@ -40,9 +40,12 @@ An example crontab:
       "month" or "year". The default is a month view calendar.
     * `pages` - Specifies the [[ikiwiki/PageSpec]] of pages to link to from the
       month calendar. Defaults to "*".
    -* `archivebase` - Configures the base of the archives hierarchy. The
    -  default is "archives". Note that this default can also be overridden
    +* `archivebase` - Configures the base of the archives hierarchy. 
    +  The default is "archives". Note that this default can also be overridden
       for the whole wiki by setting `archivebase` in ikiwiki's setup file.
    +  Calendars link to pages under here, with names like "2010/04" and
    +  "2010". These pages can be automatically created using the
    +  [[ikiwiki-calendar]] tool. 
     * `year` - The year for which the calendar is requested. Defaults to the
       current year.
     * `month` - The numeric month for which the calendar is requested, in the
    diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
    index 9738ea5f7..6b6f693b3 100755
    --- a/ikiwiki-calendar.in
    +++ b/ikiwiki-calendar.in
    @@ -15,7 +15,7 @@ GetOptions(
     	"force" => \$force,
     ) || usage();
     my $setup=shift		|| usage();
    -my $pagespec=shift	|| "*";
    +my $pagespec=shift;
     my $startyear=shift	|| 1900+(localtime(time))[5];
     my $endyear=shift	|| $startyear;
     
    @@ -27,6 +27,10 @@ IkiWiki::checkconfig();
     my $archivebase = 'archives';
     $archivebase = $config{archivebase} if defined $config{archivebase};
     
    +if (! defined $pagespec) {
    +	$pagespec=$config{archive_pagespec} || "*";
    +}
    +
     sub writearchive ($$;$) {
     	my $template=template(shift);
     	my $year=shift;
    -- 
    cgit v1.2.3
    
    
    From fe733e2a424f50227e4a501c3efbf1ce43e07352 Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Thu, 15 Apr 2010 14:29:14 -0400
    Subject: enhance pagestats and rework example blog front page
    
    * pagestats: Class parameter can be used to override default class for
      custom styling.
    * pagestats: Use style=list to get a list of tags, scaled by use like
      in a tag cloud. This is useful to put in a sidebar.
    * Rework example blog front page.
    ---
     IkiWiki/Plugin/pagestats.pm          | 21 ++++++++++++++++++---
     debian/changelog                     |  5 +++++
     doc/examples/blog/archives.mdwn      |  7 +++++++
     doc/examples/blog/comments.mdwn      |  2 +-
     doc/examples/blog/index.mdwn         | 12 ++++++++----
     doc/ikiwiki/directive/pagestats.mdwn | 11 ++++++++++-
     6 files changed, 49 insertions(+), 9 deletions(-)
     create mode 100644 doc/examples/blog/archives.mdwn
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
    index 1c0b46830..48715bd3e 100644
    --- a/IkiWiki/Plugin/pagestats.pm
    +++ b/IkiWiki/Plugin/pagestats.pm
    @@ -75,7 +75,7 @@ sub preprocess (@) {
     	}
     
     	if ($style eq 'table') {
    -		return "
    \n". + return "
    \n". join("\n", map { " + + + + + EOF @@ -312,13 +312,14 @@ sub format_year (@) { add_depends($params{page}, "$archivebase/$nyear", deptype("presence")); # Start producing the year calendar + my $m=$params{months_per_row}-2; $calendar=< - + + + + + diff --git a/debian/changelog b/debian/changelog index e4056fdc6..737d73655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * sidebar: Add global_sidebars setting. * conditional: Fix bug that forced "all" mode off by default. * calendarmonth.tmpl: The month calendar is now put in a sidebar. + * calendar: Improved display of arrows. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/plugins/calendar.mdwn b/doc/plugins/calendar.mdwn index 49fd90627..76e718a3b 100644 --- a/doc/plugins/calendar.mdwn +++ b/doc/plugins/calendar.mdwn @@ -14,6 +14,7 @@ customization. * `month-calendar` - The month calendar as a whole. * `month-calendar-head` - The head of the month calendar (ie,"March"). +* `month-calendar-arrow` - Arrow pointing to previous/next month. * `month-calendar-day-head` - A column head in the month calendar (ie, a day-of-week abbreviation). * `month-calendar-day-noday`, `month-calendar-day-link`, @@ -27,6 +28,7 @@ customization. weekends. * `year-calendar` - The year calendar as a whole. * `year-calendar-head` - The head of the year calendar (ie, "2007"). +* `year-calendar-arrow` - Arrow pointing to previous/next year. * `year-calendar-subhead` - For example, "Months". * `year-calendar-month-link`, `year-calendar-month-nolink`, `year-calendar-month-future`, `year-calendar-this-month` - The month diff --git a/doc/style.css b/doc/style.css index 44e06ae4f..7ffcf9fe2 100644 --- a/doc/style.css +++ b/doc/style.css @@ -431,3 +431,11 @@ pre.hl { color:#000000; background-color:#ffffff; } /* For the calendar plugin. */ .month-calendar-day-this-day { background-color: #eee; } .year-calendar-this-month { background-color: #eee; } +.month-calendar-arrow A:link, +.year-calendar-arrow A:link, +.month-calendar-arrow A:visited, +.year-calendar-arrow A:visited { + text-decoration: none; + font-weight: normal; + font-size: 150%; +} -- cgit v1.2.3 From b14f84c4acccbc8450a9102b3b647013989b27bb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Apr 2010 17:02:29 -0400 Subject: --gettime revamp * Rename --getctime to --gettime. (The old name still works for backwards compatability.) * --gettime now also looks up last modification time. * Add rcs_getmtime to plugin API; currently only implemented for git. --- IkiWiki.pm | 8 +++++-- IkiWiki/Plugin/bzr.pm | 5 +++++ IkiWiki/Plugin/cvs.pm | 5 +++++ IkiWiki/Plugin/darcs.pm | 5 +++++ IkiWiki/Plugin/git.pm | 5 +++++ IkiWiki/Plugin/mercurial.pm | 5 +++++ IkiWiki/Plugin/monotone.pm | 5 +++++ IkiWiki/Plugin/norcs.pm | 7 +++++- IkiWiki/Plugin/svn.pm | 5 +++++ IkiWiki/Plugin/tla.pm | 5 +++++ IkiWiki/Render.pm | 18 +++++++++++++--- debian/changelog | 5 +++++ .../How_does_ikiwiki_remember_times__63__.mdwn | 25 ++++++---------------- ...old_repository_to_new_ikiwiki_system__63__.mdwn | 4 ---- doc/plugins/write.mdwn | 7 ++++++ doc/rcs.mdwn | 8 +++++-- doc/tips/Importing_posts_from_Wordpress.mdwn | 2 +- doc/tips/inside_dot_ikiwiki/discussion.mdwn | 7 +++--- doc/todo/auto_getctime_on_fresh_build.mdwn | 8 +++++-- doc/usage.mdwn | 10 ++++----- ikiwiki.in | 3 ++- mtime-to-git | 14 ------------ 22 files changed, 109 insertions(+), 57 deletions(-) delete mode 100755 mtime-to-git (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 1730e476a..7655dada5 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -440,10 +440,10 @@ sub getsetup () { safe => 0, rebuild => 0, }, - getctime => { + gettime => { type => "internal", default => 0, - description => "running in getctime mode", + description => "running in gettime mode", safe => 0, rebuild => 0, }, @@ -1790,6 +1790,10 @@ sub rcs_getctime ($) { $hooks{rcs}{rcs_getctime}{call}->(@_); } +sub rcs_getmtime ($) { + $hooks{rcs}{rcs_getmtime}{call}->(@_); +} + sub rcs_receive () { $hooks{rcs}{rcs_receive}{call}->(); } diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm index 0efc26b49..f79ca7c8f 100644 --- a/IkiWiki/Plugin/bzr.pm +++ b/IkiWiki/Plugin/bzr.pm @@ -20,6 +20,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -306,4 +307,8 @@ sub rcs_getctime ($) { return $ctime; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for bzr\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/cvs.pm b/IkiWiki/Plugin/cvs.pm index 26a3e9dd2..360d97249 100644 --- a/IkiWiki/Plugin/cvs.pm +++ b/IkiWiki/Plugin/cvs.pm @@ -49,6 +49,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub genwrapper () { @@ -485,4 +486,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for cvs\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/darcs.pm b/IkiWiki/Plugin/darcs.pm index bc8394b90..c1d6661d3 100644 --- a/IkiWiki/Plugin/darcs.pm +++ b/IkiWiki/Plugin/darcs.pm @@ -18,6 +18,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub silentsystem (@) { @@ -427,4 +428,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for darcs\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index b02f4a5ed..86d80186f 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -25,6 +25,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); hook(type => "rcs", id => "rcs_receive", call => \&rcs_receive); } @@ -634,6 +635,10 @@ sub rcs_getctime ($) { return $ctime; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for git\n"; # TODO +} + sub rcs_receive () { # The wiki may not be the only thing in the git repo. # Determine if it is in a subdirectory by examining the srcdir, diff --git a/IkiWiki/Plugin/mercurial.pm b/IkiWiki/Plugin/mercurial.pm index ea00a3364..34e009c7a 100644 --- a/IkiWiki/Plugin/mercurial.pm +++ b/IkiWiki/Plugin/mercurial.pm @@ -20,6 +20,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -254,4 +255,8 @@ sub rcs_getctime ($) { return $ctime; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for mercurial\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/monotone.pm b/IkiWiki/Plugin/monotone.pm index c33cf7e3a..67d4abbaa 100644 --- a/IkiWiki/Plugin/monotone.pm +++ b/IkiWiki/Plugin/monotone.pm @@ -23,6 +23,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -693,4 +694,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for monotone\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/norcs.pm b/IkiWiki/Plugin/norcs.pm index e6a05a3c5..053652a5f 100644 --- a/IkiWiki/Plugin/norcs.pm +++ b/IkiWiki/Plugin/norcs.pm @@ -18,6 +18,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub getsetup () { @@ -63,7 +64,11 @@ sub rcs_diff ($) { } sub rcs_getctime ($) { - error gettext("getctime not implemented"); + return 0; +} + +sub rcs_getmtime ($) { + return 0; } 1 diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index 7d27ec842..85c205f09 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -19,6 +19,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -379,4 +380,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for svn\n"; # TODO +} + 1 diff --git a/IkiWiki/Plugin/tla.pm b/IkiWiki/Plugin/tla.pm index 764da9b98..f5ad0cc96 100644 --- a/IkiWiki/Plugin/tla.pm +++ b/IkiWiki/Plugin/tla.pm @@ -18,6 +18,7 @@ sub import { hook(type => "rcs", id => "rcs_recentchanges", call => \&rcs_recentchanges); hook(type => "rcs", id => "rcs_diff", call => \&rcs_diff); hook(type => "rcs", id => "rcs_getctime", call => \&rcs_getctime); + hook(type => "rcs", id => "rcs_getmtime", call => \&rcs_getmtime); } sub checkconfig () { @@ -284,4 +285,8 @@ sub rcs_getctime ($) { return $date; } +sub rcs_getmtime ($) { + error "rcs_getmtime is not implemented for tla\n"; # TODO +} + 1 diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index e98888d76..e1cb68462 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -365,14 +365,26 @@ sub find_new_files ($) { } else { push @new, $file; - if ($config{getctime} && -e "$config{srcdir}/$file") { + if ($config{gettime} && -e "$config{srcdir}/$file") { eval { - my $time=rcs_getctime("$config{srcdir}/$file"); - $pagectime{$page}=$time; + my $ctime=rcs_getctime("$config{srcdir}/$file"); + if ($ctime > 0) { + $pagectime{$page}=$ctime; + } }; if ($@) { print STDERR $@; } + my $mtime; + eval { + my $mtime=rcs_getmtime("$config{srcdir}/$file"); + }; + if ($@) { + print STDERR $@; + } + elsif ($mtime > 0) { + utime($mtime, $mtime, "$config{srcdir}/$file"); + } } } $pagecase{lc $page}=$page; diff --git a/debian/changelog b/debian/changelog index 737d73655..615d5916f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,11 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * conditional: Fix bug that forced "all" mode off by default. * calendarmonth.tmpl: The month calendar is now put in a sidebar. * calendar: Improved display of arrows. + * Rename --getctime to --gettime. (The old name still works for + backwards compatability.) + * --gettime now also looks up last modification time. + * Add rcs_getmtime to plugin API; currently only implemented + for git. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn index 6ce576db1..6b7739fd0 100644 --- a/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn +++ b/doc/forum/How_does_ikiwiki_remember_times__63__.mdwn @@ -20,15 +20,17 @@ Do I have it right? > Some VCS, like git, set the file mtimes to the current time > when making a new checkout, so they will be lost if you do that. > The creation times can be retrived using the `--getctime` option. -> I suppose it might be nice if there were a `--getmtime` that pulled -> true modification times out of the VCS, but I haven't found it a big -> deal in practice for the last modification times to be updated to the -> current time when rebuilding a wiki like this. --[[Joey]] +> --[[Joey]] > > > Thanks for the clarification. I ran some tests of my own to make sure I understand it right, and I'm satisfied > > that the order of posts in my blog can be retrieved from the VCS using the `--getctime` option, at least if I > > choose to order my posts by creation time rather than modification time. But I now know that I can't rely on > > page modification times in ikiwiki as these can be lost permanently. +> +> > > Update: It's now renamed to `--gettime`, and pulls both the creation +> > > and modification times. Also, per [[todo/auto_getctime_on_fresh_build]], +> > > this is now done automatically the first time ikiwiki builds a +> > > srcdir. So, no need to worry about this any more! --[[Joey]] > > > > I would suggest that there should at least be a `--getmtime` option like you describe, and perhaps that > > `--getctime` and `--getmtime` be _on by default_. In my opinion the creation times and modification times of @@ -91,19 +93,6 @@ Do I have it right? > A quick workaround for me to get modification times right is the following > little zsh script, which unfortunately only works for git: - #!/usr/bin/env zsh - - set +x - - for FILE in **/*(.); do - TIMES="`git log --pretty=format:%ai $FILE`" - MTIME="`echo $TIMES | head -n1`" - - if [ ! -z $MTIME ]; then - echo touch -m -d "$MTIME" $FILE - touch -m -d "$MTIME" $FILE - fi - - done +>> Elided; no longer needed since --gettime does that, and much faster! --[[Joey]] > --[[David_Riebenbauer]] diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn index fe67e6aba..d7a33b526 100644 --- a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn +++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__.mdwn @@ -20,10 +20,6 @@ How do I set up an ikiwiki system using a pre-existing repository (instead of cr > recreate the ikiwiki srcdir > 3. `git clone` from the bare git repository a second time, > to create a checkout you can manually edit (optional) -> 4. run `ikiwiki --getctime --setup your.setup` -> The getctime will ensure page creation times are accurate -> by putting the info out of the git history, -> and only needs to be done once. > > If you preserved your repository, but not the setup file, > the easiest way to make one is probably to run diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 707622956..cf7044b2c 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1085,6 +1085,13 @@ it up in the history. It's ok if this is not implemented, and throws an error. +#### `rcs_getmtime($)` + +This is used to get the page modification time for a file from the RCS, by +looking it up in the history. + +It's ok if this is not implemented, and throws an error. + #### `rcs_receive()` This is called when ikiwiki is running as a pre-receive hook (or diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 4e7a8d2a6..b5bfc2414 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -14,8 +14,10 @@ use, some advanced or special features are not supported in all of them. Lack of support in [[ikiwiki-makerepo]] or auto.setup can make it harder to set up a wiki using that revision control system. The `rcs_commit_staged` hook is needed to use [[attachments|plugins/attachment]] or -[[plugins/comments]]. And so on. The table below summarises this for each -revision control system and links to more information about each. +[[plugins/comments]]. `rcs_getctime` may be implemented in a fast way +(ie, one log lookup for all files), or very slowly (one lookup per file). +And so on. The table below summarises this for each revision control +system and links to more information about each. [[!table data=""" feature |[[git]]|[[svn]]|[[bzr]] |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]] |[[cvs]] @@ -25,6 +27,8 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_rename` |yes |yes |yes |yes |no |yes |no |yes `rcs_remove` |yes |yes |yes |yes |no |yes |no |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes +`rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow +`rcs_getmtime` |fast |no |no |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes """]] diff --git a/doc/tips/Importing_posts_from_Wordpress.mdwn b/doc/tips/Importing_posts_from_Wordpress.mdwn index 59330caa4..8774c9723 100644 --- a/doc/tips/Importing_posts_from_Wordpress.mdwn +++ b/doc/tips/Importing_posts_from_Wordpress.mdwn @@ -1,6 +1,6 @@ Use case: You want to move away from Wordpress to Ikiwiki as your blogging/website platform, but you want to retain your old posts. -[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's --getctime to get the preserve creation times on checkout. +[This](http://git.chris-lamb.co.uk/?p=ikiwiki-wordpress-import.git) is a simple tool that generates [git-fast-import](http://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html)-compatible data from a WordPress export XML file. It retains creation time of each post, so you can use Ikiwiki's --gettime to get the preserve creation times on checkout. WordPress categories are mapped onto Ikiwiki tags. The ability to import comments is planned. diff --git a/doc/tips/inside_dot_ikiwiki/discussion.mdwn b/doc/tips/inside_dot_ikiwiki/discussion.mdwn index 34d5b9252..69df369ec 100644 --- a/doc/tips/inside_dot_ikiwiki/discussion.mdwn +++ b/doc/tips/inside_dot_ikiwiki/discussion.mdwn @@ -6,14 +6,15 @@ My database appears corrupted: No idea how this happened. I've blown it away and recreated it but, for future reference, is there any less violent way to recover from this situation? I miss having the correct created and last edited times. --[[sabr]] > update: fixed ctimes and mtimes using [these instructions](http://u32.net/Mediawiki_Conversion/Git_Import/#Correct%20Creation%20and%20Last%20Edited%20time) --[[sabr]] -> That's overly complex. Just run `ikiwiki -setup your.setup -getctime`. +> That's overly complex. Just run `ikiwiki -setup your.setup -gettime`. > BTW, I'd be interested in examining such a corrupt storable file to try > to see what happened to it. --[[Joey]] ->> --getctime appears to only set the last edited date. It's not supposed to set the creation date, is it? The only place that info is stored is in the git repo. +>> --gettime appears to only set the last edited date. It's not supposed to set the creation date, is it? The only place that info is stored is in the git repo. >>> Pulling the page creation date out of the git history is exactly what ->>> --getctime does. --[[Joey]] +>>> --gettime does. (It used to be called --getctime, and only do that; now +>>> it also pulls out the last modified date). --[[Joey]] >> Alas, I seem to have lost the bad index file to periodic /tmp wiping; I'll send it to you if it happens again. --[[sabr]] diff --git a/doc/todo/auto_getctime_on_fresh_build.mdwn b/doc/todo/auto_getctime_on_fresh_build.mdwn index ea95fb8c9..760c56fa1 100644 --- a/doc/todo/auto_getctime_on_fresh_build.mdwn +++ b/doc/todo/auto_getctime_on_fresh_build.mdwn @@ -1,9 +1,13 @@ [[!tag wishlist]] -It might be a good idea to enable --getctime when `.ikiwiki` does not +It might be a good idea to enable --gettime when `.ikiwiki` does not exist. This way a new checkout of a `srcdir` would automatically get -ctimes right. (Running --getctime whenever a rebuild is done would be too +ctimes right. (Running --gettime whenever a rebuild is done would be too slow.) --[[Joey]] Could this be too annoying in some cases, eg, checking out a large wiki that needs to get set up right away? --[[Joey]] + +> Not for git with the new, optimised --getctime. For other VCS.. well, +> pity they're not as fast as git ;), but it is a one-time expense... +> [[done]] --[[Joey]] diff --git a/doc/usage.mdwn b/doc/usage.mdwn index db1e36a10..553fef01e 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -320,13 +320,11 @@ also be configured using a setup file. intercepted. If you enable this option then you must run at least the CGI portion of ikiwiki over SSL. -* --getctime +* --gettime - Pull creation time for each new page out of the revision control - system. This rarely used option provides a way to get the real creation - times of items in weblogs, such as when building a wiki from a new - VCS checkout. It is unoptimised and quite slow. It is best used - with --rebuild, to force ikiwiki to get the ctime for all pages. + Extract creation and modification times for each new page from the + the revision control's log. This is done automatically when building a + wiki for the first time, so you normally do not need to use this option. * --set var=value diff --git a/ikiwiki.in b/ikiwiki.in index 38e4d3201..801ff9a0b 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -44,7 +44,8 @@ sub getconfig () { "wrappergroup=s" => \$config{wrappergroup}, "usedirs!" => \$config{usedirs}, "prefix-directives!" => \$config{prefix_directives}, - "getctime" => \$config{getctime}, + "getctime" => \$config{gettime}, + "gettime" => \$config{gettime}, "numbacklinks=i" => \$config{numbacklinks}, "rcs=s" => \$config{rcs}, "no-rcs" => sub { $config{rcs}="" }, diff --git a/mtime-to-git b/mtime-to-git deleted file mode 100755 index 9875af5d7..000000000 --- a/mtime-to-git +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Sets mtimes of all files in the tree their last change date -# based on git's log. Useful to avoid too new dates after a -# fresh checkout, which lead to ikiwiki unnecessarily rebuilding -# basewiki files on upgrade. -if [ -d .git ]; then - for file in $(git ls-files); do - date="$(git log -1 --date=rfc "$file" | grep ^Date: | sed -e 's/Date://')" - if [ -n "$date" ]; then - echo "$date $file" - touch -d"$date" $file - fi - done -fi -- cgit v1.2.3 From dee2940c0bc97080088c99f399cd0ff0df3bec23 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Apr 2010 18:29:45 -0400 Subject: automatically run --gettime, and optimise it for git * Automatically run --gettime the first time ikiwiki is run on a given srcdir. * Optimise --gettime for git, so it's appropriatly screamingly fast. (This could be done for other backends too.) * However, --gettime for git no longer follows renames. * Use above to fix up timestamps on docwiki, as well as ensure that timestamps on basewiki files shipped in the deb are sane. --- IkiWiki.pm | 2 +- IkiWiki/Plugin/git.pm | 48 ++++++++++++++++++++++++++++++++++++------------ IkiWiki/Render.pm | 11 +++++++++-- debian/changelog | 7 +++++++ debian/control | 2 +- doc/plugins/write.mdwn | 4 ++++ doc/usage.mdwn | 2 +- docwiki.setup | 17 ++++++++++++++++- ikiwiki.in | 2 +- 9 files changed, 76 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 7655dada5..b37b1f344 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -442,7 +442,6 @@ sub getsetup () { }, gettime => { type => "internal", - default => 0, description => "running in gettime mode", safe => 0, rebuild => 0, @@ -1512,6 +1511,7 @@ sub loadindex () { open ($in, "<", "$config{wikistatedir}/indexdb") || return; } else { + $config{gettime}=1; # first build return; } } diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 86d80186f..aa402c04f 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -616,27 +616,51 @@ sub rcs_diff ($) { } } -sub rcs_getctime ($) { +{ +my %time_cache; + +sub findtimes ($$) { my $file=shift; + my $id=shift; # 0 = mtime ; 1 = ctime + # Remove srcdir prefix $file =~ s/^\Q$config{srcdir}\E\/?//; - my @raw_lines = run_or_die('git', 'log', - '--follow', '--no-merges', - '--pretty=raw', '--raw', '--abbrev=40', '--always', '-c', - '-r', '--', $file); - my @ci; - while (my $parsed = parse_diff_tree("", \@raw_lines)) { - push @ci, $parsed; + if (! keys %time_cache) { + my $date; + foreach my $line (run_or_die('git', 'log', + '--pretty=format:%ct', + '--name-only', '--relative')) { + if (! defined $date && $line =~ /^(\d+)$/) { + $date=$line; + } + elsif (! length $line) { + $date=undef; + } + else { + if (! $time_cache{$line}) { + $time_cache{$line}[0]=$date; # mtime + } + $time_cache{$line}[1]=$date; # ctime + } + } } - my $ctime = $ci[$#ci]->{'author_epoch'}; - debug("ctime for '$file': ". localtime($ctime)); - return $ctime; + return exists $time_cache{$file} ? $time_cache{$file}[$id] : 0; +} + +} + +sub rcs_getctime ($) { + my $file=shift; + + return findtimes($file, 1); } sub rcs_getmtime ($) { - error "rcs_getmtime is not implemented for git\n"; # TODO + my $file=shift; + + return findtimes($file, 0); } sub rcs_receive () { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index e1cb68462..a6b0f0617 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -352,6 +352,8 @@ sub find_new_files ($) { my @new; my @internal_new; + my $times_noted; + foreach my $file (@$files) { my $page=pagename($file); if (exists $pagesources{$page} && $pagesources{$page} ne $file) { @@ -363,7 +365,12 @@ sub find_new_files ($) { if (isinternal($page)) { push @internal_new, $file; } - else { + elsif ($config{rcs}) { + if (! $times_noted) { + debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs})); + $times_noted=1; + } + push @new, $file; if ($config{gettime} && -e "$config{srcdir}/$file") { eval { @@ -377,7 +384,7 @@ sub find_new_files ($) { } my $mtime; eval { - my $mtime=rcs_getmtime("$config{srcdir}/$file"); + $mtime=rcs_getmtime("$config{srcdir}/$file"); }; if ($@) { print STDERR $@; diff --git a/debian/changelog b/debian/changelog index 615d5916f..60a67cbe3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,8 +47,15 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * Rename --getctime to --gettime. (The old name still works for backwards compatability.) * --gettime now also looks up last modification time. + * Automatically run --gettime the first time ikiwiki is run on + a given srcdir. * Add rcs_getmtime to plugin API; currently only implemented for git. + * Optimise --gettime for git, so it's appropriatly screamingly + fast. (This could be done for other backends too.) + * However, --gettime for git no longer follows renames. + * Use above to fix up timestamps on docwiki, as well as ensure that + timestamps on basewiki files shipped in the deb are sane. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/debian/control b/debian/control index 87f7d8209..ae06f32b0 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34), - libfile-chdir-perl + libfile-chdir-perl, Maintainer: Joey Hess Uploaders: Josh Triplett Standards-Version: 3.8.4 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index cf7044b2c..0bf6fcf48 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -1085,6 +1085,8 @@ it up in the history. It's ok if this is not implemented, and throws an error. +If the RCS cannot determine a ctime for the file, return 0. + #### `rcs_getmtime($)` This is used to get the page modification time for a file from the RCS, by @@ -1092,6 +1094,8 @@ looking it up in the history. It's ok if this is not implemented, and throws an error. +If the RCS cannot determine a mtime for the file, return 0. + #### `rcs_receive()` This is called when ikiwiki is running as a pre-receive hook (or diff --git a/doc/usage.mdwn b/doc/usage.mdwn index 553fef01e..2e12517ea 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -320,7 +320,7 @@ also be configured using a setup file. intercepted. If you enable this option then you must run at least the CGI portion of ikiwiki over SSL. -* --gettime +* --gettime, --no-gettime Extract creation and modification times for each new page from the the revision control's log. This is done automatically when building a diff --git a/docwiki.setup b/docwiki.setup index 8278b73ea..6bc200066 100644 --- a/docwiki.setup +++ b/docwiki.setup @@ -1,6 +1,18 @@ #!/usr/bin/perl # Configuration file for ikiwiki to build its documentation wiki. +# Use git during the build, if it's available and if we're building +# from a git checkout. This ensures ikiwiki gets the right mtimes and +# ctimes for files in the doc wiki. +our $rcs="norcs"; +BEGIN { + my $git=`which git 2>&1`; + chomp $git; + if (-x $git && -d ".git") { + $rcs="git"; + } +} + use IkiWiki::Setup::Standard { wikiname => "ikiwiki", srcdir => "doc", @@ -9,7 +21,7 @@ use IkiWiki::Setup::Standard { underlaydirbase => "underlays", underlaydir => "underlays/basewiki", discussion => 0, - exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/, + exclude => qr/\/discussion|bugs\/*|todo\/*|forum\/*/, # save space locale => '', verbose => 1, syslog => 0, @@ -17,4 +29,7 @@ use IkiWiki::Setup::Standard { usedirs => 0, prefix_directives => 1, add_plugins => [qw{goodstuff version haiku polygen fortune table}], + disable_plugins => [qw{recentchanges}], # not appropriate for doc dir + rcs => $rcs, + gitorigin_branch => '', # don't pull during build } diff --git a/ikiwiki.in b/ikiwiki.in index 801ff9a0b..acd37f802 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -45,7 +45,7 @@ sub getconfig () { "usedirs!" => \$config{usedirs}, "prefix-directives!" => \$config{prefix_directives}, "getctime" => \$config{gettime}, - "gettime" => \$config{gettime}, + "gettime!" => \$config{gettime}, "numbacklinks=i" => \$config{numbacklinks}, "rcs=s" => \$config{rcs}, "no-rcs" => sub { $config{rcs}="" }, -- cgit v1.2.3 From b13bb0c83c8f23bca97734882997fd3dc29f0553 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Apr 2010 18:43:51 -0400 Subject: implement rcs_getmtime for svn This is a slow implementation; it runs svn log once per file still, rather than running svn log once on the whole srcdir. I did it this way because in my experience, svn log, run on a directory, does not always list every change to files inside that directory. I don't know why, and I use svn as little as possible these days. --- IkiWiki/Plugin/svn.pm | 42 +++++++++++++++++++++++++++++++----------- debian/changelog | 2 +- doc/rcs.mdwn | 2 +- 3 files changed, 33 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index 85c205f09..6e1d4a40f 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -350,9 +350,18 @@ sub rcs_diff ($) { return `svnlook diff $config{svnrepo} -r$rev --no-diff-deleted`; } -sub rcs_getctime ($) { +{ + +my ($lastfile, $lastmtime, $lastctime); + +sub findtimes ($) { my $file=shift; + if ($lastfile eq $file) { + return $lastmtime, $lastctime; + } + $lastfile=$file; + my $svn_log_infoline=qr/^r\d+\s+\|\s+[^\s]+\s+\|\s+(\d+-\d+-\d+\s+\d+:\d+:\d+\s+[-+]?\d+).*/; my $child = open(SVNLOG, "-|"); @@ -360,28 +369,39 @@ sub rcs_getctime ($) { exec("svn", "log", $file) || error("svn log $file failed to run"); } - my $date; + my ($cdate, $mdate); while () { if (/$svn_log_infoline/) { - $date=$1; + $cdate=$1; + $mdate=$1 unless defined $mdate; } } - close SVNLOG || warn "svn log $file exited $?"; + close SVNLOG || error "svn log $file exited $?"; - if (! defined $date) { - warn "failed to parse svn log for $file\n"; - return 0; + if (! defined $cdate) { + error "failed to parse svn log for $file\n"; } eval q{use Date::Parse}; error($@) if $@; - $date=str2time($date); - debug("found ctime ".localtime($date)." for $file"); - return $date; + + $lastctime=str2time($cdate); + $lastmtime=str2time($mdate); + return $lastmtime, $lastctime; +} + +} + +sub rcs_getctime ($) { + my $file=shift; + + return (findtimes($file))[1]; } sub rcs_getmtime ($) { - error "rcs_getmtime is not implemented for svn\n"; # TODO + my $file=shift; + + return (findtimes($file))[0]; } 1 diff --git a/debian/changelog b/debian/changelog index 60a67cbe3..774aedc40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,7 +50,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * Automatically run --gettime the first time ikiwiki is run on a given srcdir. * Add rcs_getmtime to plugin API; currently only implemented - for git. + for git and svn. * Optimise --gettime for git, so it's appropriatly screamingly fast. (This could be done for other backends too.) * However, --gettime for git no longer follows renames. diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index b5bfc2414..450d16800 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -28,7 +28,7 @@ auto.setup |yes |yes |incomplete|yes |incomplete |yes `rcs_remove` |yes |yes |yes |yes |no |yes |no |yes `rcs_diff` |yes |yes |yes |yes |no |yes |yes |yes `rcs_getctime` |fast |slow |slow |slow |slow |slow |slow |slow -`rcs_getmtime` |fast |no |no |no |no |no |no |no +`rcs_getmtime` |fast |slow |no |no |no |no |no |no anonymous push |yes |no |no |no |no |no |no |no conflict handling |yes |yes |yes |buggy |yes |yes |yes |yes """]] -- cgit v1.2.3 From 64bc7d60a22ce33dca5434177cb0b410caca6102 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Apr 2010 18:46:28 -0400 Subject: update changelog --- debian/changelog | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 774aedc40..d65ffffd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,12 +48,14 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low backwards compatability.) * --gettime now also looks up last modification time. * Automatically run --gettime the first time ikiwiki is run on - a given srcdir. + a given srcdir. (Use --no-gettime to disable.) * Add rcs_getmtime to plugin API; currently only implemented for git and svn. * Optimise --gettime for git, so it's appropriatly screamingly - fast. (This could be done for other backends too.) - * However, --gettime for git no longer follows renames. + fast. (This could be done for most other backends too.) + * However, --gettime for git no longer follows renames. That would + be slow, and where a renamed wiki page is the same page is really + an iffy thing. * Use above to fix up timestamps on docwiki, as well as ensure that timestamps on basewiki files shipped in the deb are sane. -- cgit v1.2.3 From c769a33392c4dedbabfb1fa1fda5c8bb30b84c78 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Apr 2010 12:20:50 -0400 Subject: autoindex: Switch to using %wikistate instead of abusing $pagestate{index}. --- IkiWiki/Plugin/autoindex.pm | 20 ++++++++++++++------ debian/changelog | 2 ++ ...uto-create_tag_pages_according_to_a_template.mdwn | 3 +++ 3 files changed, 19 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm index 555856b11..c71d73349 100644 --- a/IkiWiki/Plugin/autoindex.pm +++ b/IkiWiki/Plugin/autoindex.pm @@ -61,8 +61,16 @@ sub refresh () { } my %deleted; - if (ref $pagestate{index}{autoindex}{deleted}) { - %deleted=%{$pagestate{index}{autoindex}{deleted}}; + if (ref $wikistate{autoindex}{deleted}) { + %deleted=%{$wikistate{autoindex}{deleted}}; + } + elsif (ref $pagestate{index}{autoindex}{deleted}) { + # compatability code + %deleted=%{$pagestate{index}{autoindex}{deleted}}; + delete $pagestate{index}{autoindex}; + } + + if (keys %deleted) { foreach my $dir (keys %deleted) { # remove deleted page state if the deleted page is re-added, # or if all its subpages are deleted @@ -71,7 +79,7 @@ sub refresh () { delete $deleted{$dir}; } } - $pagestate{index}{autoindex}{deleted}=\%deleted; + $wikistate{autoindex}{deleted}=\%deleted; } my @needed; @@ -82,10 +90,10 @@ sub refresh () { # This page must have just been deleted, so # don't re-add it. And remember it was # deleted. - if (! ref $pagestate{index}{autoindex}{deleted}) { - $pagestate{index}{autoindex}{deleted}={}; + if (! ref $wikistate{autoindex}{deleted}) { + $wikistate{autoindex}{deleted}={}; } - ${$pagestate{index}{autoindex}{deleted}}{$dir}=1; + ${$wikistate{autoindex}{deleted}}{$dir}=1; } else { push @needed, $dir; diff --git a/debian/changelog b/debian/changelog index d65ffffd7..4721c5309 100644 --- a/debian/changelog +++ b/debian/changelog @@ -58,6 +58,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low an iffy thing. * Use above to fix up timestamps on docwiki, as well as ensure that timestamps on basewiki files shipped in the deb are sane. + * autoindex: Switch to using %wikistate instead of abusing + $pagestate{index}. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn index 8fc97578c..49da3c80c 100644 --- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn +++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn @@ -239,6 +239,9 @@ wrong direction. >>>>>> Aha! Having looked at [[plugins/write]] again, it turns out that what this >>>>>> feature should really use is `%wikistate`, I think? :-) --[[smcv]] +>>>>>>> Ah, indeed, that came after I wrote autoindex. I've fixed autoindex to +>>>>>>> use it. --[[Joey]] + >>>>> Ok, now I know what you mean. --[[David_Riebenbauer]] >>> * `autoindex` forgets that a page was deleted when that page is -- cgit v1.2.3 From 7834989d863bb695c8fca90c89c53b7fc10600cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Apr 2010 12:24:58 -0400 Subject: typo --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4721c5309..01d650290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,7 +54,7 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * Optimise --gettime for git, so it's appropriatly screamingly fast. (This could be done for most other backends too.) * However, --gettime for git no longer follows renames. That would - be slow, and where a renamed wiki page is the same page is really + be slow, and whether a renamed wiki page is the same page is really an iffy thing. * Use above to fix up timestamps on docwiki, as well as ensure that timestamps on basewiki files shipped in the deb are sane. -- cgit v1.2.3 From 2f9504a10d87f6950325dcea2d8a1f5a5d3eefe4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 17 Apr 2010 13:55:32 -0400 Subject: bzr: changelog and refactor --- IkiWiki/Plugin/bzr.pm | 20 ++++++++------------ debian/changelog | 2 ++ 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/bzr.pm b/IkiWiki/Plugin/bzr.pm index 3712302ce..e7c1b8d8e 100644 --- a/IkiWiki/Plugin/bzr.pm +++ b/IkiWiki/Plugin/bzr.pm @@ -286,8 +286,10 @@ sub rcs_diff ($) { } } -sub extract_timestamp ($) { - my ($out) = @_; +sub extract_timestamp (@) { + # XXX filename passes through the shell here, should try to avoid + # that just in case + open (my $out, "@_ |"); my @log = bzr_log($out); if (length @log < 1) { @@ -297,28 +299,22 @@ sub extract_timestamp ($) { eval q{use Date::Parse}; error($@) if $@; - my $ctime = str2time($log[0]->{"timestamp"}); - return $ctime; + my $time = str2time($log[0]->{"timestamp"}); + return $time; } sub rcs_getctime ($) { my ($file) = @_; - # XXX filename passes through the shell here, should try to avoid - # that just in case my @cmdline = ("bzr", "log", "--forward", "--limit", '1', "$config{srcdir}/$file"); - open (my $out, "@cmdline |"); - return extract_timestamp($out); + return extract_timestamp(@cmdline); } sub rcs_getmtime ($) { my ($file) = @_; - # XXX filename passes through the shell here, should try to avoid - # that just in case my @cmdline = ("bzr", "log", "--limit", '1', "$config{srcdir}/$file"); - open (my $out, "@cmdline |"); - return extract_timestamp($out); + return extract_timestamp(@cmdline); } 1 diff --git a/debian/changelog b/debian/changelog index 01d650290..b7ec99463 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low timestamps on basewiki files shipped in the deb are sane. * autoindex: Switch to using %wikistate instead of abusing $pagestate{index}. + * bzr: Support rcs_getmtime, and fix rcs_getctime implementation + (Jelmer Vernooij) -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 -- cgit v1.2.3 From c4afb13fa588643476535612e2279eae79534dcc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Apr 2010 15:19:47 -0400 Subject: spelling --- debian/changelog | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b7ec99463..6b91fd3e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,13 +45,13 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low * calendarmonth.tmpl: The month calendar is now put in a sidebar. * calendar: Improved display of arrows. * Rename --getctime to --gettime. (The old name still works for - backwards compatability.) + backwards compatibility.) * --gettime now also looks up last modification time. * Automatically run --gettime the first time ikiwiki is run on a given srcdir. (Use --no-gettime to disable.) * Add rcs_getmtime to plugin API; currently only implemented for git and svn. - * Optimise --gettime for git, so it's appropriatly screamingly + * Optimise --gettime for git, so it's appropriately screamingly fast. (This could be done for most other backends too.) * However, --gettime for git no longer follows renames. That would be slow, and whether a renamed wiki page is the same page is really @@ -1146,7 +1146,7 @@ ikiwiki (2.55) unstable; urgency=low * attachment: Do not escape _ when determining attachment filenames. * Rebuild pages that change their type. (Gabriel McManus) * monotone: Add support for rename, delete, and also diff. (William Uther) - * toggle: Fix incompatability between javascript and webkit. + * toggle: Fix incompatibility between javascript and webkit. * bzr: Add support for rename and delete. (Jelmer Vernooij) * attachment: Use relative paths when inserting links. * toggle: Fix for when html got tidied. Closes: #492529 (Enrico Zini) @@ -2133,7 +2133,7 @@ ikiwiki (2.6) unstable; urgency=low - relax asumption about the possible submit values (use "Save Page" explicitly); - de-hardcode the submit buttons from the editpage template - (This was needed for compatability with a bug in CGI::FormBuilder + (This was needed for compatibility with a bug in CGI::FormBuilder 3.0401, but ikiwiki already needs a newer version.) * Pass buttons to all other formbuilder_setup hooks too. * Add color parameter to postsparkline. Closes: #438900 @@ -2182,7 +2182,7 @@ ikiwiki (2.4) unstable; urgency=low * Make the toc plugin use html-compatible anchors. This is necessary since most web sites serve ikiwiki xhtml files as text/html and mozilla browsers - get confused. So it's best for ikiwiki to follow the compatability + get confused. So it's best for ikiwiki to follow the compatibility recommendations in appendix C of the XHTML spec. Closes: #432045 * Support building on systems that lack asprintf. * mercurial getctime is currently broken, apparently by some change in @@ -2680,7 +2680,7 @@ ikiwiki (1.41) unstable; urgency=low * Gettext 1.04 or up is needed for the OO interface that ikiwiki needs, if an older version is installed, just don't gettext strings, instead of crashing. - * Added smileys for Moin Moin compatability. + * Added smileys for Moin Moin compatibility. * Fix handling of discussion links on discussion pages when l10n is used. * Make gitorigin_branch and gitmaster_branch configurable via the setup file. Closes: #408599 @@ -2988,7 +2988,7 @@ ikiwiki (1.29) unstable; urgency=low * Note that plugins that accessed this variable will need to be updated! The plugin interface has been increased to version 1.01 for this change. As few plugins use %renderedfiles I haven't done anything else to ensure - compatability of old plugins. + compatibility of old plugins. * Add will_render function to the plugin interface, used to register that a page renders a destination file, and do some security checks. Previously but no longer rendered files will be cleaned up. @@ -3326,7 +3326,7 @@ ikiwiki (1.13) unstable; urgency=low treating the GlobList as a very limited microlanguage that is transformed to perl code that does the matching. * The old GlobList format is deprecated, and I encourage users to switch to - using the new PageSpec format. Compatability with the old format will be + using the new PageSpec format. Compatibility with the old format will be removed at some point, possibly by 2.0. * Wiki rebuild needed on upgrade to this version due to PageSpec change. * Add support for creation_month and creation_year to PageSpec. @@ -3385,7 +3385,7 @@ ikiwiki (1.11) unstable; urgency=low This will be the page that a source page will be part of, which is different than the source page for inlined pages. * Audited all plugins to endure they pass (page, destpage) to htmllink - appropriatly. This means inlining of various plugins will not work + appropriately. This means inlining of various plugins will not work properly, with correct links generated. -- Joey Hess Thu, 27 Jul 2006 20:51:23 -0400 -- cgit v1.2.3 From 204c0a63f3fd7673dac83da6aa5f9c9e3cc9a6c5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Apr 2010 15:22:05 -0400 Subject: document tag_autocreate --- debian/changelog | 2 ++ doc/plugins/tag.mdwn | 3 +++ doc/roadmap.mdwn | 1 + 3 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b7ec99463..d66b5e4d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low [ Joey Hess ] + * tag: Automatic creation of tag pages can now be enabled using + the tag_autocreate setting. (David Riebenbauer) * bzr: Fix bzr log parsing to work with bzr 2.0. (liw) * comments: Fix missing entity encoding in title. * txt: Add a special case for robots.txt. diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn index 8ff70a069..bdf39d7e8 100644 --- a/doc/plugins/tag.mdwn +++ b/doc/plugins/tag.mdwn @@ -8,6 +8,9 @@ These directives allow tagging pages. It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to match pages that are tagged with a specific tag. +If the `tag_autocreate` setting is enabled, tag pages will automatically be +created as needed. + [[!if test="enabled(tag)" then=""" This wiki has the tag plugin enabled, so you'll see a note below that this page is tagged with the "tags" tag. diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index 0c7bf2fa8..8e2a01827 100644 --- a/doc/roadmap.mdwn +++ b/doc/roadmap.mdwn @@ -78,6 +78,7 @@ Probably incomplete list: * Make pagespecs match relative by default? (see [[discussion]]) * Flip wikilinks? (see [[todo/link_plugin_perhaps_too_general?]]) * YADA format setup files per default? +* Enable `tag_autocreate` by default. In general, we try to use [[ikiwiki-transition]] or forced rebuilds on upgrade to deal with changes that break compatability. Some things that -- cgit v1.2.3 From 0bc76be8a7201de4bfaa74b7aacc0b280c097699 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Apr 2010 20:32:19 -0400 Subject: reword news --- debian/NEWS | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 25ebed0b4..9fd882ad2 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,19 +1,26 @@ ikiwiki (3.20100406) unstable; urgency=low - - The title_natural sort method (as used by the inline directive, etc) - have been moved to the new sortnaturally plugin, which is not enabled - by default since it requires the Sort::Naturally perl module. + + This version of ikiwiki has a lot of changes that you need to know about. + + The --getctime switch is renamed to --gettimes, and it also gets the + file modification time. And it's a lot faster (when using git). But + the really important change is, you don't have to remember to use this + switch. Now ikiwiki will do it when it needs to. Starting from this version, the `tagged()` pagespec only matches tags, not regular wikilinks. If your wiki accidentially relied on the old, buggy behavior, you might need to change pagespecs to use `link()`. + The title_natural sort method (as used by the inline directive, etc) + have been moved to the new sortnaturally plugin, which is not enabled + by default since it requires the Sort::Naturally perl module. + Due to the above and other changes, 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. - -- Simon McVittie Tue, 06 Apr 2010 20:53:07 +0100 + -- Joey Hess Wed, 21 Apr 2010 20:31:29 -0400 ikiwiki (3.20091017) unstable; urgency=low -- cgit v1.2.3 From d048e9c64aca24b8e064aaf1608862b50c427de2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 21 Apr 2010 20:39:20 -0400 Subject: turn on tag_autocreate by default if tagbase is set --- IkiWiki/Plugin/tag.pm | 5 +++-- debian/NEWS | 4 ++++ doc/ikiwiki/directive/tag.mdwn | 3 ++- doc/plugins/tag.mdwn | 8 ++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index cd7ecc212..62f030f4e 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -36,7 +36,7 @@ sub getsetup () { }, tag_autocreate => { type => "boolean", - example => 0, + example => 1, description => "autocreate new tag pages?", safe => 1, rebuild => undef, @@ -67,7 +67,8 @@ sub htmllink_tag ($$$;@) { sub gentag ($) { my $tag=shift; - if ($config{tag_autocreate}) { + if ($config{tag_autocreate} || + ($config{tagbase} && ! defined $config{tag_autocreate})) { my $tagpage=taglink($tag); if ($tagpage=~/^\.\/(.*)/) { $tagpage=$1; diff --git a/debian/NEWS b/debian/NEWS index 9fd882ad2..8b87bc601 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -11,6 +11,10 @@ ikiwiki (3.20100406) unstable; urgency=low not regular wikilinks. If your wiki accidentially relied on the old, buggy behavior, you might need to change pagespecs to use `link()`. + Tag pages can automatically be created as new tags are used. This + feature is enabled by default if you have configured a tagbase. It + can be turned on or off using the `tag_autocreate` setting. + The title_natural sort method (as used by the inline directive, etc) have been moved to the new sortnaturally plugin, which is not enabled by default since it requires the Sort::Naturally perl module. diff --git a/doc/ikiwiki/directive/tag.mdwn b/doc/ikiwiki/directive/tag.mdwn index 807a96f25..c8d9b9816 100644 --- a/doc/ikiwiki/directive/tag.mdwn +++ b/doc/ikiwiki/directive/tag.mdwn @@ -19,7 +19,8 @@ instead: Note that if the wiki is configured to use a tagbase, then the tags will be located under a base directory, such as "tags/". This is a useful way to avoid having to write the full path to tags, if you want to keep them -grouped together out of the way. +grouped together out of the way. Also, since ikiwiki then knows where to put +tags, it will automatically create tag pages when new tags are used. Bear in mind that specifying a tagbase means you will need to incorporate it into the `link()` [[ikiwiki/PageSpec]] you use: e.g., if your tagbase is diff --git a/doc/plugins/tag.mdwn b/doc/plugins/tag.mdwn index bdf39d7e8..8e1286e62 100644 --- a/doc/plugins/tag.mdwn +++ b/doc/plugins/tag.mdwn @@ -8,8 +8,12 @@ These directives allow tagging pages. It also provides the `tagged()` [[ikiwiki/PageSpec]], which can be used to match pages that are tagged with a specific tag. -If the `tag_autocreate` setting is enabled, tag pages will automatically be -created as needed. +The `tagbase` setting can be used to make tags default to being put in a +particular subdirectory. + +The `tag_autocreate` setting can be used to control whether new tag pages +are created as needed. It defaults to being done only if a `tagbase` is +set. [[!if test="enabled(tag)" then=""" This wiki has the tag plugin enabled, so you'll see a note below that this -- cgit v1.2.3 From 738bd2fa1fef83f5624b06c00577ffe4c5a3245d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Apr 2010 00:28:21 -0400 Subject: note that the new version will have some optimisation fixes --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6b91fd3e6..76405e7da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -62,6 +62,8 @@ ikiwiki (3.20100415) UNRELEASED; urgency=low $pagestate{index}. * bzr: Support rcs_getmtime, and fix rcs_getctime implementation (Jelmer Vernooij) + * Quite a lot of new optimisations, and one major fix to a recent + performance regression. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 -- cgit v1.2.3 From 0db4d920aafa0c7a6b53c59e2605230134ed45eb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Apr 2010 00:28:58 -0400 Subject: force rebuild from pre 20100422 to ensure those wrong massive depends_simple don't linger on systems that rebuilt for the other reasons already --- debian/NEWS | 2 +- debian/changelog | 2 +- debian/postinst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 9fd882ad2..2fbe0ea7b 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.20100406) unstable; urgency=low +ikiwiki (3.20100422) unstable; urgency=low This version of ikiwiki has a lot of changes that you need to know about. diff --git a/debian/changelog b/debian/changelog index 76405e7da..647124b8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100415) UNRELEASED; urgency=low +ikiwiki (3.20100422) UNRELEASED; urgency=low [ Joey Hess ] * bzr: Fix bzr log parsing to work with bzr 2.0. (liw) diff --git a/debian/postinst b/debian/postinst index fa0591153..810b7cfe0 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=3.20100410 +firstcompat=3.20100422 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then -- cgit v1.2.3 From 56bb1b48e4b788ecc36d3b7e2583e29af3dd1617 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Apr 2010 00:36:13 -0400 Subject: format --- debian/NEWS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 433fc845c..3a8705680 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -7,13 +7,13 @@ ikiwiki (3.20100422) unstable; urgency=low the really important change is, you don't have to remember to use this switch. Now ikiwiki will do it when it needs to. - Starting from this version, the `tagged()` pagespec only matches tags, + Starting from this version, the "tagged()" pagespec only matches tags, not regular wikilinks. If your wiki accidentially relied on the old, - buggy behavior, you might need to change pagespecs to use `link()`. + buggy behavior, you might need to change its pagespecs to use "link()". - Tag pages can automatically be created as new tags are used. This + Now tag pages can automatically be created as new tags are used. This feature is enabled by default if you have configured a tagbase. It - can be turned on or off using the `tag_autocreate` setting. + can be turned on or off using the tag_autocreate setting. The title_natural sort method (as used by the inline directive, etc) have been moved to the new sortnaturally plugin, which is not enabled -- cgit v1.2.3 From e779098796e18c11c43e9e38339577376ded8e2b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Apr 2010 12:35:23 -0400 Subject: update copyright years --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/copyright b/debian/copyright index ad72a0459..d4bb1009f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,11 @@ Files: * -Copyright: © 2006-2008 Joey Hess +Copyright: © 2006-2010 Joey Hess License: GPL-2+ The full text of the GPL is distributed as doc/GPL in ikiwiki's source, and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems. Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/* -Copyright: © 2006-2008 Joey Hess +Copyright: © 2006-2010 Joey Hess License: other Redistribution and use in source and compiled forms, with or without modification, are permitted under any circumstances. No warranty. -- cgit v1.2.3 From 6c64ce0336240be16eeae81313e53c630cb196bc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Apr 2010 17:01:22 -0400 Subject: update news for template change --- debian/NEWS | 32 +++++++++++++++++++-------- doc/todo/auto_rebuild_on_template_change.mdwn | 2 ++ template-transition-notes | 4 ---- 3 files changed, 25 insertions(+), 13 deletions(-) delete mode 100644 template-transition-notes (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 3a8705680..69967c84c 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -2,22 +2,36 @@ ikiwiki (3.20100422) unstable; urgency=low This version of ikiwiki has a lot of changes that you need to know about. + Now you can include customised versions of templates in the source + of your wiki. (For example, templates/page.tmpl.) When these templates + are changed, ikiwiki will automatically rebuild pages that use them. + The --getctime switch is renamed to --gettimes, and it also gets the file modification time. And it's a lot faster (when using git). But the really important change is, you don't have to remember to use this switch. Now ikiwiki will do it when it needs to. - Starting from this version, the "tagged()" pagespec only matches tags, - not regular wikilinks. If your wiki accidentially relied on the old, - buggy behavior, you might need to change its pagespecs to use "link()". + At last, the "tagged()" pagespec only matches tags, not regular wikilinks. + If your wiki accidentially relied on the old, buggy behavior, you might + need to change its pagespecs to use "link()". + + Many of your wishes have been answered: Now tag pages can automatically be + created when new tags are used. This feature is enabled by default if you + have configured a tagbase. It can be turned on or off using the + tag_autocreate setting. + + These changes may also affect some users: + + * The title_natural sort method (as used by the inline directive, etc) + have been moved to the new sortnaturally plugin, which is not enabled + by default since it requires the Sort::Naturally perl module. - Now tag pages can automatically be created as new tags are used. This - feature is enabled by default if you have configured a tagbase. It - can be turned on or off using the tag_autocreate setting. + * TMPL_INCLUDE is no longer supported in any template used by ikiwiki. + It used to be allowed in certian templates, but not in others. - The title_natural sort method (as used by the inline directive, etc) - have been moved to the new sortnaturally plugin, which is not enabled - by default since it requires the Sort::Naturally perl module. + * The add_templates option has been removed from the underlay plugin. + If you used this option, you can instead use templates/ subdirectories + inside underlay directories added by the add_underlays option. Due to the above and other changes, all wikis need to be rebuilt on upgrade to this version. If you listed your wiki in /etc/ikiwiki/wikilist diff --git a/doc/todo/auto_rebuild_on_template_change.mdwn b/doc/todo/auto_rebuild_on_template_change.mdwn index 192b22f70..ea990b877 100644 --- a/doc/todo/auto_rebuild_on_template_change.mdwn +++ b/doc/todo/auto_rebuild_on_template_change.mdwn @@ -74,3 +74,5 @@ Have started working on this. >>>>>>> many templates, so the clutter is small. (Especially when >>>>>>> compared to the other clutter the basewiki always puts in destdir.) >>>>>>> This could be revisted later. --[[Joey]] + +[[done]] diff --git a/template-transition-notes b/template-transition-notes deleted file mode 100644 index a319616f4..000000000 --- a/template-transition-notes +++ /dev/null @@ -1,4 +0,0 @@ -* add_templates option removed from underlay plugin - (can use add_underlays instead) -* includes no longer allowed in templates -* template_params removed (not exported API) -- cgit v1.2.3 From 5fc6e56eb86a502f01bd6b79098be5f7e8bac446 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Apr 2010 17:41:24 -0400 Subject: changelog/NEWS update for template changes --- debian/NEWS | 4 ++++ debian/changelog | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 69967c84c..664f55b6e 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -6,6 +6,10 @@ ikiwiki (3.20100422) unstable; urgency=low of your wiki. (For example, templates/page.tmpl.) When these templates are changed, ikiwiki will automatically rebuild pages that use them. + Allowing untrusted users to upload attachments with the ".tmpl" + extension is not recommended, as that allows anyone to change + a wiki's templates. + The --getctime switch is renamed to --gettimes, and it also gets the file modification time. And it's a lot faster (when using git). But the really important change is, you don't have to remember to use this diff --git a/debian/changelog b/debian/changelog index 0ab04f522..425e28fa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low [ Joey Hess ] * tag: Automatic creation of tag pages can now be enabled using the tag_autocreate setting. (David Riebenbauer) + * Customised templates can now be included in the source of wikis + (and also in underlays), and dependencies on them are tracked. + * TMPL_INCLUDE is no longer supported in any template. + * underlay: Removed the add_templates option. + * Add template_depends function to plugin API. * bzr: Fix bzr log parsing to work with bzr 2.0. (liw) * comments: Fix missing entity encoding in title. * txt: Add a special case for robots.txt. -- cgit v1.2.3 From 9976abe63ca7359255cdce890e6013e9a2105a13 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Apr 2010 17:43:29 -0400 Subject: typo --- debian/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 664f55b6e..f976bdc01 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -27,7 +27,7 @@ ikiwiki (3.20100422) unstable; urgency=low These changes may also affect some users: * The title_natural sort method (as used by the inline directive, etc) - have been moved to the new sortnaturally plugin, which is not enabled + has been moved to the new sortnaturally plugin, which is not enabled by default since it requires the Sort::Naturally perl module. * TMPL_INCLUDE is no longer supported in any template used by ikiwiki. -- cgit v1.2.3 From e90d67d3c9a93862657563e17e24054087f205d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Apr 2010 00:54:59 -0400 Subject: Moved javascript files under the ikiwiki/ directory, to avoid cluttering the top of the web root. This is another things that requires a wiki rebuild on upgrade to this version. --- IkiWiki/Plugin/relativedate.pm | 4 +- IkiWiki/Plugin/toggle.pm | 4 +- debian/changelog | 5 +- debian/postinst | 2 +- underlays/javascript/ikiwiki.js | 54 -------------------- underlays/javascript/ikiwiki/ikiwiki.js | 54 ++++++++++++++++++++ underlays/javascript/ikiwiki/relativedate.js | 76 ++++++++++++++++++++++++++++ underlays/javascript/ikiwiki/toggle.js | 29 +++++++++++ underlays/javascript/relativedate.js | 76 ---------------------------- underlays/javascript/toggle.js | 29 ----------- 10 files changed, 168 insertions(+), 165 deletions(-) delete mode 100644 underlays/javascript/ikiwiki.js create mode 100644 underlays/javascript/ikiwiki/ikiwiki.js create mode 100644 underlays/javascript/ikiwiki/relativedate.js create mode 100644 underlays/javascript/ikiwiki/toggle.js delete mode 100644 underlays/javascript/relativedate.js delete mode 100644 underlays/javascript/toggle.js (limited to 'debian') diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index 7f006af83..7e615f7f1 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -37,9 +37,9 @@ sub include_javascript ($;$) { my $page=shift; my $absolute=shift; - return ''."\n". - ''; } diff --git a/IkiWiki/Plugin/toggle.pm b/IkiWiki/Plugin/toggle.pm index f9c899540..3319421d9 100644 --- a/IkiWiki/Plugin/toggle.pm +++ b/IkiWiki/Plugin/toggle.pm @@ -81,9 +81,9 @@ sub include_javascript ($;$) { my $page=shift; my $absolute=shift; - return ''."\n". - ''; } diff --git a/debian/changelog b/debian/changelog index 0ab04f522..f9d012e42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100422) UNRELEASED; urgency=low +ikiwiki (3.20100424) UNRELEASED; urgency=low [ Joey Hess ] * tag: Automatic creation of tag pages can now be enabled using @@ -66,6 +66,9 @@ ikiwiki (3.20100422) UNRELEASED; urgency=low (Jelmer Vernooij) * Quite a lot of new optimisations, and one major fix to a recent performance regression. + * Moved javascript files under the ikiwiki/ directory, to avoid cluttering + the top of the web root. This is another things that requires a wiki + rebuild on upgrade to this version. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/debian/postinst b/debian/postinst index 810b7cfe0..76ad115ac 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=3.20100422 +firstcompat=3.20100424 if [ "$1" = configure ] && \ dpkg --compare-versions "$2" lt "$firstcompat"; then diff --git a/underlays/javascript/ikiwiki.js b/underlays/javascript/ikiwiki.js deleted file mode 100644 index aebc5cf7e..000000000 --- a/underlays/javascript/ikiwiki.js +++ /dev/null @@ -1,54 +0,0 @@ -// ikiwiki's javascript utility function library - -var hooks; - -// Run onload as soon as the DOM is ready, if possible. -// gecko, opera 9 -if (document.addEventListener) { - document.addEventListener("DOMContentLoaded", run_hooks_onload, false); -} -// other browsers -window.onload = run_hooks_onload; - -var onload_done = 0; - -function run_hooks_onload() { - // avoid firing twice - if (onload_done) - return; - onload_done = true; - - run_hooks("onload"); -} - -function run_hooks(name) { - if (typeof(hooks) != "undefined") { - for (var i = 0; i < hooks.length; i++) { - if (hooks[i].name == name) { - hooks[i].call(); - } - } - } -} - -function hook(name, call) { - if (typeof(hooks) == "undefined") - hooks = new Array; - hooks.push({name: name, call: call}); -} - -function getElementsByClass(cls, node, tag) { - if (document.getElementsByClass) - return document.getElementsByClass(cls, node, tag); - if (! node) node = document; - if (! tag) tag = '*'; - var ret = new Array(); - var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)"); - var els = node.getElementsByTagName(tag); - for (i = 0; i < els.length; i++) { - if ( pattern.test(els[i].className) ) { - ret.push(els[i]); - } - } - return ret; -} diff --git a/underlays/javascript/ikiwiki/ikiwiki.js b/underlays/javascript/ikiwiki/ikiwiki.js new file mode 100644 index 000000000..aebc5cf7e --- /dev/null +++ b/underlays/javascript/ikiwiki/ikiwiki.js @@ -0,0 +1,54 @@ +// ikiwiki's javascript utility function library + +var hooks; + +// Run onload as soon as the DOM is ready, if possible. +// gecko, opera 9 +if (document.addEventListener) { + document.addEventListener("DOMContentLoaded", run_hooks_onload, false); +} +// other browsers +window.onload = run_hooks_onload; + +var onload_done = 0; + +function run_hooks_onload() { + // avoid firing twice + if (onload_done) + return; + onload_done = true; + + run_hooks("onload"); +} + +function run_hooks(name) { + if (typeof(hooks) != "undefined") { + for (var i = 0; i < hooks.length; i++) { + if (hooks[i].name == name) { + hooks[i].call(); + } + } + } +} + +function hook(name, call) { + if (typeof(hooks) == "undefined") + hooks = new Array; + hooks.push({name: name, call: call}); +} + +function getElementsByClass(cls, node, tag) { + if (document.getElementsByClass) + return document.getElementsByClass(cls, node, tag); + if (! node) node = document; + if (! tag) tag = '*'; + var ret = new Array(); + var pattern = new RegExp("(^|\\s)"+cls+"(\\s|$)"); + var els = node.getElementsByTagName(tag); + for (i = 0; i < els.length; i++) { + if ( pattern.test(els[i].className) ) { + ret.push(els[i]); + } + } + return ret; +} diff --git a/underlays/javascript/ikiwiki/relativedate.js b/underlays/javascript/ikiwiki/relativedate.js new file mode 100644 index 000000000..5142332f1 --- /dev/null +++ b/underlays/javascript/ikiwiki/relativedate.js @@ -0,0 +1,76 @@ +// Causes html elements in the 'relativedate' class to be displayed +// as relative dates. The date is parsed from the title attribute, or from +// the element content. + +var dateElements; + +hook("onload", getDates); + +function getDates() { + dateElements = getElementsByClass('relativedate'); + for (var i = 0; i < dateElements.length; i++) { + var elt = dateElements[i]; + var title = elt.attributes.title; + var d = new Date(title ? title.value : elt.innerHTML); + if (! isNaN(d)) { + dateElements[i].date=d; + elt.title=elt.innerHTML; + } + } + + showDates(); +} + +function showDates() { + for (var i = 0; i < dateElements.length; i++) { + var elt = dateElements[i]; + var d = elt.date; + if (! isNaN(d)) { + elt.innerHTML=relativeDate(d); + } + } + setTimeout(showDates,30000); // keep updating every 30s +} + +var timeUnits = new Array; +timeUnits['minute'] = 60; +timeUnits['hour'] = timeUnits['minute'] * 60; +timeUnits['day'] = timeUnits['hour'] * 24; +timeUnits['month'] = timeUnits['day'] * 30; +timeUnits['year'] = timeUnits['day'] * 364; +var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute']; + +function relativeDate(date) { + var now = new Date(); + var offset = date.getTime() - now.getTime(); + var seconds = Math.round(Math.abs(offset) / 1000); + + // hack to avoid reading just in the future if there is a minor + // amount of clock slip + if (offset >= 0 && seconds < 30 * timeUnits['minute']) { + return "just now"; + } + + var ret = ""; + var shown = 0; + for (i = 0; i < timeUnitOrder.length; i++) { + var unit = timeUnitOrder[i]; + if (seconds >= timeUnits[unit]) { + var num = Math.floor(seconds / timeUnits[unit]); + seconds -= num * timeUnits[unit]; + if (ret) + ret += "and "; + ret += num + " " + unit + (num > 1 ? "s" : "") + " "; + + if (++shown == 2) + break; + } + else if (shown) + break; + } + + if (! ret) + ret = "less than a minute " + + return ret + (offset < 0 ? "ago" : "from now"); +} diff --git a/underlays/javascript/ikiwiki/toggle.js b/underlays/javascript/ikiwiki/toggle.js new file mode 100644 index 000000000..d190b737a --- /dev/null +++ b/underlays/javascript/ikiwiki/toggle.js @@ -0,0 +1,29 @@ +// Uses CSS to hide toggleables, to avoid any flashing on page load. The +// CSS is only emitted after it tests that it's going to be able +// to show the toggleables. +if (document.getElementById && document.getElementsByTagName && document.createTextNode) { + document.write(''); + hook("onload", inittoggle); +} + +function inittoggle() { + var as = getElementsByClass('toggle'); + for (var i = 0; i < as.length; i++) { + var id = as[i].href.match(/#(\w.+)/)[1]; + if (document.getElementById(id).className == "toggleable") + document.getElementById(id).style.display="none"; + as[i].onclick = function() { + toggle(this); + return false; + } + } +} + +function toggle(s) { + var id = s.href.match(/#(\w.+)/)[1]; + style = document.getElementById(id).style; + if (style.display == "none") + style.display = "block"; + else + style.display = "none"; +} diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/relativedate.js deleted file mode 100644 index 5142332f1..000000000 --- a/underlays/javascript/relativedate.js +++ /dev/null @@ -1,76 +0,0 @@ -// Causes html elements in the 'relativedate' class to be displayed -// as relative dates. The date is parsed from the title attribute, or from -// the element content. - -var dateElements; - -hook("onload", getDates); - -function getDates() { - dateElements = getElementsByClass('relativedate'); - for (var i = 0; i < dateElements.length; i++) { - var elt = dateElements[i]; - var title = elt.attributes.title; - var d = new Date(title ? title.value : elt.innerHTML); - if (! isNaN(d)) { - dateElements[i].date=d; - elt.title=elt.innerHTML; - } - } - - showDates(); -} - -function showDates() { - for (var i = 0; i < dateElements.length; i++) { - var elt = dateElements[i]; - var d = elt.date; - if (! isNaN(d)) { - elt.innerHTML=relativeDate(d); - } - } - setTimeout(showDates,30000); // keep updating every 30s -} - -var timeUnits = new Array; -timeUnits['minute'] = 60; -timeUnits['hour'] = timeUnits['minute'] * 60; -timeUnits['day'] = timeUnits['hour'] * 24; -timeUnits['month'] = timeUnits['day'] * 30; -timeUnits['year'] = timeUnits['day'] * 364; -var timeUnitOrder = ['year', 'month', 'day', 'hour', 'minute']; - -function relativeDate(date) { - var now = new Date(); - var offset = date.getTime() - now.getTime(); - var seconds = Math.round(Math.abs(offset) / 1000); - - // hack to avoid reading just in the future if there is a minor - // amount of clock slip - if (offset >= 0 && seconds < 30 * timeUnits['minute']) { - return "just now"; - } - - var ret = ""; - var shown = 0; - for (i = 0; i < timeUnitOrder.length; i++) { - var unit = timeUnitOrder[i]; - if (seconds >= timeUnits[unit]) { - var num = Math.floor(seconds / timeUnits[unit]); - seconds -= num * timeUnits[unit]; - if (ret) - ret += "and "; - ret += num + " " + unit + (num > 1 ? "s" : "") + " "; - - if (++shown == 2) - break; - } - else if (shown) - break; - } - - if (! ret) - ret = "less than a minute " - - return ret + (offset < 0 ? "ago" : "from now"); -} diff --git a/underlays/javascript/toggle.js b/underlays/javascript/toggle.js deleted file mode 100644 index d190b737a..000000000 --- a/underlays/javascript/toggle.js +++ /dev/null @@ -1,29 +0,0 @@ -// Uses CSS to hide toggleables, to avoid any flashing on page load. The -// CSS is only emitted after it tests that it's going to be able -// to show the toggleables. -if (document.getElementById && document.getElementsByTagName && document.createTextNode) { - document.write(''); - hook("onload", inittoggle); -} - -function inittoggle() { - var as = getElementsByClass('toggle'); - for (var i = 0; i < as.length; i++) { - var id = as[i].href.match(/#(\w.+)/)[1]; - if (document.getElementById(id).className == "toggleable") - document.getElementById(id).style.display="none"; - as[i].onclick = function() { - toggle(this); - return false; - } - } -} - -function toggle(s) { - var id = s.href.match(/#(\w.+)/)[1]; - style = document.getElementById(id).style; - if (style.display == "none") - style.display = "block"; - else - style.display = "none"; -} -- cgit v1.2.3 From 97b0c6e455f9edb99d9bd5145a8e82549ed54694 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Apr 2010 17:14:03 -0400 Subject: Fix removal of rendered files in rebuild mode. Needed to handle the move of the .js files into ikiwiki/, but also this is a longstanding bug. Old pagemtime is not remembered in rebuild mode, and changing that would need a lot of changes. So instead, loop on pagectime, which is remembered. Change to remembering old pagesources info in rebuild mode. This seems safe enough. --- IkiWiki.pm | 2 +- IkiWiki/Render.pm | 2 +- debian/changelog | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 63a7f5e2a..944001d9b 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1531,8 +1531,8 @@ sub loadindex () { my $d=$pages->{$src}; my $page=pagename($src); $pagectime{$page}=$d->{ctime}; + $pagesources{$page}=$src; if (! $config{rebuild}) { - $pagesources{$page}=$src; $pagemtime{$page}=$d->{mtime}; $renderedfiles{$page}=$d->{dest}; if (exists $d->{links} && ref $d->{links}) { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 871e005b2..b04664e41 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -409,7 +409,7 @@ sub find_del_files ($) { my @del; my @internal_del; - foreach my $page (keys %pagemtime) { + foreach my $page (keys %pagectime) { if (! $pages->{$page}) { if (isinternal($page)) { push @internal_del, $pagesources{$page}; diff --git a/debian/changelog b/debian/changelog index 53febb433..1229b1198 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,7 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low * Moved javascript files under the ikiwiki/ directory, to avoid cluttering the top of the web root. This is another things that requires a wiki rebuild on upgrade to this version. + * Fix removal of rendered files in rebuild mode. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 -- cgit v1.2.3 From 3ac2ae1f14952bd92038183d92b1eb618c9d0f55 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Apr 2010 18:47:17 -0400 Subject: Add page() PageSpec, which is like glob() but matches only pages, not other files. --- IkiWiki.pm | 10 +++++++++- debian/changelog | 2 ++ doc/ikiwiki/pagespec.mdwn | 11 ++++++----- t/pagespec_match.t | 16 +++++++++++++++- 4 files changed, 32 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 944001d9b..623396c9c 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2299,7 +2299,11 @@ sub match_glob ($$;@) { my $regexp=IkiWiki::glob2re($glob); if ($page=~/^$regexp$/i) { - if (! IkiWiki::isinternal($page) || $params{internal}) { + if ($params{onlypage} && + ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) { + return IkiWiki::FailReason->new("$page is not a page"); + } + elsif (! IkiWiki::isinternal($page) || $params{internal}) { return IkiWiki::SuccessReason->new("$glob matches $page"); } else { @@ -2315,6 +2319,10 @@ sub match_internal ($$;@) { return match_glob($_[0], $_[1], @_, internal => 1) } +sub match_page ($$;@) { + return match_glob($_[0], $_[1], @_, onlypage => 1) +} + sub match_link ($$;@) { my $page=shift; my $link=lc(shift); diff --git a/debian/changelog b/debian/changelog index 1229b1198..610d0c9cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -75,6 +75,8 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low the top of the web root. This is another things that requires a wiki rebuild on upgrade to this version. * Fix removal of rendered files in rebuild mode. + * Add page() PageSpec, which is like glob() but matches only pages, + not other files. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 7810e790b..1c99aefac 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -24,19 +24,20 @@ match all pages except for Discussion pages and the SandBox: Some more elaborate limits can be added to what matches using these functions: +* "`glob(someglob)`" - matches pages and other files that match the given glob. + Just writing the glob by itself is actually a shorthand for this function. +* "`page(glob)`" - like `glob()`, but only matches pages, not other files * "`link(page)`" - matches only pages that link to a given page (or glob) * "`tagged(tag)`" - matches pages that are tagged or link to the given tag (or tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to -* "`creation_month(month)`" - matches only pages created on the given month +* "`creation_month(month)`" - matches only files created on the given month * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year -* "`created_after(page)`" - matches only pages created after the given page +* "`created_after(page)`" - matches only files created after the given page was created -* "`created_before(page)`" - matches only pages created before the given page +* "`created_before(page)`" - matches only files created before the given page was created -* "`glob(someglob)`" - matches pages that match the given glob. Just writing - the glob by itself is actually a shorthand for this function. * "`internal(glob)`" - like `glob()`, but matches even internal-use pages that globs do not usually match. * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`", diff --git a/t/pagespec_match.t b/t/pagespec_match.t index ade9bca5a..97bcc969c 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 => 75; +use Test::More tests => 85; BEGIN { use_ok("IkiWiki"); } @@ -66,7 +66,21 @@ $links{"ook"}=[qw{/blog/tags/foo}]; foreach my $p (keys %links) { $pagesources{$p}="$p.mdwn"; } +$pagesources{"foo.png"}="foo.png"; +$pagesources{"foo"}="foo.mdwn"; +$IkiWiki::hooks{htmlize}{mdwn}={}; +ok(pagespec_match("foo", "foo"), "simple"); +ok(! pagespec_match("foo", "bar"), "simple fail"); +ok(pagespec_match("foo", "foo"), "simple glob"); +ok(pagespec_match("foo", "f*"), "simple glob fail"); +ok(pagespec_match("foo", "page(foo)"), "page()"); +print pagespec_match("foo", "page(foo)")."\n"; +ok(! pagespec_match("foo", "page(bar)"), "page() fail"); +ok(! pagespec_match("foo.png", "page(foo.png)"), "page() fails on non-page"); +ok(! pagespec_match("foo.png", "page(foo*)"), "page() fails on non-page glob"); +ok(pagespec_match("foo", "page(foo)"), "page() glob"); +ok(pagespec_match("foo", "page(f*)"), "page() glob fail"); ok(pagespec_match("foo", "link(bar)"), "link"); ok(pagespec_match("foo", "link(ba?)"), "glob link"); ok(! pagespec_match("foo", "link(quux)"), "failed link"); -- cgit v1.2.3 From a9cf5810a6c6d2f266d9ddcc5b676f836d4d11e6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Apr 2010 00:00:09 -0400 Subject: releasing version 3.20100427 --- debian/NEWS | 4 ++-- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index f976bdc01..6a410866d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.20100422) unstable; urgency=low +ikiwiki (3.20100427) unstable; urgency=low This version of ikiwiki has a lot of changes that you need to know about. @@ -42,7 +42,7 @@ ikiwiki (3.20100422) unstable; urgency=low this will be done automatically when the Debian package is upgraded. Or use ikiwiki-mass-rebuild to force a rebuild. - -- Joey Hess Wed, 21 Apr 2010 20:31:29 -0400 + -- Joey Hess Tue, 27 Apr 2010 00:00:00 -0400 ikiwiki (3.20091017) unstable; urgency=low diff --git a/debian/changelog b/debian/changelog index 610d0c9cb..411f67bd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100424) UNRELEASED; urgency=low +ikiwiki (3.20100427) unstable; urgency=low [ Joey Hess ] * tag: Automatic creation of tag pages can now be enabled using @@ -78,7 +78,7 @@ ikiwiki (3.20100424) UNRELEASED; urgency=low * Add page() PageSpec, which is like glob() but matches only pages, not other files. - -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 + -- Joey Hess Tue, 27 Apr 2010 00:00:00 -0400 ikiwiki (3.20100403) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index fb7971b27..8d871eb21 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100403 +Version: 3.20100427 Release: 1%{?dist} Summary: A wiki compiler -- cgit v1.2.3 From 0e7a3640aec280eb19330285308af6ad7535627f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Apr 2010 12:10:58 -0400 Subject: template: Fix typo. --- IkiWiki/Plugin/template.pm | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/template.pm b/IkiWiki/Plugin/template.pm index 52c482c38..b8c2f05b2 100644 --- a/IkiWiki/Plugin/template.pm +++ b/IkiWiki/Plugin/template.pm @@ -53,7 +53,7 @@ sub preprocess (@) { foreach my $param (keys %params) { my $value=IkiWiki::preprocess($params{page}, $params{destpage}, - IkiWiki::filter($params{page}, $params{destpagea}, + IkiWiki::filter($params{page}, $params{destpage}, $params{$param}), $scan); if ($template->query(name => $param)) { my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage}, diff --git a/debian/changelog b/debian/changelog index 411f67bd1..b19840865 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100428) UNRELEASED; urgency=low + + * template: Fix typo. + + -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 + ikiwiki (3.20100427) unstable; urgency=low [ Joey Hess ] -- cgit v1.2.3 From a6e6f604bd8e9a8f90000163f8b00299829729d5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 28 Apr 2010 12:39:13 -0400 Subject: TMPL_INCLUDE re-enabled for templates read from the templatedir. (But not in-wiki templates.) --- IkiWiki.pm | 18 +++++++++++------- debian/changelog | 2 ++ doc/news/version_3.20100427/discussion.mdwn | 4 ++++ 3 files changed, 17 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 623396c9c..dcee376ee 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1661,7 +1661,11 @@ sub template_file ($) { } my $template=srcfile($tpage, 1); - if (! defined $template) { + if (defined $template) { + return $template, $tpage, 1 if wantarray; + return $template; + } + else { $name=~s:/::; # avoid path traversal foreach my $dir ($config{templatedir}, "$installdir/share/ikiwiki/templates") { @@ -1670,12 +1674,12 @@ sub template_file ($) { last; } } + if (defined $template) { + return $template, $tpage if wantarray; + return $template; + } } - if (defined $template) { - return $template, $tpage if wantarray; - return $template; - } return; } @@ -1683,7 +1687,7 @@ sub template_depends ($$;@) { my $name=shift; my $page=shift; - my ($filename, $tpage)=template_file($name); + my ($filename, $tpage, $untrusted)=template_file($name); if (defined $page && defined $tpage) { add_depends($page, $tpage); } @@ -1699,7 +1703,7 @@ sub template_depends ($$;@) { die_on_bad_params => 0, filename => $filename, @_, - no_includes => 1, + ($untrusted ? (no_includes => 1) : ()), ); return @opts if wantarray; diff --git a/debian/changelog b/debian/changelog index b19840865..0a70dc6ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low * template: Fix typo. + * TMPL_INCLUDE re-enabled for templates read from the templatedir. + (But not in-wiki templates.) -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/news/version_3.20100427/discussion.mdwn b/doc/news/version_3.20100427/discussion.mdwn index 4daf8085f..726f9a0d2 100644 --- a/doc/news/version_3.20100427/discussion.mdwn +++ b/doc/news/version_3.20100427/discussion.mdwn @@ -1,3 +1,7 @@ *TMPL_INCLUDE is no longer supported in any template used by ikiwiki. It used to be allowed in certian templates, but not in others.* Would it be possible to make that a config option? Because I do use includes in my templates, and I don't allow users to edit templates, so it isn't a security loophole for me. --[[KathrynAndersen]] + +> I don't like config options that make wikis unsafe, but I should have +> revisted enabling includes for templates read from the templatedir -- +> it's easy to do, and I've done it now. --[[Joey]] -- cgit v1.2.3 From b61dc50dabaa76025cfcac1e139a80894abc3953 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 28 Apr 2010 12:42:14 -0400 Subject: remove obsolete NEWS --- debian/NEWS | 3 --- 1 file changed, 3 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 6a410866d..c9b8f3d09 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -30,9 +30,6 @@ ikiwiki (3.20100427) unstable; urgency=low has been moved to the new sortnaturally plugin, which is not enabled by default since it requires the Sort::Naturally perl module. - * TMPL_INCLUDE is no longer supported in any template used by ikiwiki. - It used to be allowed in certian templates, but not in others. - * The add_templates option has been removed from the underlay plugin. If you used this option, you can instead use templates/ subdirectories inside underlay directories added by the add_underlays option. -- cgit v1.2.3 From 8ce5c7773884504c3936cb6e91e5a05ac4c1073d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 30 Apr 2010 13:06:52 -0400 Subject: Version dependency on liburi-perl to >= 1.36; previous versions did not support building urls from utf-8 strings. Closes: #579713 --- Bundle/IkiWiki.pm | 2 +- debian/changelog | 2 ++ debian/control | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm index 769791d30..d6c344d6a 100644 --- a/Bundle/IkiWiki.pm +++ b/Bundle/IkiWiki.pm @@ -20,7 +20,7 @@ Text::Markdown HTML::Scrubber HTML::Template HTML::Parser -URI +URI 1.36 XML::Simple Date::Parse CGI::FormBuilder diff --git a/debian/changelog b/debian/changelog index 0a70dc6ee..a1bd85bfa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low * template: Fix typo. * TMPL_INCLUDE re-enabled for templates read from the templatedir. (But not in-wiki templates.) + * Version dependency on liburi-perl to >= 1.36; previous versions + did not support building urls from utf-8 strings. Closes: #579713 -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/debian/control b/debian/control index ae06f32b0..bba89d82e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, - libhtml-parser-perl, liburi-perl, perlmagick, po4a (>= 0.34), + libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34), libfile-chdir-perl, Maintainer: Joey Hess Uploaders: Josh Triplett @@ -20,7 +20,7 @@ Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, - libhtml-parser-perl, liburi-perl + libhtml-parser-perl, liburi-perl (>= 1.36) Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, -- cgit v1.2.3 From 80f2042464f9d14bcaed999e9769c71618bf5252 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 16:34:47 -0400 Subject: htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup header footer time mark --- IkiWiki/Plugin/htmlscrubber.pm | 9 ++++++--- debian/changelog | 2 ++ doc/bugs/html5_support.mdwn | 10 ++++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 9f40c752f..1604d776a 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -72,7 +72,7 @@ sub scrubber { eval q{use HTML::Scrubber}; error($@) if $@; # Lists based on http://feedparser.org/docs/html-sanitization.html - # With html 5 video and audio tags added. + # With html5 tags added. $_scrubber = HTML::Scrubber->new( allow => [qw{ a abbr acronym address area b big blockquote br br/ @@ -82,7 +82,9 @@ sub scrubber { menu ol optgroup option p p/ pre q s samp select small span strike strong sub sup table tbody td textarea tfoot th thead tr tt u ul var - video audio + + video audio section nav article aside hgroup header + footer time mark }], default => [undef, { ( map { $_ => 1 } qw{ @@ -98,8 +100,9 @@ sub scrubber { selected shape size span start summary tabindex target title type valign value vspace width + autoplay loopstart loopend end - playcount controls + playcount controls pubdate } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index a1bd85bfa..9a6cf68e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low (But not in-wiki templates.) * Version dependency on liburi-perl to >= 1.36; previous versions did not support building urls from utf-8 strings. Closes: #579713 + * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup + header footer time mark -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index 5d2a41303..a330d3ae6 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -59,7 +59,13 @@ HTML5](http://www.w3.org/TR/html5-diff/). > tag, but something should still be done to replace it. > > (BTW, it would be helpful if you could re-merge master into your branch -> as it is a bit diverged now.) --[[Joey]] +> as it is a bit diverged now.) +> +> Other ideas: +> +> * Add pubdate attribute to time elements as appropriate. +> * Use aside for the sidebar? Or for the [[templates/note]] template? +> --[[Joey]] # htmlscrubber.pm needs to not scrub new HTML5 elements @@ -68,7 +74,7 @@ HTML5](http://www.w3.org/TR/html5-diff/). > Most of these can be supported trivially, since they are just semantic > markup. Make a list of these, and their attributes (and which attributes > can contain urls or other javascript injection mechanisms), and I can add -> them. Others, like `embed`, and `canvas` are *scary*. --[[Joey]] +> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]] # HTML5 Validation and t/html.t -- cgit v1.2.3 From 73c8209484ac730c82f7c7b749d08a1b3d895ee0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 17:56:35 -0400 Subject: more html5 * htmlscrubber: Also allow html5 canvas tags. * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. --- IkiWiki/Plugin/htmlscrubber.pm | 6 +++--- debian/changelog | 3 +++ doc/bugs/html5_support.mdwn | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 1604d776a..cc00fd5ff 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -83,8 +83,8 @@ sub scrubber { span strike strong sub sup table tbody td textarea tfoot th thead tr tt u ul var - video audio section nav article aside hgroup header - footer time mark + video audio source section nav article aside hgroup + header footer time mark canvas }], default => [undef, { ( map { $_ => 1 } qw{ @@ -101,7 +101,7 @@ sub scrubber { tabindex target title type valign value vspace width - autoplay loopstart loopend end + autoplay preload loopstart loopend end playcount controls pubdate } ), "/" => 1, # emit proper
    XHTML diff --git a/debian/changelog b/debian/changelog index 9a6cf68e3..9613d8b6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low did not support building urls from utf-8 strings. Closes: #579713 * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup header footer time mark + * htmlscrubber: Also allow html5 canvas tags. + * htmlscrubber: Round out html5 video support with the preload + attribute and the source tag. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index a330d3ae6..c05208fbf 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -65,6 +65,7 @@ HTML5](http://www.w3.org/TR/html5-diff/). > > * Add pubdate attribute to time elements as appropriate. > * Use aside for the sidebar? Or for the [[templates/note]] template? +> * Use nav for the actionbar > --[[Joey]] # htmlscrubber.pm needs to not scrub new HTML5 elements @@ -74,7 +75,7 @@ HTML5](http://www.w3.org/TR/html5-diff/). > Most of these can be supported trivially, since they are just semantic > markup. Make a list of these, and their attributes (and which attributes > can contain urls or other javascript injection mechanisms), and I can add -> them. (Added several now.) Others, like `embed`, and `canvas` are *scary*. --[[Joey]] +> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]] # HTML5 Validation and t/html.t -- cgit v1.2.3 From 442bc59a15301941613d62f4b1d846c57557ca8f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 18:14:50 -0400 Subject: htmlscrubber: Allow the placeholder attribute. --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 1 + doc/bugs/html5_support.mdwn | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index cc00fd5ff..b3f659f73 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -102,7 +102,7 @@ sub scrubber { value vspace width autoplay preload loopstart loopend end - playcount controls pubdate + playcount controls pubdate placeholder } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index 9613d8b6d..951caab9e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low * htmlscrubber: Also allow html5 canvas tags. * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. + * htmlscrubber: Allow the placeholder attribute. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index c05208fbf..9c077a2d3 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -66,6 +66,8 @@ HTML5](http://www.w3.org/TR/html5-diff/). > * Add pubdate attribute to time elements as appropriate. > * Use aside for the sidebar? Or for the [[templates/note]] template? > * Use nav for the actionbar +> * Use placeholder in the search box. Allows closing +> [[this_todo|Add_label_to_search_form_input_field]] > --[[Joey]] # htmlscrubber.pm needs to not scrub new HTML5 elements -- cgit v1.2.3 From 0a139aba823ece3166d29ff2daee0b5c9507b52f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 18:27:53 -0400 Subject: htmlscrubber: Allow the html5 form attributes: placeholder autofocus, min, max, step. --- IkiWiki/Plugin/htmlscrubber.pm | 5 +++-- debian/changelog | 3 ++- doc/todo/Add_label_to_search_form_input_field.mdwn | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index b3f659f73..479e10e74 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -101,8 +101,9 @@ sub scrubber { tabindex target title type valign value vspace width - autoplay preload loopstart loopend end - playcount controls pubdate placeholder + autofocus autoplay preload loopstart + loopend end playcount controls pubdate + placeholder min max step } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index 951caab9e..12ef08a91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low * htmlscrubber: Also allow html5 canvas tags. * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. - * htmlscrubber: Allow the placeholder attribute. + * htmlscrubber: Allow the html5 form attributes: placeholder autofocus, + min, max, step. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/todo/Add_label_to_search_form_input_field.mdwn b/doc/todo/Add_label_to_search_form_input_field.mdwn index 51b34927d..281ab48e2 100644 --- a/doc/todo/Add_label_to_search_form_input_field.mdwn +++ b/doc/todo/Add_label_to_search_form_input_field.mdwn @@ -51,4 +51,4 @@ The patch below adds a label for the field to improve usability: > element. already works in eg, chromium. However, ikiwiki does not use > html5 yet. --[[Joey]] -[[!tag wishlist html5]] +[[!tag wishlist bugs/html5_support]] -- cgit v1.2.3 From 80f9a2a0879f74e86b2720ca7d1c88ee165100ea Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 18:31:33 -0400 Subject: add figure and figcaption --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 479e10e74..0090b67b9 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -84,7 +84,7 @@ sub scrubber { tfoot th thead tr tt u ul var video audio source section nav article aside hgroup - header footer time mark canvas + header footer figure figcaption time mark canvas }], default => [undef, { ( map { $_ => 1 } qw{ diff --git a/debian/changelog b/debian/changelog index 12ef08a91..108764c39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low * Version dependency on liburi-perl to >= 1.36; previous versions did not support building urls from utf-8 strings. Closes: #579713 * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup - header footer time mark + header footer figure figcaption time mark * htmlscrubber: Also allow html5 canvas tags. * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. -- cgit v1.2.3 From 78cee5140ac37f93cd2e87d8a03d71420303eb13 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 18:44:37 -0400 Subject: add rest of html5 form attributes It's easy to imagine pattern being used to freeze or crash browsers, if they implement it stupidly. Let's hope not.. --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 2 +- doc/bugs/html5_support.mdwn | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 0090b67b9..7517c82c6 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -103,7 +103,7 @@ sub scrubber { autofocus autoplay preload loopstart loopend end playcount controls pubdate - placeholder min max step + placeholder min max step form required } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index 108764c39..cdc79ae78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,7 +11,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. * htmlscrubber: Allow the html5 form attributes: placeholder autofocus, - min, max, step. + min, max, step, required, autocomplete, novalidate, pattern, and form. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index 9c077a2d3..7d9dc9f79 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -79,6 +79,10 @@ HTML5](http://www.w3.org/TR/html5-diff/). > can contain urls or other javascript injection mechanisms), and I can add > them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]] +> I have not added the new `ping` attribute, because parsing a +> space-separeated list of urls to avoid javascript injection is annoying, +> and the attribute seems generally dubious. --[[Joey]] + # HTML5 Validation and t/html.t [validator.nu](http://validator.nu/) is the authorative HTML5 validator, -- cgit v1.2.3 From f1e2d0af123352b692e8e4efdb208e370a00d3c1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 19:11:03 -0400 Subject: more html5 attributes --- IkiWiki/Plugin/htmlscrubber.pm | 5 +++++ debian/changelog | 4 ++++ doc/bugs/html5_support.mdwn | 5 ++++- 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 7517c82c6..d52614a4d 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -85,6 +85,7 @@ sub scrubber { video audio source section nav article aside hgroup header footer figure figcaption time mark canvas + datalist }], default => [undef, { ( map { $_ => 1 } qw{ @@ -104,11 +105,15 @@ sub scrubber { autofocus autoplay preload loopstart loopend end playcount controls pubdate placeholder min max step form required + autocomplete novalidate pattern list + formenctype formmethod formnovalidate + formtarget reversed } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, src => $safe_url_regexp, action => $safe_url_regexp, + formaction => $safe_url_regexp, cite => $safe_url_regexp, longdesc => $safe_url_regexp, poster => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index cdc79ae78..e0f506f29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,10 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low attribute and the source tag. * htmlscrubber: Allow the html5 form attributes: placeholder autofocus, min, max, step, required, autocomplete, novalidate, pattern, and form. + (Also the form* override attributes for input and buttons.) + * htmlscrubber: Allow the html5 datalist element, and the form list + attribute. + * htmlscrubber: Allow the html5 reversed and spellcheck attributes. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index 7d9dc9f79..1ca45f46d 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -81,7 +81,10 @@ HTML5](http://www.w3.org/TR/html5-diff/). > I have not added the new `ping` attribute, because parsing a > space-separeated list of urls to avoid javascript injection is annoying, -> and the attribute seems generally dubious. --[[Joey]] +> and the attribute seems generally dubious. +> +> Need to understand better the attributes contenteditabl, contextmenu, +> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] # HTML5 Validation and t/html.t -- cgit v1.2.3 From 790a339db18f1c697052446728641c9e6ef06bdb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 19:28:28 -0400 Subject: htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, ruby, rt, rp, details, summary. --- IkiWiki/Plugin/htmlscrubber.pm | 10 +++++----- debian/changelog | 3 ++- doc/bugs/html5_support.mdwn | 22 ++++++++++++++-------- 3 files changed, 21 insertions(+), 14 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index d52614a4d..505a6f142 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -85,7 +85,7 @@ sub scrubber { video audio source section nav article aside hgroup header footer figure figcaption time mark canvas - datalist + datalist progress meter ruby rt rp details summary }], default => [undef, { ( map { $_ => 1 } qw{ @@ -104,10 +104,10 @@ sub scrubber { autofocus autoplay preload loopstart loopend end playcount controls pubdate - placeholder min max step form required - autocomplete novalidate pattern list - formenctype formmethod formnovalidate - formtarget reversed + placeholder min max step low high optimum + form required autocomplete novalidate pattern + list formenctype formmethod formnovalidate + formtarget reversed spellcheck open } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index e0f506f29..3d33f3bfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low did not support building urls from utf-8 strings. Closes: #579713 * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup header footer figure figcaption time mark - * htmlscrubber: Also allow html5 canvas tags. + * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, + ruby, rt, rp, details, summary. * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. * htmlscrubber: Allow the html5 form attributes: placeholder autofocus, diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index 1ca45f46d..48b63b29a 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -68,23 +68,29 @@ HTML5](http://www.w3.org/TR/html5-diff/). > * Use nav for the actionbar > * Use placeholder in the search box. Allows closing > [[this_todo|Add_label_to_search_form_input_field]] +> * Use details tag instead of the javascript in the toggle plugin. +> (Need to wait on browser support probably.) > --[[Joey]] # htmlscrubber.pm needs to not scrub new HTML5 elements * [new elements](http://www.w3.org/TR/html5-diff/#new-elements) -> Most of these can be supported trivially, since they are just semantic -> markup. Make a list of these, and their attributes (and which attributes -> can contain urls or other javascript injection mechanisms), and I can add -> them. (Added several now.) Others, like `embed` are *scary*. --[[Joey]] - +> Many added now. +> +> Things I left out, too hard to understand today: +> Attributes contenteditabl, contextmenu, +> data-*, draggable, hidden, role, aria-*. Tags command, keygen, +> output. +> +> Clearly unsafe: embed. +> +> Apparently cannot be used w/o javascript: menu. +> > I have not added the new `ping` attribute, because parsing a > space-separeated list of urls to avoid javascript injection is annoying, > and the attribute seems generally dubious. -> -> Need to understand better the attributes contenteditabl, contextmenu, -> data-*, draggable, hidden, role, aria-*. Have not added those. --[[Joey]] +> --[[Joey]] # HTML5 Validation and t/html.t -- cgit v1.2.3 From ccafb10007731d04e0ff6aa36978690e6dfa6dec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 19:59:16 -0400 Subject: enable hidden attribute --- IkiWiki/Plugin/htmlscrubber.pm | 2 +- debian/changelog | 17 ++++++++--------- doc/bugs/html5_support.mdwn | 6 +++--- 3 files changed, 12 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 505a6f142..847518178 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -107,7 +107,7 @@ sub scrubber { placeholder min max step low high optimum form required autocomplete novalidate pattern list formenctype formmethod formnovalidate - formtarget reversed spellcheck open + formtarget reversed spellcheck open hidden } ), "/" => 1, # emit proper
    XHTML href => $safe_url_regexp, diff --git a/debian/changelog b/debian/changelog index 3d33f3bfc..8bf6f89b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,18 +5,17 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low (But not in-wiki templates.) * Version dependency on liburi-perl to >= 1.36; previous versions did not support building urls from utf-8 strings. Closes: #579713 - * htmlscrubber: Allow html5 semantic tags: section nav article aside hgroup - header footer figure figcaption time mark + * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside + hgroup, header, footer, figure, figcaption, time, mark * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, - ruby, rt, rp, details, summary. + ruby, rt, rp, details, summary, datalist. * htmlscrubber: Round out html5 video support with the preload attribute and the source tag. - * htmlscrubber: Allow the html5 form attributes: placeholder autofocus, - min, max, step, required, autocomplete, novalidate, pattern, and form. - (Also the form* override attributes for input and buttons.) - * htmlscrubber: Allow the html5 datalist element, and the form list - attribute. - * htmlscrubber: Allow the html5 reversed and spellcheck attributes. + * htmlscrubber: Allow the html5 form attributes: placeholder, autofocus, + min, max, step, required, autocomplete, novalidate, pattern, list, + and form. (Also the form* override attributes for input and buttons.) + * htmlscrubber: Allow additional misc html5 attributes: reversed, + spellcheck, and hidden. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index 48b63b29a..2d27ac803 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -79,9 +79,9 @@ HTML5](http://www.w3.org/TR/html5-diff/). > Many added now. > > Things I left out, too hard to understand today: -> Attributes contenteditabl, contextmenu, -> data-*, draggable, hidden, role, aria-*. Tags command, keygen, -> output. +> Attributes contenteditable, +> data-\*, draggable, role, aria-\*. +> Tags command, keygen, output. > > Clearly unsafe: embed. > -- cgit v1.2.3 From a547d2685866898665fad221939b0b820a42a088 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 20:40:31 -0400 Subject: html5 option * Ikiwiki can be configured to generate html5 instead of the default xhtml 1.0. The html5 output mode is experimental, not yet fully standards compliant, and will be subject to rapid change. --- IkiWiki.pm | 8 ++++++++ IkiWiki/Render.pm | 1 + debian/changelog | 5 ++++- doc/bugs/html5_support.mdwn | 12 +++++++----- doc/roadmap.mdwn | 1 + templates/misc.tmpl | 5 ++++- templates/page.tmpl | 5 ++++- 7 files changed, 29 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 5ff1a5ae6..1e11d34e2 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -234,6 +234,13 @@ sub getsetup () { safe => 1, rebuild => 1, }, + html5 => { + type => "boolean", + default => 0, + description => "generate HTML5? (experimental)", + safe => 1, + rebuild => 1, + }, sslcookie => { type => "boolean", default => 0, @@ -1725,6 +1732,7 @@ sub misctemplate ($$;@) { wikiname => $config{wikiname}, pagebody => $pagebody, baseurl => baseurl(), + html5 => $config{html5}, @_, ); run_hooks(pagetemplate => sub { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 7e3d78861..5923f5e74 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -138,6 +138,7 @@ sub genpage ($$) { mtime => displaytime($pagemtime{$page}), ctime => displaytime($pagectime{$page}), baseurl => baseurl($page), + html5 => $config{html5}, ); run_hooks(pagetemplate => sub { diff --git a/debian/changelog b/debian/changelog index 8bf6f89b6..fc5a6124b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,12 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low - * template: Fix typo. * TMPL_INCLUDE re-enabled for templates read from the templatedir. (But not in-wiki templates.) * Version dependency on liburi-perl to >= 1.36; previous versions did not support building urls from utf-8 strings. Closes: #579713 + * Ikiwiki can be configured to generate html5 instead of the default xhtml + 1.0. The html5 output mode is experimental, not yet fully standards + compliant, and will be subject to rapid change. * htmlscrubber: Allow html5 semantic tags: section, nav, article, aside hgroup, header, footer, figure, figcaption, time, mark * htmlscrubber: Also allow some other html5 tags: canvas, progress, meter, @@ -16,6 +18,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low and form. (Also the form* override attributes for input and buttons.) * htmlscrubber: Allow additional misc html5 attributes: reversed, spellcheck, and hidden. + * template: Fix typo. -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 diff --git a/doc/bugs/html5_support.mdwn b/doc/bugs/html5_support.mdwn index 2d27ac803..bf782a3bf 100644 --- a/doc/bugs/html5_support.mdwn +++ b/doc/bugs/html5_support.mdwn @@ -20,13 +20,14 @@ HTML5](http://www.w3.org/TR/html5-diff/). > What has been done so far, can be extended. Basically works > in browsers, if you don't care about standards. A good prerequisite > for anything else, anyway. -> 2. Switch to html5 in eg, ikiwiki 4; users have to deal with +> 2. Have both a html5 and a xhtml mode, allow user to select. +> 3. Switch to html5 in eg, ikiwiki 4; users have to deal with > any custom markup on their pages/templates that breaks then. -> 3. Have both a html5 and a xhtml mode, allow user to select. -> -> The third option seems fairly tractable from what I see here and in +> +> The second option seems fairly tractable from what I see here and in > your branch. You made only relatively minor changes to 10 templates. -> It would probably not be too dreadful to put them in ifdefs. +> It would probably not be too dreadful to put them in ifdefs. I've made a +> small start at doing that. > > Some of your changes are obvious, like using the new `time` and > and `article` elements. Others less so, and I'm particularly @@ -70,6 +71,7 @@ HTML5](http://www.w3.org/TR/html5-diff/). > [[this_todo|Add_label_to_search_form_input_field]] > * Use details tag instead of the javascript in the toggle plugin. > (Need to wait on browser support probably.) +> > --[[Joey]] # htmlscrubber.pm needs to not scrub new HTML5 elements diff --git a/doc/roadmap.mdwn b/doc/roadmap.mdwn index c126fd585..4b5f01c45 100644 --- a/doc/roadmap.mdwn +++ b/doc/roadmap.mdwn @@ -80,6 +80,7 @@ Probably incomplete list: * YADA format setup files per default? * Enable tagbase by default (so that tag autocreation will work by default). Note that this is already done for wikis created by `auto-blog.setup`. +* html5 on by default (some day..) In general, we try to use [[ikiwiki-transition]] or forced rebuilds on upgrade to deal with changes that break compatability. Some things that diff --git a/templates/misc.tmpl b/templates/misc.tmpl index 535a6f06b..0b7fefa08 100644 --- a/templates/misc.tmpl +++ b/templates/misc.tmpl @@ -1,6 +1,9 @@ - + + + diff --git a/templates/page.tmpl b/templates/page.tmpl index 7e850a56b..661d4a515 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -1,6 +1,9 @@ - + + + -- cgit v1.2.3 From d9e22adb6639e3c6cb4fe46d146940fa2182db4f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 May 2010 21:42:13 -0400 Subject: releasing version 3.20100501 --- debian/changelog | 4 +- ikiwiki.spec | 2 +- po/ikiwiki.pot | 74 ++++++++--------- po/tr.po | 226 ++++++++++++++++++++++++++------------------------- po/vi.po | 240 +++++++++++++++++++++++++++++-------------------------- 5 files changed, 282 insertions(+), 264 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fc5a6124b..6962e5171 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100428) UNRELEASED; urgency=low +ikiwiki (3.20100501) unstable; urgency=low * TMPL_INCLUDE re-enabled for templates read from the templatedir. (But not in-wiki templates.) @@ -20,7 +20,7 @@ ikiwiki (3.20100428) UNRELEASED; urgency=low spellcheck, and hidden. * template: Fix typo. - -- Joey Hess Tue, 27 Apr 2010 12:10:51 -0400 + -- Joey Hess Sat, 01 May 2010 20:49:28 -0400 ikiwiki (3.20100427) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 8d871eb21..b107f28eb 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100427 +Version: 3.20100501 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 638e724d5..5e2f05b27 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-24 16:15-0400\n" +"POT-Creation-Date: 2010-05-01 21:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1291 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298 msgid "Error" msgstr "" @@ -487,7 +487,7 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:383 +#: ../IkiWiki/Plugin/meta.pm:387 msgid "sort=meta requires a parameter" msgstr "" @@ -607,7 +607,7 @@ msgstr "" msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:761 +#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772 #, perl-format msgid "building %s" msgstr "" @@ -628,50 +628,50 @@ msgid "" "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:873 +#: ../IkiWiki/Plugin/po.pm:874 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:887 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:896 +#: ../IkiWiki/Plugin/po.pm:897 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:903 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:938 +#: ../IkiWiki/Plugin/po.pm:939 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:951 +#: ../IkiWiki/Plugin/po.pm:952 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1036 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1091 ../IkiWiki/Plugin/po.pm:1105 -#: ../IkiWiki/Plugin/po.pm:1144 +#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1145 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1103 +#: ../IkiWiki/Plugin/po.pm:1104 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -865,12 +865,12 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:184 +#: ../IkiWiki/Plugin/search.pm:188 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:221 +#: ../IkiWiki/Plugin/search.pm:225 msgid "search" msgstr "" @@ -1019,59 +1019,59 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:162 +#: ../IkiWiki/Render.pm:163 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:315 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:330 +#: ../IkiWiki/Render.pm:331 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:372 +#: ../IkiWiki/Render.pm:373 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:434 +#: ../IkiWiki/Render.pm:435 #, perl-format msgid "removing obsolete %s" msgstr "" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:516 +#: ../IkiWiki/Render.pm:517 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:671 ../IkiWiki/Render.pm:777 +#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:684 +#: ../IkiWiki/Render.pm:695 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:819 +#: ../IkiWiki/Render.pm:824 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1164,43 +1164,43 @@ msgstr "" msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:233 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:524 +#: ../IkiWiki.pm:531 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:570 +#: ../IkiWiki.pm:577 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:599 +#: ../IkiWiki.pm:606 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1273 +#: ../IkiWiki.pm:1280 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1932 +#: ../IkiWiki.pm:1944 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2009 +#: ../IkiWiki.pm:2021 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2030 +#: ../IkiWiki.pm:2042 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2166 +#: ../IkiWiki.pm:2178 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/tr.po b/po/tr.po index b59f5e941..dca798e3e 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-03 14:18-0400\n" +"POT-Creation-Date: 2010-05-01 21:16-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -51,7 +51,7 @@ msgstr "Tercihler kaydedildi." msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298 msgid "Error" msgstr "Hata" @@ -132,7 +132,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 msgid "done" msgstr "" @@ -170,7 +170,7 @@ msgstr "" msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:105 +#: ../IkiWiki/Plugin/autoindex.pm:117 msgid "automatic index generation" msgstr "" @@ -202,55 +202,55 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:345 +#: ../IkiWiki/Plugin/comments.pm:347 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:363 +#: ../IkiWiki/Plugin/comments.pm:365 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:370 +#: ../IkiWiki/Plugin/comments.pm:372 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:467 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:469 +#: ../IkiWiki/Plugin/comments.pm:471 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:482 +#: ../IkiWiki/Plugin/comments.pm:484 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:486 +#: ../IkiWiki/Plugin/comments.pm:488 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 +#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:579 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:618 +#: ../IkiWiki/Plugin/comments.pm:620 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:761 +#: ../IkiWiki/Plugin/comments.pm:759 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -260,7 +260,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:771 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comment" msgstr "" @@ -290,14 +290,14 @@ msgstr "" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:296 +#: ../IkiWiki/Plugin/editpage.pm:295 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 -#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 -#: ../IkiWiki/Plugin/editpage.pm:426 +#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386 +#: ../IkiWiki/Plugin/editpage.pm:425 #, perl-format msgid "editing %s" msgstr "" @@ -315,8 +315,9 @@ msgstr "" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:138 -msgid "failed to process" +#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/template.pm:44 +msgid "failed to process template:" msgstr "" #: ../IkiWiki/Plugin/format.pm:30 @@ -345,18 +346,18 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 +#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:698 +#: ../IkiWiki/Plugin/git.pm:727 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:702 +#: ../IkiWiki/Plugin/git.pm:731 msgid "you are not allowed to change file modes" msgstr "" @@ -438,12 +439,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:333 +#: ../IkiWiki/Plugin/inline.pm:342 #, perl-format -msgid "nonexistant template %s" +msgid "template %s not found" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:625 +#: ../IkiWiki/Plugin/inline.pm:635 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -470,18 +471,22 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:162 +#: ../IkiWiki/Plugin/meta.pm:174 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:200 +#: ../IkiWiki/Plugin/meta.pm:212 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:214 +#: ../IkiWiki/Plugin/meta.pm:226 msgid "redir cycle is not allowed" msgstr "" +#: ../IkiWiki/Plugin/meta.pm:387 +msgid "sort=meta requires a parameter" +msgstr "" + #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "" @@ -498,10 +503,6 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:66 -msgid "getctime not implemented" -msgstr "" - #: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" @@ -518,39 +519,39 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:229 +#: ../IkiWiki/Plugin/passwordauth.pm:231 msgid "Your user page: " msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:236 +#: ../IkiWiki/Plugin/passwordauth.pm:238 msgid "Create your user page" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:264 +#: ../IkiWiki/Plugin/passwordauth.pm:268 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:267 +#: ../IkiWiki/Plugin/passwordauth.pm:271 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:274 +#: ../IkiWiki/Plugin/passwordauth.pm:278 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:308 +#: ../IkiWiki/Plugin/passwordauth.pm:312 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:310 +#: ../IkiWiki/Plugin/passwordauth.pm:314 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:345 +#: ../IkiWiki/Plugin/passwordauth.pm:349 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:348 +#: ../IkiWiki/Plugin/passwordauth.pm:352 msgid "password reset denied" msgstr "" @@ -580,93 +581,93 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:139 +#: ../IkiWiki/Plugin/po.pm:140 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:151 +#: ../IkiWiki/Plugin/po.pm:152 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:157 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:386 +#: ../IkiWiki/Plugin/po.pm:388 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:430 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:454 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:474 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:874 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:897 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:903 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:939 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:952 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1036 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 -#: ../IkiWiki/Plugin/po.pm:1142 +#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1145 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1101 +#: ../IkiWiki/Plugin/po.pm:1104 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1154 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -808,44 +809,44 @@ msgstr "" msgid "no change to the file name was specified" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:69 +#: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:74 +#: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:80 +#: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:123 +#: ../IkiWiki/Plugin/rename.pm:122 #, perl-format msgid "rename %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:162 +#: ../IkiWiki/Plugin/rename.pm:161 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:249 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:252 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:349 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:573 +#: ../IkiWiki/Plugin/rename.pm:572 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -860,12 +861,12 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:184 +#: ../IkiWiki/Plugin/search.pm:188 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:221 +#: ../IkiWiki/Plugin/search.pm:225 msgid "search" msgstr "" @@ -943,18 +944,19 @@ msgstr "" msgid "parse fail at line %d: %s" msgstr "" -#: ../IkiWiki/Plugin/template.pm:34 +#: ../IkiWiki/Plugin/tag.pm:83 +#, fuzzy, perl-format +msgid "creating tag page %s" +msgstr "%s için yeni sayfa oluşturuluyor" + +#: ../IkiWiki/Plugin/template.pm:33 msgid "missing id parameter" msgstr "" #: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "template %s not found" -msgstr "" - -#: ../IkiWiki/Plugin/template.pm:66 -msgid "failed to process:" -msgstr "" +#, fuzzy, perl-format +msgid "%s not found" +msgstr "özet akışı bulunamadı" #: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" @@ -1013,54 +1015,59 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:153 +#: ../IkiWiki/Render.pm:163 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:274 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:331 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:413 +#: ../IkiWiki/Render.pm:373 #, perl-format -msgid "removing old page %s" +msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:435 +#, perl-format +msgid "removing obsolete %s" +msgstr "" + +#: ../IkiWiki/Render.pm:508 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:495 +#: ../IkiWiki/Render.pm:517 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:618 +#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:631 +#: ../IkiWiki/Render.pm:695 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:707 +#: ../IkiWiki/Render.pm:824 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1133,62 +1140,63 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:95 +#: ../ikiwiki.in:96 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:102 +#: ../ikiwiki.in:103 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:156 +#: ../ikiwiki.in:157 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:219 +#: ../ikiwiki.in:220 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:222 +#: ../ikiwiki.in:223 msgid "refreshing wiki.." msgstr "" -#: ../IkiWiki.pm:238 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:530 +#: ../IkiWiki.pm:531 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:576 +#: ../IkiWiki.pm:577 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:605 +#: ../IkiWiki.pm:606 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1278 +#: ../IkiWiki.pm:1280 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1901 +#: ../IkiWiki.pm:1944 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2044 -msgid "Sort::Naturally needed for title_natural sort" +#: ../IkiWiki.pm:2021 +#, perl-format +msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2055 +#: ../IkiWiki.pm:2042 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2074 +#: ../IkiWiki.pm:2178 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index 5f968ccb3..b5596b926 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-03 14:18-0400\n" +"POT-Creation-Date: 2010-05-01 21:16-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -55,7 +55,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1296 +#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1298 msgid "Error" msgstr "Lỗi" @@ -137,7 +137,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:230 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 msgid "done" msgstr "xong" @@ -178,7 +178,7 @@ msgstr "" msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:105 +#: ../IkiWiki/Plugin/autoindex.pm:117 msgid "automatic index generation" msgstr "" @@ -210,55 +210,55 @@ msgstr "" msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:342 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:345 +#: ../IkiWiki/Plugin/comments.pm:347 #, fuzzy, perl-format msgid "commenting on %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:363 +#: ../IkiWiki/Plugin/comments.pm:365 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:370 +#: ../IkiWiki/Plugin/comments.pm:372 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:467 +#: ../IkiWiki/Plugin/comments.pm:469 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:469 +#: ../IkiWiki/Plugin/comments.pm:471 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:482 +#: ../IkiWiki/Plugin/comments.pm:484 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:486 +#: ../IkiWiki/Plugin/comments.pm:488 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:270 +#: ../IkiWiki/Plugin/comments.pm:530 ../IkiWiki/Plugin/websetup.pm:270 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:579 +#: ../IkiWiki/Plugin/comments.pm:581 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:618 +#: ../IkiWiki/Plugin/comments.pm:620 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:761 +#: ../IkiWiki/Plugin/comments.pm:759 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -267,7 +267,7 @@ msgstr[0] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:771 +#: ../IkiWiki/Plugin/comments.pm:769 msgid "Comment" msgstr "" @@ -297,14 +297,14 @@ msgstr "đang gỡ bỏ trang cũ %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:296 +#: ../IkiWiki/Plugin/editpage.pm:295 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 -#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 -#: ../IkiWiki/Plugin/editpage.pm:426 +#: ../IkiWiki/Plugin/editpage.pm:313 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:342 ../IkiWiki/Plugin/editpage.pm:386 +#: ../IkiWiki/Plugin/editpage.pm:425 #, perl-format msgid "editing %s" msgstr "đang sửa %s" @@ -324,9 +324,10 @@ msgstr "chưa xác định tên tập tin bộ bao bọc" msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:138 +#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/template.pm:44 #, fuzzy -msgid "failed to process" +msgid "failed to process template:" msgstr "mẫu không xử lý được:" #: ../IkiWiki/Plugin/format.pm:30 @@ -357,18 +358,18 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 +#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 #: ../IkiWiki/Receive.pm:130 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:698 +#: ../IkiWiki/Plugin/git.pm:727 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:702 +#: ../IkiWiki/Plugin/git.pm:731 msgid "you are not allowed to change file modes" msgstr "" @@ -457,12 +458,12 @@ msgstr "" msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:333 +#: ../IkiWiki/Plugin/inline.pm:342 #, perl-format -msgid "nonexistant template %s" -msgstr "" +msgid "template %s not found" +msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/inline.pm:625 +#: ../IkiWiki/Plugin/inline.pm:635 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" @@ -490,21 +491,25 @@ msgstr "" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:162 +#: ../IkiWiki/Plugin/meta.pm:174 #, fuzzy msgid "stylesheet not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:200 +#: ../IkiWiki/Plugin/meta.pm:212 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:214 +#: ../IkiWiki/Plugin/meta.pm:226 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" +#: ../IkiWiki/Plugin/meta.pm:387 +msgid "sort=meta requires a parameter" +msgstr "" + #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Nhân bản" @@ -521,10 +526,6 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/norcs.pm:66 -msgid "getctime not implemented" -msgstr "chưa thực hiện getctime" - #: ../IkiWiki/Plugin/openid.pm:62 msgid "Log in with" msgstr "" @@ -542,39 +543,39 @@ msgstr "Mọi trang được liên kết với trang khác." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:229 +#: ../IkiWiki/Plugin/passwordauth.pm:231 msgid "Your user page: " msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:236 +#: ../IkiWiki/Plugin/passwordauth.pm:238 msgid "Create your user page" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:264 +#: ../IkiWiki/Plugin/passwordauth.pm:268 msgid "Account creation successful. Now you can Login." msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." -#: ../IkiWiki/Plugin/passwordauth.pm:267 +#: ../IkiWiki/Plugin/passwordauth.pm:271 msgid "Error creating account." msgstr "Gặp lỗi khi tạo tài khoản." -#: ../IkiWiki/Plugin/passwordauth.pm:274 +#: ../IkiWiki/Plugin/passwordauth.pm:278 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:308 +#: ../IkiWiki/Plugin/passwordauth.pm:312 msgid "Failed to send mail" msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/passwordauth.pm:310 +#: ../IkiWiki/Plugin/passwordauth.pm:314 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:345 +#: ../IkiWiki/Plugin/passwordauth.pm:349 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:348 +#: ../IkiWiki/Plugin/passwordauth.pm:352 msgid "password reset denied" msgstr "" @@ -605,94 +606,94 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:139 +#: ../IkiWiki/Plugin/po.pm:140 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:151 +#: ../IkiWiki/Plugin/po.pm:152 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:157 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:386 +#: ../IkiWiki/Plugin/po.pm:388 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:392 ../IkiWiki/Render.pm:772 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:430 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:454 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:474 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:874 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:888 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:897 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:903 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:939 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:952 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1036 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 -#: ../IkiWiki/Plugin/po.pm:1142 +#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1145 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1101 +#: ../IkiWiki/Plugin/po.pm:1104 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1154 +#: ../IkiWiki/Plugin/po.pm:1157 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -836,44 +837,44 @@ msgstr "" msgid "no change to the file name was specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/rename.pm:69 +#: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:74 +#: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:80 +#: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:123 +#: ../IkiWiki/Plugin/rename.pm:122 #, fuzzy, perl-format msgid "rename %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Plugin/rename.pm:162 +#: ../IkiWiki/Plugin/rename.pm:161 msgid "Also rename SubPages and attachments" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:249 +#: ../IkiWiki/Plugin/rename.pm:248 msgid "Only one attachment can be renamed at a time." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:252 +#: ../IkiWiki/Plugin/rename.pm:251 msgid "Please select the attachment to rename." msgstr "" -#: ../IkiWiki/Plugin/rename.pm:349 +#: ../IkiWiki/Plugin/rename.pm:348 #, perl-format msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:573 +#: ../IkiWiki/Plugin/rename.pm:572 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -888,12 +889,12 @@ msgstr "lỗi ghi %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:184 +#: ../IkiWiki/Plugin/search.pm:188 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:221 +#: ../IkiWiki/Plugin/search.pm:225 msgid "search" msgstr "" @@ -978,21 +979,21 @@ msgstr "" msgid "parse fail at line %d: %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/template.pm:34 +#: ../IkiWiki/Plugin/tag.pm:83 +#, fuzzy, perl-format +msgid "creating tag page %s" +msgstr "đang tạo trang mới %s" + +#: ../IkiWiki/Plugin/template.pm:33 #, fuzzy msgid "missing id parameter" msgstr "mẫu thiếu tham số id" #: ../IkiWiki/Plugin/template.pm:47 -#, perl-format -msgid "template %s not found" +#, fuzzy, perl-format +msgid "%s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/template.pm:66 -#, fuzzy -msgid "failed to process:" -msgstr "mẫu không xử lý được:" - #: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "" @@ -1051,54 +1052,59 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:153 +#: ../IkiWiki/Render.pm:163 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:274 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:331 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:413 +#: ../IkiWiki/Render.pm:373 #, perl-format -msgid "removing old page %s" +msgid "querying %s for file creation and modification times.." +msgstr "" + +#: ../IkiWiki/Render.pm:435 +#, fuzzy, perl-format +msgid "removing obsolete %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:508 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:495 +#: ../IkiWiki/Render.pm:517 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:618 +#: ../IkiWiki/Render.pm:600 ../IkiWiki/Render.pm:682 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:631 +#: ../IkiWiki/Render.pm:695 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:707 +#: ../IkiWiki/Render.pm:824 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1171,62 +1177,63 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:95 +#: ../ikiwiki.in:96 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:102 +#: ../ikiwiki.in:103 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:156 +#: ../ikiwiki.in:157 msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:219 +#: ../ikiwiki.in:220 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:222 +#: ../ikiwiki.in:223 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." -#: ../IkiWiki.pm:238 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:530 +#: ../IkiWiki.pm:531 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:576 +#: ../IkiWiki.pm:577 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:605 +#: ../IkiWiki.pm:606 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1278 +#: ../IkiWiki.pm:1280 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1901 +#: ../IkiWiki.pm:1944 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2044 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "" +#: ../IkiWiki.pm:2021 +#, fuzzy, perl-format +msgid "invalid sort type %s" +msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2055 +#: ../IkiWiki.pm:2042 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2074 +#: ../IkiWiki.pm:2178 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" @@ -1251,6 +1258,13 @@ msgstr "" msgid "What is the domain name of the web server?" msgstr "" +#, fuzzy +#~ msgid "failed to process" +#~ msgstr "mẫu không xử lý được:" + +#~ msgid "getctime not implemented" +#~ msgstr "chưa thực hiện getctime" + #, fuzzy #~ msgid "failed to read %s" #~ msgstr "lỗi ghi %s: %s" @@ -1302,10 +1316,6 @@ msgstr "" #~ 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 "%s not found" -#~ msgstr "không tìm thấy mẫu %s" - #~ msgid "What's this?" #~ msgstr "Cái này là gì?" -- cgit v1.2.3 From 970373548fda77223ebbeb6aadbdbe4884b67cef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 2 May 2010 13:44:13 -0400 Subject: Add parameter to displaytime to specify that it is a pubdate, and in html5 mode, use time tag. --- IkiWiki.pm | 22 ++++++++++++++++++++-- IkiWiki/Plugin/comments.pm | 2 +- IkiWiki/Plugin/inline.pm | 12 +----------- IkiWiki/Plugin/relativedate.pm | 15 ++++++++++++--- IkiWiki/Render.pm | 2 +- debian/changelog | 7 +++++++ doc/bugs/html5_support.mdwn | 3 +++ doc/plugins/write.mdwn | 5 ++++- 8 files changed, 49 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index ed57710bb..c428de77f 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -998,10 +998,18 @@ sub abs2rel ($$) { return $ret; } -sub displaytime ($;$) { +sub displaytime ($;$$) { # Plugins can override this function to mark up the time to # display. - return ''.formattime(@_).''; + my $time=formattime($_[0], $_[1]); + if ($config{html5}) { + return ''; + } + else { + return ''.$time.''; + } } sub formattime ($;$) { @@ -1017,6 +1025,16 @@ sub formattime ($;$) { return decode_utf8(POSIX::strftime($format, localtime($time))); } +sub date_3339 ($) { + my $time=shift; + + my $lc_time=POSIX::setlocale(&POSIX::LC_TIME); + POSIX::setlocale(&POSIX::LC_TIME, "C"); + my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time)); + POSIX::setlocale(&POSIX::LC_TIME, $lc_time); + return $ret; +} + sub beautify_urlpath ($) { my $url=shift; diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index f7dc99dca..02f1d9301 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -672,7 +672,7 @@ sub previewcomment ($$$) { my $template = template("comment.tmpl"); $template->param(content => $preview); - $template->param(ctime => displaytime($time)); + $template->param(ctime => displaytime($time, undef, 1)); IkiWiki::run_hooks(pagetemplate => sub { shift->(page => $location, diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 95fe90312..2df59f414 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -358,7 +358,7 @@ sub preprocess_inline (@) { $template->param(pageurl => urlto($page, $params{destpage})); $template->param(inlinepage => $page); $template->param(title => pagetitle(basename($page))); - $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat})); + $template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}, 1)); $template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat})); $template->param(first => 1) if $page eq $list[0]; $template->param(last => 1) if $page eq $list[$#list]; @@ -500,16 +500,6 @@ sub date_822 ($) { return $ret; } -sub date_3339 ($) { - my $time=shift; - - my $lc_time=POSIX::setlocale(&POSIX::LC_TIME); - POSIX::setlocale(&POSIX::LC_TIME, "C"); - my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", gmtime($time)); - POSIX::setlocale(&POSIX::LC_TIME, $lc_time); - return $ret; -} - sub absolute_urls ($$) { # sucky sub because rss sucks my $content=shift; diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index 7e615f7f1..fe8ef0901 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -43,9 +43,10 @@ sub include_javascript ($;$) { '" type="text/javascript" charset="utf-8">'; } -sub mydisplaytime ($;$) { +sub mydisplaytime ($;$$) { my $time=shift; my $format=shift; + my $pubdate=shift; # This needs to be in a form that can be parsed by javascript. # Being fairly human readable is also nice, as it will be exposed @@ -53,8 +54,16 @@ sub mydisplaytime ($;$) { my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time))); - return ''. - IkiWiki::formattime($time, $format).''; + my $mid=' class="relativedate" title="'.$gmtime.'">'. + IkiWiki::formattime($time, $format); + + if ($config{html5}) { + return '
    ". htmllink($params{page}, $params{destpage}, $_, noimageinline => 1). @@ -87,16 +87,31 @@ sub preprocess (@) { else { # In case of misspelling, default to a page cloud - my $res = "
    \n"; + my $res; + if ($style eq 'list') { + $res = "
      \n"; + } + else { + $res = "
      \n"; + } foreach my $page (sort keys %counts) { next unless $counts{$page} > 0; my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)]; + + $res.="
    • " if $style eq 'list'; $res .= "". htmllink($params{page}, $params{destpage}, $page). "\n"; + $res.="
    • " if $style eq 'list'; + + } + if ($style eq 'list') { + $res = "
    \n"; + } + else { + $res .= "
    \n"; } - $res .= "\n"; return $res; } diff --git a/debian/changelog b/debian/changelog index 7c607b2a5..c2b0c3c23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,11 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low specify which pages to include on the calendar archive pages. (The pagespec can still also be specified on the ikiwiki-calendar command line.) + * pagestats: Class parameter can be used to override default class for + custom styling. + * pagestats: Use style=list to get a list of tags, scaled by use like + in a tag cloud. This is useful to put in a sidebar. + * Rework example blog front page. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/examples/blog/archives.mdwn b/doc/examples/blog/archives.mdwn new file mode 100644 index 000000000..14686cdfe --- /dev/null +++ b/doc/examples/blog/archives.mdwn @@ -0,0 +1,7 @@ +[[!if test="enabled(calendar)" then=""" +Browse through blog archives by year: +[[!map pages="./archives/* and !./archives/*/* and !*/Discussion"]] +""" +else=""" +Calendar based archives are not enabled. See [[posts]] for a full list of posts. +"""]] diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn index 4735dea08..0b503ba01 100644 --- a/doc/examples/blog/comments.mdwn +++ b/doc/examples/blog/comments.mdwn @@ -1,3 +1,3 @@ -This page will show all comments made to posts in my [[blog|index]]. +This page will show recent comments made to posts in the [[blog|index]]. [[!inline pages="./posts/*/Discussion or internal(./posts/*/comment_*)"]] diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index 01b714fcd..b273ba1a9 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -1,9 +1,13 @@ -[[!pagestats pages="./tags/*" among="./posts/*"]] +[[!template id=note text=""" -Welcome to my blog. +* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]] +* [[Recent_Comments|comments]] +* [[Archives]] -Have a look at the most recent posts below, or browse the tag cloud on the -right. Archives of all [[posts]] and all [[comments]] are also available. +[[!if test="enabled(calendar)" then=""" +[[!calendar pages="./posts/* and !*/Discussion"]] + +"""]] [[!inline pages="./posts/* and !*/Discussion" show="10" actions=yes rootpage="posts"]] diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn index 68f4d2734..d0e0e7be7 100644 --- a/doc/ikiwiki/directive/pagestats.mdwn +++ b/doc/ikiwiki/directive/pagestats.mdwn @@ -4,10 +4,16 @@ This directive can generate stats about how pages link to each other. It can produce either a tag cloud, or a table counting the number of links to each page. -Here's how to use it to create a [[tag]] cloud: +Here's how to use it to create a [[tag]] cloud, with tags sized based +on frequency of use: \[[!pagestats pages="tags/*"]] +Here's how to create a list of tags, sized by use as they would be in a +cloud. + + \[[!pagestats style="list" pages="tags/*"]] + And here's how to create a table of all the pages on the wiki: \[[!pagestats style="table"]] @@ -28,4 +34,7 @@ links: \[[!pagestats style="table" show="10"]] +The optional `class` parameter can be used to control the class +of the generated tag cloud `div` or page stats `table`. + [[!meta robots="noindex, follow"]] -- cgit v1.2.3 From baaa848f6c06b0b3a59677d3551e130c65e5fde7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Apr 2010 15:04:17 -0400 Subject: CSS and templates for sidebar changed to use a class, not an id. Multiple sidebars should be possible; also, I want to add a sidebar template. --- debian/changelog | 3 ++- doc/examples/blog.mdwn | 2 +- doc/examples/blog/index.mdwn | 1 - doc/examples/blog/sidebar.mdwn | 7 ------- doc/style.css | 2 +- templates/page.tmpl | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 doc/examples/blog/sidebar.mdwn (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c2b0c3c23..03361e6a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100410) UNRELEASED; urgency=low +ikiwiki (3.20100415) UNRELEASED; urgency=low [ Joey Hess ] * bzr: Fix bzr log parsing to work with bzr 2.0. (liw) @@ -36,6 +36,7 @@ ikiwiki (3.20100410) UNRELEASED; urgency=low * pagestats: Use style=list to get a list of tags, scaled by use like in a tag cloud. This is useful to put in a sidebar. * Rework example blog front page. + * CSS and templates for sidebar changed to use a class, not an id. -- Joey Hess Sun, 04 Apr 2010 12:17:11 -0400 diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index b9b57b944..33637e57d 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -14,7 +14,7 @@ Some additional configuration you might want to do: \[[!tag tags/life]] * Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all - the categories you've tagged posts with. + the categories you've tagged posts with, and other navigation links. * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud to display on the [[index]]. diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn index b273ba1a9..da95e7660 100644 --- a/doc/examples/blog/index.mdwn +++ b/doc/examples/blog/index.mdwn @@ -4,7 +4,6 @@ * [[Recent_Comments|comments]] * [[Archives]] -[[!if test="enabled(calendar)" then=""" [[!calendar pages="./posts/* and !*/Discussion"]] """]] diff --git a/doc/examples/blog/sidebar.mdwn b/doc/examples/blog/sidebar.mdwn deleted file mode 100644 index a9fac388e..000000000 --- a/doc/examples/blog/sidebar.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -Example sidebar - -* [[Blog|index]] -* [[Archive|posts]] - -Categories: -[[!map pages="./tags/* and !*/Discussion"]] diff --git a/doc/style.css b/doc/style.css index 317d4c7aa..af0fc230c 100644 --- a/doc/style.css +++ b/doc/style.css @@ -228,7 +228,7 @@ div.recentchanges { .bigPC { font-size: 115%; } .biggestPC { font-size: 130%; } -#sidebar { +.sidebar { line-height: 3ex; width: 20ex; float: right; diff --git a/templates/page.tmpl b/templates/page.tmpl index c24f88823..7e850a56b 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -92,7 +92,7 @@ -
    - $purl - $url - $nurl -
    $purl$url$nurl
    - $purl - $url - $nurl -
    $purl$url$nurl
    Months
    - + - +
    @@ -39,7 +45,7 @@ Optional comment about this change:
    - +


    Page preview: -- cgit v1.2.3 From 121e2ffc2f25bf264a68d35e80a9386995fa9e5a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 6 May 2010 23:07:08 -0400 Subject: Renamed postscan hook to indexhtml, to reflect its changed position. Probably only the search plugin uses it, so this seemed safe. --- IkiWiki/Plugin/search.pm | 2 +- IkiWiki/Plugin/skeleton.pm.example | 6 +++--- IkiWiki/Render.pm | 2 +- debian/changelog | 2 ++ doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn | 2 +- doc/plugins/po/discussion.mdwn | 2 +- doc/plugins/write.mdwn | 6 +++--- 7 files changed, 12 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 9e875c79c..b1f4747fe 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -10,7 +10,7 @@ sub import { hook(type => "getsetup", id => "search", call => \&getsetup); hook(type => "checkconfig", id => "search", call => \&checkconfig); hook(type => "pagetemplate", id => "search", call => \&pagetemplate); - hook(type => "postscan", id => "search", call => \&index); + hook(type => "indexhtml", id => "search", call => \&index); hook(type => "delete", id => "search", call => \&delete); hook(type => "cgi", id => "search", call => \&cgi); } diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index a404e24af..34713c73b 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -20,7 +20,7 @@ sub import { hook(type => "scan", id => "skeleton", call => \&scan); hook(type => "htmlize", id => "skeleton", call => \&htmlize); hook(type => "sanitize", id => "skeleton", call => \&sanitize); - hook(type => "postscan", id => "skeleton", call => \&postscan); + hook(type => "indexhtml", id => "skeleton", call => \&indexhtml); hook(type => "format", id => "skeleton", call => \&format); hook(type => "pagetemplate", id => "skeleton", call => \&pagetemplate); hook(type => "templatefile", id => "skeleton", call => \&templatefile); @@ -118,10 +118,10 @@ sub sanitize (@) { return $params{content}; } -sub postscan (@) { +sub indexhtml (@) { my %params=@_; - debug("skeleton plugin running as postscan"); + debug("skeleton plugin running as indexhtml"); } sub format (@) { diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index e5ba0079b..30e3d4199 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -62,7 +62,7 @@ sub genpage ($$) { my $page=shift; my $content=shift; - run_hooks(postscan => sub { + run_hooks(indexhtml => sub { shift->(page => $page, content => $content); }); diff --git a/debian/changelog b/debian/changelog index 77fd13826..eb67c2bde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * If you have a locally customised page.tmpl, it needs to be updated to set when BASEURL or FORCEBAREURL is set. * Gave comment and page editing forms some CSS and accessability love. + * Renamed postscan hook to indexhtml, to reflect its changed position, + and typical use. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn index be14e5126..c6e3cd4fd 100644 --- a/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn +++ b/doc/bugs/pagetitle_function_does_not_respect_meta_titles.mdwn @@ -144,7 +144,7 @@ So, looking at your meta branch: --[[Joey]] has no title, then A will display the link as "B". Now page B is modified and a title is added. Nothing updates "A". The added overhead of rebuilding every page that links to B when B is - changed (as the `postscan` hook of the po plugin does) is IMHO a killer. + changed (as the `indexhtml` hook of the po plugin does) is IMHO a killer. That could be hundreds or thousands of pages, making interactive editing way slow. This is probably the main reason I had not attempted this whole thing myself. IMHO this calls for some kind of intellegent dependency diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn index ab822e76c..27683f1ea 100644 --- a/doc/plugins/po/discussion.mdwn +++ b/doc/plugins/po/discussion.mdwn @@ -513,7 +513,7 @@ finish it at some point in the first quarter of 2009. --[[intrigeri]] >>>> >>>>> Done. --[[intrigeri]] >>> -> * I'm very fearful of the `add_depends` in `postscan`. +> * I'm very fearful of the `add_depends` in `indexhtml`. > Does this make every page depend on every page that links > to it? Won't this absurdly bloat the dependency pagespecs > and slow everything down? And since nicepagetitle is given diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 3b1d770eb..7180237a4 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -39,7 +39,7 @@ built. Now that it knows what pages it needs to build, ikiwiki runs two compile passes. First, it runs `scan` hooks, which collect metadata about the pages. Then it runs a page rendering pipeline, by calling in turn these -hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `postscan`, +hooks: `filter`, `preprocess`, `linkify`, `htmlize`, `indexhtml`, `pagetemplate`, `sanitize`, `format`. After all necessary pages are built, it calls the `change` hook. Finally, @@ -282,9 +282,9 @@ like `Makefile` that have no extension. If `hook` is passed an optional "longname" parameter, this value is used when prompting a user to choose a page type on the edit page form. -### postscan +### indexhtml - hook(type => "postscan", id => "foo", call => \&postscan); + hook(type => "indexhtml", id => "foo", call => \&indexhtml); This hook is called once the page has been converted to html (but before the generated html is put in a template). The most common use is to -- cgit v1.2.3 From ea4967f184bf0a27eaa2dc81da1084780756156a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 6 May 2010 23:20:48 -0400 Subject: inline: Call indexhtml when inlining internal pages, so their text can be indexed for searching. --- IkiWiki/Plugin/inline.pm | 7 +++++++ IkiWiki/Plugin/search.pm | 6 +++--- IkiWiki/Render.pm | 2 +- debian/changelog | 2 ++ doc/plugins/write.mdwn | 4 ++-- 5 files changed, 15 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 933e30646..715a3d652 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -476,6 +476,13 @@ sub get_inline_content ($$) { filter($page, $destpage, readfile(srcfile($file)))))); $nested--; + if (isinternal($page)) { + # make inlined text of internal pages searchable + run_hooks(indexhtml => sub { + shift->(page => $page, destpage => $page, + content => $ret); + }); + } } if ($cached_destpage ne $destpage) { diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index b1f4747fe..c578b44ab 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -10,7 +10,7 @@ sub import { hook(type => "getsetup", id => "search", call => \&getsetup); hook(type => "checkconfig", id => "search", call => \&checkconfig); hook(type => "pagetemplate", id => "search", call => \&pagetemplate); - hook(type => "indexhtml", id => "search", call => \&index); + hook(type => "indexhtml", id => "search", call => \&indexhtml); hook(type => "delete", id => "search", call => \&delete); hook(type => "cgi", id => "search", call => \&cgi); } @@ -68,7 +68,7 @@ sub pagetemplate (@) { my $scrubber; my $stemmer; -sub index (@) { +sub indexhtml (@) { my %params=@_; setupfiles(); @@ -117,7 +117,7 @@ sub index (@) { eval q{use HTML::Entities}; error $@ if $@; $doc->set_data( - "url=".urlto($params{page}, "")."\n". + "url=".urlto($params{destpage}, "")."\n". "sample=".decode_entities($sample)."\n". "caption=".decode_entities($caption)."\n". "modtime=$IkiWiki::pagemtime{$params{page}}\n". diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index 30e3d4199..b0bd8dee0 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -63,7 +63,7 @@ sub genpage ($$) { my $content=shift; run_hooks(indexhtml => sub { - shift->(page => $page, content => $content); + shift->(page => $page, destpage => $page, content => $content); }); my $templatefile; diff --git a/debian/changelog b/debian/changelog index eb67c2bde..10a4912af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * Gave comment and page editing forms some CSS and accessability love. * Renamed postscan hook to indexhtml, to reflect its changed position, and typical use. + * inline: Call indexhtml when inlining internal pages, so their + text can be indexed for searching. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 7180237a4..193005565 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -290,8 +290,8 @@ This hook is called once the page has been converted to html (but before the generated html is put in a template). The most common use is to update search indexes. Added in ikiwiki 2.54. -The function is passed named parameters "page" and "content". Its return -value is ignored. +The function is passed named parameters "page", "destpage", and "content". +Its return value is ignored. ### pagetemplate -- cgit v1.2.3 From 14826ad92792b4870108dac3c28840abe1e00428 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 6 May 2010 23:25:27 -0400 Subject: Delete hooks are passed deleted internal pages. Necessary so search can remove its indexes for internal pages. But also, it seems it was an omission not to pass the deleted pages before. --- IkiWiki/Render.pm | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index b0bd8dee0..2bf2e336b 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -801,7 +801,7 @@ sub refresh () { remove_unrendered(); if (@$del) { - run_hooks(delete => sub { shift->(@$del) }); + run_hooks(delete => sub { shift->(@$del, @$internal_del) }); } if (%rendered) { run_hooks(change => sub { shift->(keys %rendered) }); diff --git a/debian/changelog b/debian/changelog index 10a4912af..31d64e237 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low and typical use. * inline: Call indexhtml when inlining internal pages, so their text can be indexed for searching. + * Delete hooks are passed deleted internal pages. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 -- cgit v1.2.3 From db5cee6cb6b14367a4e3aa39e0ab3a1a21d25a21 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 12:55:24 -0400 Subject: reorder --- debian/NEWS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index b751f1478..8f456bced 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,11 +1,5 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low - There is a new "comment()" pagespec, that can be used to match a comment - on a page. It is recommended it be used instead of the old - method of using a pagespec such as "internal(comment_*)" to match - things that looked like comments. The old pagespec will now also match - comments that are held for moderation; likely not what you want. - There is a significant change to the page.tmpl template in this version. If you have locally modified versions of that template, you will need to update it to contain the following in the HTML : @@ -14,6 +8,12 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low + + Also, there is a new "comment()" pagespec, that can be used to match a + comment on a page. It is recommended it be used instead of the old + method of using a pagespec such as "internal(comment_*)" to match + things that looked like comments. The old pagespec will now also match + comments that are held for moderation; likely not what you want. -- Joey Hess Wed, 05 May 2010 21:47:08 -0400 -- cgit v1.2.3 From b50b549cabc8695959628bee10e015d2dcbb2e95 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 13:59:08 -0400 Subject: fix comment matching pagespecs test isinternal first, because match_glob with internal => 1 also returns non-internal pages that match. This order should also be faster. Remove test to see if pagesources is set. isinternal will not succeed if it is not. --- IkiWiki/Plugin/comments.pm | 32 +++++++++++++++++--------------- debian/changelog | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index 5d7176a8c..348d91fd8 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -904,28 +904,30 @@ sub match_comment ($$;@) { my $page = shift; my $glob = shift; - my $match=match_glob($page, "$glob/*", internal => 1, @_); - if ($match && exists $IkiWiki::pagesources{$page}) { - my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page}); - if (defined $type && $type ne "_comment") { - return IkiWiki::FailReason->new("$page is not a comment"); - } + if (! IkiWiki::isinternal($page)) { + return IkiWiki::FailReason->new("$page is not a comment"); + } + my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page}); + if (defined $type && $type ne "_comment") { + return IkiWiki::FailReason->new("$page is not a comment"); } - return $match; + + return match_glob($page, "$glob/*", internal => 1, @_); } sub match_comment_pending ($$;@) { my $page = shift; my $glob = shift; - - my $match=match_glob($page, "$glob/*", internal => 1, @_); - if ($match && $IkiWiki::pagesources{$page}) { - my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page}); - if (defined $type && $type ne "_comment_pending") { - return IkiWiki::FailReason->new("$page is not a pending comment"); - } + + if (! IkiWiki::isinternal($page)) { + return IkiWiki::FailReason->new("$page is not a pending comment"); } - return $match; + my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page}); + if (defined $type && $type ne "_comment_pending") { + return IkiWiki::FailReason->new("$page is not a pending comment"); + } + + return match_glob($page, "$glob/*", internal => 1, @_); } 1 diff --git a/debian/changelog b/debian/changelog index 7f024a84b..0851a975d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low to set when BASEURL or FORCEBAREURL is set. * comments: Comments pending moderation are now stored in the srcdir alongside accepted comments, but with a `._comment_pending` extension. - * This allows easier byhand moderation, as the "_pending" need + This allows easier byhand moderation, as the "_pending" need only be stripped off and the comment be committed to version control. * The `comment_pending()` pagespec can be used to match such unmoderated comments, which makes it easy to add a feed of them, or a counter -- cgit v1.2.3 From 378c64776856ee1313c030375a921e8acb4ff1ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 19:10:50 -0400 Subject: patch hidden field setting code Fixes http://code.google.com/p/openid-selector/issues/detail?id=11#c3 --- IkiWiki/Plugin/openid.pm | 82 ++++++++++++++++++---- debian/changelog | 2 + debian/copyright | 7 ++ doc/templates.mdwn | 4 +- templates/openid-selector.tmpl | 30 ++++++++ .../ikiwiki/openid-selector/openid-jquery.js | 8 +-- 6 files changed, 114 insertions(+), 19 deletions(-) create mode 100644 templates/openid-selector.tmpl (limited to 'debian') diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 7b1a17831..0ad8697d8 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -7,6 +7,7 @@ use strict; use IkiWiki 3.00; sub import { + hook(type => "checkconfig", id => "openid", call => \&checkconfig); hook(type => "getopt", id => "openid", call => \&getopt); hook(type => "getsetup", id => "openid", call => \&getsetup); hook(type => "auth", id => "openid", call => \&auth); @@ -14,6 +15,18 @@ sub import { call => \&formbuilder_setup, last => 1); } +sub checkconfig () { + if ($config{cgi}) { + # Intercept normal signin form, so the openid selector + # can be displayed. + require IkiWiki::CGI; + my $real_cgi_signin=\&IkiWiki::cgi_signin; + inject(name => "IkiWiki::cgi_signin", call => sub ($$) { + openid_selector($real_cgi_signin, @_); + }); + } +} + sub getopt () { eval q{use Getopt::Long}; error($@) if $@; @@ -37,6 +50,39 @@ sub getsetup () { }, } +sub openid_selector { + my $real_cgi_signin=shift; + my $q=shift; + my $session=shift; + + my $openid_url=$q->param('openid_url'); + my $openid_error; + + if (defined $q->param("action") && $q->param("action") eq "verify") { + validate($q, $session, $openid_url, sub { + $openid_error=shift; + }); + } + elsif ($q->param("do") eq "signin" || ! load_openid_module()) { + $real_cgi_signin->($q, $session); + exit; + } + + my $template=IkiWiki::template("openid-selector.tmpl"); + $template->param( + cgiurl => $config{cgiurl}, + (defined $openid_error ? (openid_error => $openid_error) : ()), + (defined $openid_url ? (openid_url => $openid_url) : ()), + # TODO only if other auth methods are available + nonopenidurl => IkiWiki::cgiurl(do => "signin"), + loginlabel => loginlabel(), + ); + + IkiWiki::printheader($session); + print IkiWiki::misctemplate("signin", $template->output); + exit; +} + sub formbuilder_setup (@) { my %params=@_; @@ -45,13 +91,7 @@ sub formbuilder_setup (@) { my $cgi=$params{cgi}; if ($form->title eq "signin") { - # Give up if module is unavailable to avoid - # needing to depend on it. - eval q{use Net::OpenID::Consumer}; - if ($@) { - debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)"); - return; - } + return unless load_openid_module(); # This avoids it displaying a redundant label for the # OpenID fieldset. @@ -59,7 +99,7 @@ sub formbuilder_setup (@) { $form->field( name => "openid_url", - label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), + label => loginlabel(), fieldset => "OpenID", size => 30, comment => ($config{openidsignup} ? " | ".gettext("Get an OpenID")."" : "") @@ -72,7 +112,10 @@ sub formbuilder_setup (@) { $form->field( name => "openid_url", validate => sub { - validate($cgi, $session, shift, $form); + validate($cgi, $session, shift, sub { + # Display error in the form. + $form->field(name => "openid_url", comment => shift); + }); }, ); # Skip all other required fields in this case. @@ -98,15 +141,14 @@ sub validate ($$$;$) { my $q=shift; my $session=shift; my $openid_url=shift; - my $form=shift; + my $errhandler=shift; my $csr=getobj($q, $session); my $claimed_identity = $csr->claimed_identity($openid_url); if (! $claimed_identity) { - if ($form) { - # Put the error in the form and fail validation. - $form->field(name => "openid_url", comment => $csr->err); + if ($errhandler) { + $errhandler->($csr->err); return 0; } else { @@ -230,4 +272,18 @@ sub getobj ($$) { ); } +sub load_openid_module { + # Give up if module is unavailable to avoid needing to depend on it. + eval q{use Net::OpenID::Consumer}; + if ($@) { + debug("unable to load Net::OpenID::Consumer, not enabling OpenID login ($@)"); + return; + } + return 1; +} + +sub loginlabel { + return gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1); +} + 1 diff --git a/debian/changelog b/debian/changelog index 31d64e237..c335030ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * inline: Call indexhtml when inlining internal pages, so their text can be indexed for searching. * Delete hooks are passed deleted internal pages. + * openid: Incorporated a fancy openid-selector signin form + (http://code.google.com/p/openid-selector/). -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/debian/copyright b/debian/copyright index d4bb1009f..b6dd3782b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -191,6 +191,13 @@ License: GPL-2+ Files: cvs.pm Copyright: © 2009 Amitai Schlair +License: BSD-C2 + +Files: underlays/javascript/ikiwiki/openid-selector/* +Copyright: © 2008-2010 andyjm, david.j.boden +License: BSD-C2 + From http://code.google.com/p/openid-selector/ + License: BSD-C2 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/doc/templates.mdwn b/doc/templates.mdwn index 8f6561fcf..22b9345ef 100644 --- a/doc/templates.mdwn +++ b/doc/templates.mdwn @@ -71,7 +71,7 @@ html out of ikiwiki and in the templates. * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`, `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`, `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`, - `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not - normally need to be customised. + `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user + interface; do not normally need to be customised. [[!meta robots="noindex, follow"]] diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl new file mode 100644 index 000000000..76c4051ed --- /dev/null +++ b/templates/openid-selector.tmpl @@ -0,0 +1,30 @@ + + + + + +
    + +
    + +
    + + +
    +

    :

    +
    +
    + + local account + +
    + + + + + +
    diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js index 3b60827b6..f39fff842 100644 --- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js +++ b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js @@ -170,11 +170,11 @@ var openid = { }, setOpenIdUrl: function (url) { - var hidden = document.getElementById(this.input_id); - if (hidden != null) { - hidden.value = url; + var hidden = $('#'+this.input_id); + if (hidden.length > 0) { + hidden.value = url; } else { - $('#openid_form').append(''); + $('#openid_form').append(''); } }, highlight: function (box_id) { -- cgit v1.2.3 From f8c2a67b3cdbce81bbb661e05411a129b07414ce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 20:14:25 -0400 Subject: pretty openid login * openid: Incorporated a fancy openid-selector signin form. (http://code.google.com/p/openid-selector/) * openid: Use "openid_identifier" as the form field, as required by OpenID Authentication v2.0 spec. --- IkiWiki/Plugin/openid.pm | 68 ++---- debian/changelog | 6 +- debian/copyright | 6 +- doc/style.css | 57 +++-- t/openiduser.t | 2 +- t/permalink.t | 2 +- templates/openid-selector.tmpl | 37 ++-- .../javascript/ikiwiki/openid-selector/jquery.js | 32 --- .../ikiwiki/openid-selector/openid-jquery.js | 240 --------------------- underlays/openid-selector/ikiwiki/openid/jquery.js | 32 +++ .../ikiwiki/openid/openid-jquery.js | 240 +++++++++++++++++++++ 11 files changed, 363 insertions(+), 359 deletions(-) delete mode 100644 underlays/javascript/ikiwiki/openid-selector/jquery.js delete mode 100644 underlays/javascript/ikiwiki/openid-selector/openid-jquery.js create mode 100644 underlays/openid-selector/ikiwiki/openid/jquery.js create mode 100644 underlays/openid-selector/ikiwiki/openid/openid-jquery.js (limited to 'debian') diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 0ad8697d8..e722c68ba 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -7,6 +7,7 @@ use strict; use IkiWiki 3.00; sub import { + add_underlay("openid-selector"); hook(type => "checkconfig", id => "openid", call => \&checkconfig); hook(type => "getopt", id => "openid", call => \&getopt); hook(type => "getsetup", id => "openid", call => \&getsetup); @@ -19,10 +20,16 @@ sub checkconfig () { if ($config{cgi}) { # Intercept normal signin form, so the openid selector # can be displayed. - require IkiWiki::CGI; - my $real_cgi_signin=\&IkiWiki::cgi_signin; + # + # When other auth hooks are registered, give the selector + # a reference to the normal signin form. + my $real_cgi_signin; + if (keys %{$IkiWiki::hooks{auth}} > 1) { + require IkiWiki::CGI; + $real_cgi_signin=\&IkiWiki::cgi_signin; + } inject(name => "IkiWiki::cgi_signin", call => sub ($$) { - openid_selector($real_cgi_signin, @_); + openid_selector($real_cgi_signin, @_); }); } } @@ -55,15 +62,21 @@ sub openid_selector { my $q=shift; my $session=shift; - my $openid_url=$q->param('openid_url'); + my $openid_url=$q->param('openid_identifier'); my $openid_error; - if (defined $q->param("action") && $q->param("action") eq "verify") { + if (! load_openid_module()) { + if ($real_cgi_signin) { + $real_cgi_signin->($q, $session); + } + error(sprintf(gettext("failed to load openid module: "), @_)); + } + elsif (defined $q->param("action") && $q->param("action") eq "verify") { validate($q, $session, $openid_url, sub { $openid_error=shift; }); } - elsif ($q->param("do") eq "signin" || ! load_openid_module()) { + elsif ($q->param("do") eq "signin" && $real_cgi_signin) { $real_cgi_signin->($q, $session); exit; } @@ -73,8 +86,7 @@ sub openid_selector { cgiurl => $config{cgiurl}, (defined $openid_error ? (openid_error => $openid_error) : ()), (defined $openid_url ? (openid_url => $openid_url) : ()), - # TODO only if other auth methods are available - nonopenidurl => IkiWiki::cgiurl(do => "signin"), + ($real_cgi_signin ? (nonopenidurl => IkiWiki::cgiurl(do => "signin")) : ()), loginlabel => loginlabel(), ); @@ -90,45 +102,9 @@ sub formbuilder_setup (@) { my $session=$params{session}; my $cgi=$params{cgi}; - if ($form->title eq "signin") { - return unless load_openid_module(); - - # This avoids it displaying a redundant label for the - # OpenID fieldset. - $form->fieldsets("OpenID"); - - $form->field( - name => "openid_url", - label => loginlabel(), - fieldset => "OpenID", - size => 30, - comment => ($config{openidsignup} ? " | ".gettext("Get an OpenID")."" : "") - ); - - # Handle submission of an OpenID as validation. - if ($form->submitted && $form->submitted eq "Login" && - defined $form->field("openid_url") && - length $form->field("openid_url")) { - $form->field( - name => "openid_url", - validate => sub { - validate($cgi, $session, shift, sub { - # Display error in the form. - $form->field(name => "openid_url", comment => shift); - }); - }, - ); - # Skip all other required fields in this case. - foreach my $field ($form->field) { - next if $field eq "openid_url"; - $form->field(name => $field, required => 0, - validate => '/.*/'); - } - } - } - elsif ($form->title eq "preferences" && + if ($form->title eq "preferences" && IkiWiki::openiduser($session->param("name"))) { - $form->field(name => "openid_url", disabled => 1, + $form->field(name => "openid_identifier", disabled => 1, label => htmllink("", "", "ikiwiki/OpenID", noimageinline => 1), value => $session->param("name"), size => 50, force => 1, diff --git a/debian/changelog b/debian/changelog index c335030ed..3f20aec1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,10 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * inline: Call indexhtml when inlining internal pages, so their text can be indexed for searching. * Delete hooks are passed deleted internal pages. - * openid: Incorporated a fancy openid-selector signin form - (http://code.google.com/p/openid-selector/). + * openid: Incorporated a fancy openid-selector signin form. + (http://code.google.com/p/openid-selector/) + * openid: Use "openid_identifier" as the form field, as required + by OpenID Authentication v2.0 spec. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/debian/copyright b/debian/copyright index b6dd3782b..7ef266151 100644 --- a/debian/copyright +++ b/debian/copyright @@ -193,11 +193,15 @@ Files: cvs.pm Copyright: © 2009 Amitai Schlair License: BSD-C2 -Files: underlays/javascript/ikiwiki/openid-selector/* +Files: underlays/openid-selector/ikiwiki/openid/* Copyright: © 2008-2010 andyjm, david.j.boden License: BSD-C2 From http://code.google.com/p/openid-selector/ +Files: underlays/openid-selector/ikiwiki/openid/jquery.js +Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer +License: GPL-2 + License: BSD-C2 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/doc/style.css b/doc/style.css index 5f77037e4..75aa28407 100644 --- a/doc/style.css +++ b/doc/style.css @@ -319,16 +319,6 @@ legend { float: left; margin: 2px 0; } -#signin_openid_url_label { - float: left; - margin-right: 1ex; -} -#signin_openid { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} label.block { display: block; } @@ -342,13 +332,6 @@ ol.form { li.form { padding-bottom: 1em; } -input#openid_url { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -440,3 +423,43 @@ li.L8 { list-style: upper-alpha; } color: white !important; background: #ff9900; } + +/* openid selector */ +#openid_choice { + display: none; +} +#openid_input_area { + clear: both; + padding: 10px; +} +#openid_btns, #openid_btns br { + clear: both; +} +#openid_highlight { + padding: 3px; + background-color: #FFFCC9; + float: left; +} +.openid_large_btn { + width: 100px; + height: 60px; + border: 1px solid #DDD; + margin: 3px; + float: left; +} +.openid_small_btn { + width: 24px; + height: 24px; + border: 1px solid #DDD; + margin: 3px; + float: left; +} +a.openid_large_btn:focus { + outline: none; +} +a.openid_large_btn:focus { + -moz-outline-style: none; +} +.openid_selected { + border: 4px solid #DDD; +} diff --git a/t/openiduser.t b/t/openiduser.t index caabbcefc..746090103 100755 --- a/t/openiduser.t +++ b/t/openiduser.t @@ -12,7 +12,7 @@ BEGIN { else { eval q{use Test::More tests => 11}; } - use_ok("IkiWiki::Plugin::openid"); + use_ok("IkiWiki"); } # Some typical examples: diff --git a/t/permalink.t b/t/permalink.t index b49b98338..adb8648b4 100755 --- a/t/permalink.t +++ b/t/permalink.t @@ -5,7 +5,7 @@ use Test::More 'no_plan'; ok(! system("mkdir t/tmp")); ok(! system("make -s ikiwiki.out")); -ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -templatedir=templates t/tinyblog t/tmp/out")); +ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out")); # This guid should never, ever change, for any reason whatsoever! my $guid="http://example.com/post/"; ok(length `grep '$guid' t/tmp/out/index.rss`); diff --git a/templates/openid-selector.tmpl b/templates/openid-selector.tmpl index 76c4051ed..393479865 100644 --- a/templates/openid-selector.tmpl +++ b/templates/openid-selector.tmpl @@ -1,30 +1,29 @@ - - + + - -
    - -
    -
    -
    -

    :

    -
    +
    + +
    +
    +
    + + local account +
    - - local account +
    + + +
    + +
    -
    - - - - - + diff --git a/underlays/javascript/ikiwiki/openid-selector/jquery.js b/underlays/javascript/ikiwiki/openid-selector/jquery.js deleted file mode 100644 index 82b98e1d7..000000000 --- a/underlays/javascript/ikiwiki/openid-selector/jquery.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - * jQuery 1.2.6 - New Wave Javascript - * - * Copyright (c) 2008 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ - * $Rev: 5685 $ - */ -(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else -return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else -return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else -selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else -this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else -return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else -jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else -jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("",""]||!tags.indexOf("",""]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
    "]||!tags.indexOf("",""]||(!tags.indexOf("",""]||!tags.indexOf("",""]||jQuery.browser.msie&&[1,"div
    ","
    "]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf(""&&tags.indexOf("=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else -ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&¬xml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&¬xml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else -while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return im[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else -for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("
    ").append(res.responseText.replace(//g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else -xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else -jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else -for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else -s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else -e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;ithis.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); \ No newline at end of file diff --git a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js b/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js deleted file mode 100644 index f39fff842..000000000 --- a/underlays/javascript/ikiwiki/openid-selector/openid-jquery.js +++ /dev/null @@ -1,240 +0,0 @@ -/* -Simple OpenID Plugin -http://code.google.com/p/openid-selector/ - -This code is licenced under the New BSD License. -*/ - -var providers_large = { - google: { - name: 'Google', - url: 'https://www.google.com/accounts/o8/id' - }, - yahoo: { - name: 'Yahoo', - url: 'http://me.yahoo.com/' - }, - aol: { - name: 'AOL', - label: 'Enter your AOL screenname.', - url: 'http://openid.aol.com/{username}' - }, - verisign: { - name: 'Verisign', - label: 'Your Verisign username', - url: 'http://{username}.pip.verisignlabs.com/' - }, - openid: { - name: 'OpenID', - label: 'Enter your OpenID.', - url: null - } -}; -var providers_small = { - myopenid: { - name: 'MyOpenID', - label: 'Enter your MyOpenID username.', - url: 'http://{username}.myopenid.com/' - }, - livejournal: { - name: 'LiveJournal', - label: 'Enter your Livejournal username.', - url: 'http://{username}.livejournal.com/' - }, - flickr: { - name: 'Flickr', - label: 'Enter your Flickr username.', - url: 'http://flickr.com/{username}/' - }, - technorati: { - name: 'Technorati', - label: 'Enter your Technorati username.', - url: 'http://technorati.com/people/technorati/{username}/' - }, - wordpress: { - name: 'Wordpress', - label: 'Enter your Wordpress.com username.', - url: 'http://{username}.wordpress.com/' - }, - blogger: { - name: 'Blogger', - label: 'Your Blogger account', - url: 'http://{username}.blogspot.com/' - }, - vidoop: { - name: 'Vidoop', - label: 'Your Vidoop username', - url: 'http://{username}.myvidoop.com/' - }, - claimid: { - name: 'ClaimID', - label: 'Your ClaimID username', - url: 'http://claimid.com/{username}' - } -}; -var providers = $.extend({}, providers_large, providers_small); - -var openid = { - - demo: false, - ajaxHandler: null, - cookie_expires: 6*30, // 6 months. - cookie_name: 'openid_provider', - cookie_path: '/', - - img_path: 'images/', - - input_id: null, - provider_url: null, - provider_id: null, - - init: function(input_id) { - - var openid_btns = $('#openid_btns'); - - this.input_id = input_id; - - $('#openid_choice').show(); - $('#openid_input_area').empty(); - - // add box for each provider - for (id in providers_large) { - - openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif')); - } - if (providers_small) { - openid_btns.append('
    '); - - for (id in providers_small) { - - openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico')); - } - } - - $('#openid_form').submit(this.submit); - - var box_id = this.readCookie(); - if (box_id) { - this.signin(box_id, true); - } - }, - getBoxHTML: function(provider, box_size, image_ext) { - - var box_id = provider["name"].toLowerCase(); - return ''; - - }, - /* Provider image click */ - signin: function(box_id, onload) { - - var provider = providers[box_id]; - if (! provider) { - return; - } - - this.highlight(box_id); - this.setCookie(box_id); - - this.provider_id = box_id; - this.provider_url = provider['url']; - - // prompt user for input? - if (provider['label']) { - this.useInputBox(provider); - } else { - $('#openid_input_area').empty(); - if (! onload) { - $('#openid_form').submit(); - } - } - }, - /* Sign-in button click */ - submit: function() { - - var url = openid.provider_url; - if (url) { - url = url.replace('{username}', $('#openid_username').val()); - openid.setOpenIdUrl(url); - } - if(openid.ajaxHandler) { - openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value); - return false; - } - if(openid.demo) { - alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value); - return false; - } - return true; - }, - setOpenIdUrl: function (url) { - - var hidden = $('#'+this.input_id); - if (hidden.length > 0) { - hidden.value = url; - } else { - $('#openid_form').append(''); - } - }, - highlight: function (box_id) { - - // remove previous highlight. - var highlight = $('#openid_highlight'); - if (highlight) { - highlight.replaceWith($('#openid_highlight a')[0]); - } - // add new highlight. - $('.'+box_id).wrap('
    '); - }, - setCookie: function (value) { - - var date = new Date(); - date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000)); - var expires = "; expires="+date.toGMTString(); - - document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path; - }, - readCookie: function () { - var nameEQ = this.cookie_name + "="; - var ca = document.cookie.split(';'); - for(var i=0;i < ca.length;i++) { - var c = ca[i]; - while (c.charAt(0)==' ') c = c.substring(1,c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); - } - return null; - }, - useInputBox: function (provider) { - - var input_area = $('#openid_input_area'); - - var html = ''; - var id = 'openid_username'; - var value = ''; - var label = provider['label']; - var style = ''; - - if (label) { - html = '

    ' + label + '

    '; - } - if (provider['name'] == 'OpenID') { - id = this.input_id; - value = 'http://'; - style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;'; - } - html += '' + - ''; - - input_area.empty(); - input_area.append(html); - - $('#'+id).focus(); - }, - setDemoMode: function (demoMode) { - this.demo = demoMode; - }, - setAjaxHandler: function (ajaxFunction) { - this.ajaxHandler = ajaxFunction; - } -}; diff --git a/underlays/openid-selector/ikiwiki/openid/jquery.js b/underlays/openid-selector/ikiwiki/openid/jquery.js new file mode 100644 index 000000000..82b98e1d7 --- /dev/null +++ b/underlays/openid-selector/ikiwiki/openid/jquery.js @@ -0,0 +1,32 @@ +/* + * jQuery 1.2.6 - New Wave Javascript + * + * Copyright (c) 2008 John Resig (jquery.com) + * Dual licensed under the MIT (MIT-LICENSE.txt) + * and GPL (GPL-LICENSE.txt) licenses. + * + * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $ + * $Rev: 5685 $ + */ +(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else +return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else +return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else +selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else +this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else +return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else +jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else +jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("",""]||!tags.indexOf("",""]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
    "]||!tags.indexOf("",""]||(!tags.indexOf("",""]||!tags.indexOf("",""]||jQuery.browser.msie&&[1,"div
    ","
    "]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf(""&&tags.indexOf("=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else +ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&¬xml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&¬xml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&¬xml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else +while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return im[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else +for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("
    ").append(res.responseText.replace(//g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else +xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else +jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else +for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else +s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else +e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;ithis.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})(); \ No newline at end of file diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js new file mode 100644 index 000000000..f39fff842 --- /dev/null +++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js @@ -0,0 +1,240 @@ +/* +Simple OpenID Plugin +http://code.google.com/p/openid-selector/ + +This code is licenced under the New BSD License. +*/ + +var providers_large = { + google: { + name: 'Google', + url: 'https://www.google.com/accounts/o8/id' + }, + yahoo: { + name: 'Yahoo', + url: 'http://me.yahoo.com/' + }, + aol: { + name: 'AOL', + label: 'Enter your AOL screenname.', + url: 'http://openid.aol.com/{username}' + }, + verisign: { + name: 'Verisign', + label: 'Your Verisign username', + url: 'http://{username}.pip.verisignlabs.com/' + }, + openid: { + name: 'OpenID', + label: 'Enter your OpenID.', + url: null + } +}; +var providers_small = { + myopenid: { + name: 'MyOpenID', + label: 'Enter your MyOpenID username.', + url: 'http://{username}.myopenid.com/' + }, + livejournal: { + name: 'LiveJournal', + label: 'Enter your Livejournal username.', + url: 'http://{username}.livejournal.com/' + }, + flickr: { + name: 'Flickr', + label: 'Enter your Flickr username.', + url: 'http://flickr.com/{username}/' + }, + technorati: { + name: 'Technorati', + label: 'Enter your Technorati username.', + url: 'http://technorati.com/people/technorati/{username}/' + }, + wordpress: { + name: 'Wordpress', + label: 'Enter your Wordpress.com username.', + url: 'http://{username}.wordpress.com/' + }, + blogger: { + name: 'Blogger', + label: 'Your Blogger account', + url: 'http://{username}.blogspot.com/' + }, + vidoop: { + name: 'Vidoop', + label: 'Your Vidoop username', + url: 'http://{username}.myvidoop.com/' + }, + claimid: { + name: 'ClaimID', + label: 'Your ClaimID username', + url: 'http://claimid.com/{username}' + } +}; +var providers = $.extend({}, providers_large, providers_small); + +var openid = { + + demo: false, + ajaxHandler: null, + cookie_expires: 6*30, // 6 months. + cookie_name: 'openid_provider', + cookie_path: '/', + + img_path: 'images/', + + input_id: null, + provider_url: null, + provider_id: null, + + init: function(input_id) { + + var openid_btns = $('#openid_btns'); + + this.input_id = input_id; + + $('#openid_choice').show(); + $('#openid_input_area').empty(); + + // add box for each provider + for (id in providers_large) { + + openid_btns.append(this.getBoxHTML(providers_large[id], 'large', '.gif')); + } + if (providers_small) { + openid_btns.append('
    '); + + for (id in providers_small) { + + openid_btns.append(this.getBoxHTML(providers_small[id], 'small', '.ico')); + } + } + + $('#openid_form').submit(this.submit); + + var box_id = this.readCookie(); + if (box_id) { + this.signin(box_id, true); + } + }, + getBoxHTML: function(provider, box_size, image_ext) { + + var box_id = provider["name"].toLowerCase(); + return ''; + + }, + /* Provider image click */ + signin: function(box_id, onload) { + + var provider = providers[box_id]; + if (! provider) { + return; + } + + this.highlight(box_id); + this.setCookie(box_id); + + this.provider_id = box_id; + this.provider_url = provider['url']; + + // prompt user for input? + if (provider['label']) { + this.useInputBox(provider); + } else { + $('#openid_input_area').empty(); + if (! onload) { + $('#openid_form').submit(); + } + } + }, + /* Sign-in button click */ + submit: function() { + + var url = openid.provider_url; + if (url) { + url = url.replace('{username}', $('#openid_username').val()); + openid.setOpenIdUrl(url); + } + if(openid.ajaxHandler) { + openid.ajaxHandler(openid.provider_id, document.getElementById(openid.input_id).value); + return false; + } + if(openid.demo) { + alert("In client demo mode. Normally would have submitted OpenID:\r\n" + document.getElementById(openid.input_id).value); + return false; + } + return true; + }, + setOpenIdUrl: function (url) { + + var hidden = $('#'+this.input_id); + if (hidden.length > 0) { + hidden.value = url; + } else { + $('#openid_form').append(''); + } + }, + highlight: function (box_id) { + + // remove previous highlight. + var highlight = $('#openid_highlight'); + if (highlight) { + highlight.replaceWith($('#openid_highlight a')[0]); + } + // add new highlight. + $('.'+box_id).wrap('
    '); + }, + setCookie: function (value) { + + var date = new Date(); + date.setTime(date.getTime()+(this.cookie_expires*24*60*60*1000)); + var expires = "; expires="+date.toGMTString(); + + document.cookie = this.cookie_name+"="+value+expires+"; path=" + this.cookie_path; + }, + readCookie: function () { + var nameEQ = this.cookie_name + "="; + var ca = document.cookie.split(';'); + for(var i=0;i < ca.length;i++) { + var c = ca[i]; + while (c.charAt(0)==' ') c = c.substring(1,c.length); + if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); + } + return null; + }, + useInputBox: function (provider) { + + var input_area = $('#openid_input_area'); + + var html = ''; + var id = 'openid_username'; + var value = ''; + var label = provider['label']; + var style = ''; + + if (label) { + html = '

    ' + label + '

    '; + } + if (provider['name'] == 'OpenID') { + id = this.input_id; + value = 'http://'; + style = 'background:#FFF url('+this.img_path+'openid-inputicon.gif) no-repeat scroll 0 50%; padding-left:18px;'; + } + html += '' + + ''; + + input_area.empty(); + input_area.append(html); + + $('#'+id).focus(); + }, + setDemoMode: function (demoMode) { + this.demo = demoMode; + }, + setAjaxHandler: function (ajaxFunction) { + this.ajaxHandler = ajaxFunction; + } +}; -- cgit v1.2.3 From 8f6cfbfade6018732495addce11f6d5e93e0b723 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 21:33:27 -0400 Subject: Removed the openidsignup option. --- IkiWiki/Plugin/openid.pm | 15 --------------- debian/changelog | 1 + doc/plugins/openid.mdwn | 12 ------------ 3 files changed, 1 insertion(+), 27 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 7e4d0844a..36002371a 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -9,7 +9,6 @@ use IkiWiki 3.00; sub import { add_underlay("openid-selector"); hook(type => "checkconfig", id => "openid", call => \&checkconfig); - hook(type => "getopt", id => "openid", call => \&getopt); hook(type => "getsetup", id => "openid", call => \&getsetup); hook(type => "auth", id => "openid", call => \&auth); hook(type => "formbuilder_setup", id => "openid", @@ -34,13 +33,6 @@ sub checkconfig () { } } -sub getopt () { - eval q{use Getopt::Long}; - error($@) if $@; - Getopt::Long::Configure('pass_through'); - GetOptions("openidsignup=s" => \$config{openidsignup}); -} - sub getsetup () { return plugin => { @@ -48,13 +40,6 @@ sub getsetup () { rebuild => 0, section => "auth", }, - openidsignup => { - type => "string", - example => "http://myopenid.com/", - description => "an url where users can signup for an OpenID", - safe => 1, - rebuild => 0, - }, } sub openid_selector { diff --git a/debian/changelog b/debian/changelog index 3f20aec1a..595b8a2b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low (http://code.google.com/p/openid-selector/) * openid: Use "openid_identifier" as the form field, as required by OpenID Authentication v2.0 spec. + * Removed the openidsignup option. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/doc/plugins/openid.mdwn b/doc/plugins/openid.mdwn index cd05bb1ad..7da2f8575 100644 --- a/doc/plugins/openid.mdwn +++ b/doc/plugins/openid.mdwn @@ -11,17 +11,5 @@ The [[!cpan LWPx::ParanoidAgent]] perl module is used if available, for added security. Finally, the [[!cpan Crypt::SSLeay]] perl module is needed to support users entering "https" OpenID urls. -This plugin has a configuration option. You can set `--openidsignup` -to the url of a third-party site where users can sign up for an OpenID. If -it's set, the signin page will link to that site. - -This plugin supports the -[myopenid.com affiliate program](http://myopenid.com/affiliate), -which can be used to help users sign up for an OpenID and log into your -site in a single, unified process. When you create the affiliate, specify a -login url like `http://example.com/ikiwiki.cgi?do=continue`. Once the -affiliate is created, set `openidsignup` to point to the affiliate's signup -url. - This plugin is enabled by default, but can be turned off if you want to only use some other form of authentication, such as [[passwordauth]]. -- cgit v1.2.3 From bb7877707ef730c7fdab01509ac6a9cc9eb252d1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 21:35:47 -0400 Subject: mention style.css changes --- debian/NEWS | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 4e0c7810b..e65a15457 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -9,6 +9,11 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low + There have also been some changes to the style.css in this version, + particularly to support the new openid selector. If you have a modified + version, of style.css, updating it (or moving it to local.css) is + recommended. + -- Joey Hess Wed, 05 May 2010 21:47:08 -0400 ikiwiki (3.20100427) unstable; urgency=low -- cgit v1.2.3 From e2a76696dd9d42c6ed66b831bfd441baadfb4893 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 7 May 2010 21:39:42 -0400 Subject: advice --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 595b8a2b1..050613706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,10 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low (http://code.google.com/p/openid-selector/) * openid: Use "openid_identifier" as the form field, as required by OpenID Authentication v2.0 spec. - * Removed the openidsignup option. + * Removed the openidsignup option. Instead, my recommendation is to + leave passwordauth enabled and let people who don't have an openid use it. + The openid selector form avoids the UI annoyance of having both openid + and passwordauth on one form. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 -- cgit v1.2.3 From 0f778849c6df237f2219de6e1fa237cf2bc9955f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 May 2010 12:45:21 -0400 Subject: calendar: Allow negative month to be specified. -1 is last month, etc. (And also negaitve years.) --- IkiWiki/Plugin/calendar.pm | 27 +++++++++++++++++++++++---- debian/changelog | 2 ++ doc/ikiwiki/directive/calendar.mdwn | 6 +++--- doc/plugins/calendar/discussion.mdwn | 11 ++++++++++- 4 files changed, 38 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index aeb5f3d29..02f41070e 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -386,8 +386,19 @@ sub preprocess (@) { $params{year} = $thisyear unless defined $params{year}; $params{month} = $thismonth unless defined $params{month}; + my $relativemonth=0; + if ($params{month} < 1) { + $params{month}=$thismonth+$params{month}; + $relativemonth=1; + } + my $relativeyear=0; + if ($params{year} < 1) { + $params{year}=$thisyear+$params{year}; + $relativeyear=1; + } + $params{month} = sprintf("%02d", $params{month}); - + if ($params{type} eq 'month' && $params{year} == $thisyear && $params{month} == $thismonth) { # calendar for current month, updates next midnight @@ -404,8 +415,11 @@ sub preprocess (@) { $pagestate{$params{destpage}}{calendar}{nextchange}= timelocal(0, 0, 0, 1, $params{month}-1, $params{year}); } - elsif ($params{type} eq 'year' && $params{year} == $thisyear) { - # calendar for current year, updates 1st of next month + elsif (($params{type} eq 'year' && $params{year} == $thisyear) || + $relativemonth) { + # Calendar for current year updates 1st of next month. + # Any calendar relative to the current month also updates + # then. if ($thismonth < 12) { $pagestate{$params{destpage}}{calendar}{nextchange}= timelocal(0, 0, 0, 1, $thismonth+1-1, $params{year}); @@ -415,6 +429,12 @@ sub preprocess (@) { timelocal(0, 0, 0, 1, 1-1, $params{year}+1); } } + elsif ($relativeyear) { + # Any calendar relative to the current year updates 1st + # of next year. + $pagestate{$params{destpage}}{calendar}{nextchange}= + timelocal(0, 0, 0, 1, 1-1, $thisyear+1); + } elsif ($params{type} eq 'year' && $params{year} > $thisyear) { # calendar for upcoming year, updates 1st of that year $pagestate{$params{destpage}}{calendar}{nextchange}= @@ -426,7 +446,6 @@ sub preprocess (@) { delete $pagestate{$params{destpage}}{calendar}; } - # Calculate month names for next month, and previous months my $calendar=""; if ($params{type} eq 'month') { $calendar=format_month(%params); diff --git a/debian/changelog b/debian/changelog index f74e9929f..795f02822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low leave passwordauth enabled and let people who don't have an openid use it. The openid selector form avoids the UI annoyance of having both openid and passwordauth on one form. + * calendar: Allow negative month to be specified. -1 is last month, etc. + (And also negaitve years.) -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn index 198da9d51..e9216e11f 100644 --- a/doc/ikiwiki/directive/calendar.mdwn +++ b/doc/ikiwiki/directive/calendar.mdwn @@ -47,14 +47,14 @@ An example crontab: "2010". These pages can be automatically created using the `ikiwiki-calendar` program. * `year` - The year for which the calendar is requested. Defaults to the - current year. + current year. Can also use -1 to refer to last year, and so on. * `month` - The numeric month for which the calendar is requested, in the range 1..12. Used only for the month view calendar, and defaults to the - current month. + current month. Can also use -1 to refer to last month, and so on. * `week_start_day` - A number, in the range 0..6, which represents the day of the week that the month calendar starts with. 0 is Sunday, 1 is Monday, and so on. Defaults to 0, which is Sunday. -* `months_per_row` - In the annual calendar, number of months to place in +* `months_per_row` - In the year calendar, number of months to place in each row. Defaults to 3. [[!meta robots="noindex, follow"]] diff --git a/doc/plugins/calendar/discussion.mdwn b/doc/plugins/calendar/discussion.mdwn index 9d57b7a1e..bb76a9d8b 100644 --- a/doc/plugins/calendar/discussion.mdwn +++ b/doc/plugins/calendar/discussion.mdwn @@ -1,6 +1,15 @@ It would be nice if the "month" type calendar could collect all of the matching pages on a given date in some inline type way. --[[DavidBremner]] +> I agree, but I have not come up with good html to display them. Seems +> it might need some sort of popup. + Is it possible to get the calendar to link to pages based not on their timestamp (as I understand that it does now, or have I misunderstood this?) and instead on for example their location in a directory hierarchy. That way the calendar could be used as a planning / timeline device which I think would be great. --[[Alexander]] -I would like the ability to specify relative previous months. This way I could have a sidebar with the last three months by specifying no month, then 'month="-1"' and 'month="-2"'. Negative numbers for the month would otherwise be invalid, so this shouldn't produce any conflicts with expected behavior. (Right?) -- [[StevenBlack]] +I would like the ability to specify relative previous months. This way I +could have a sidebar with the last three months by specifying no month, +then 'month="-1"' and 'month="-2"'. Negative numbers for the month would +otherwise be invalid, so this shouldn't produce any conflicts with expected +behavior. (Right?) -- [[StevenBlack]] + +> Great idea! Just implemented that and also relative years. --[[Joey]] -- cgit v1.2.3 From d0c17a4a46b48d8513c0167271f2f2eb8b9bc081 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 May 2010 13:51:05 -0400 Subject: calendar: Display year name in title of month calendar. Also, fix relative month calculations. --- IkiWiki/Plugin/calendar.pm | 21 +++++++++++++-------- debian/changelog | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index d43320cac..0bf933dcd 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -132,12 +132,12 @@ sub format_month (@) { $archivebase = $params{archivebase} if defined $params{archivebase}; # Calculate URL's for monthly archives. - my ($url, $purl, $nurl)=("$monthname",'',''); + my ($url, $purl, $nurl)=("$monthname $params{year}",'',''); if (exists $pagesources{"$archivebase/$params{year}/$params{month}"}) { $url = htmllink($params{page}, $params{destpage}, "$archivebase/$params{year}/".$params{month}, noimageinline => 1, - linktext => $monthname, + linktext => "$monthname $params{year}", title => $monthname); } add_depends($params{page}, "$archivebase/$params{year}/$params{month}", @@ -396,15 +396,20 @@ sub preprocess (@) { $params{year} = $thisyear unless defined $params{year}; $params{month} = $thismonth unless defined $params{month}; - my $relativemonth=0; - if ($params{month} < 1) { - $params{month}=$thismonth+$params{month}; - $relativemonth=1; - } my $relativeyear=0; if ($params{year} < 1) { - $params{year}=$thisyear+$params{year}; $relativeyear=1; + $params{year}=$thisyear+$params{year}; + } + my $relativemonth=0; + if ($params{month} < 1) { + $relativemonth=1; + my $monthoff=$params{month}; + $params{month}=($thismonth+$monthoff) % 12; + $params{month}=12 if $params{month}==0; + my $yearoff=POSIX::ceil(($thismonth-$params{month}) / -12) + - int($monthoff / 12); + $params{year}-=$yearoff; } $params{month} = sprintf("%02d", $params{month}); diff --git a/debian/changelog b/debian/changelog index 795f02822..f47793477 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low and passwordauth on one form. * calendar: Allow negative month to be specified. -1 is last month, etc. (And also negaitve years.) + * calendar: Display year name in title of month calendar. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 -- cgit v1.2.3 From f735e2d1b3ced6dc1e246e61be0256302ff5eb14 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 May 2010 14:03:20 -0400 Subject: fixups --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f47793477..a8527521f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,8 +27,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low The openid selector form avoids the UI annoyance of having both openid and passwordauth on one form. * calendar: Allow negative month to be specified. -1 is last month, etc. - (And also negaitve years.) - * calendar: Display year name in title of month calendar. + (And also negative years.) + * calendar: Display year in title of month calendar. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 -- cgit v1.2.3 From 10a1c0feca18a0615358539771b5a58aacb72c0e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 May 2010 16:04:18 -0400 Subject: update --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a8527521f..730cae1e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low text can be indexed for searching. * Delete hooks are passed deleted internal pages. * openid: Incorporated a fancy openid-selector signin form. - (http://code.google.com/p/openid-selector/) + (Based on http://code.google.com/p/openid-selector/) * openid: Use "openid_identifier" as the form field, as required by OpenID Authentication v2.0 spec. * Removed the openidsignup option. Instead, my recommendation is to -- cgit v1.2.3 From bc0aa4d40e10238f6b83e285869caab3dfeca395 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 8 May 2010 19:45:02 -0400 Subject: Use xhtml friendly pubdate setting. --- IkiWiki.pm | 2 +- IkiWiki/Plugin/relativedate.pm | 2 +- debian/changelog | 1 + ...lement__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index d76b5edb4..33e4e1d1f 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1004,7 +1004,7 @@ sub displaytime ($;$$) { my $time=formattime($_[0], $_[1]); if ($config{html5}) { return ''; } else { diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index fe8ef0901..179f9238c 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -59,7 +59,7 @@ sub mydisplaytime ($;$$) { if ($config{html5}) { return ''; } else { return ''; diff --git a/debian/changelog b/debian/changelog index 730cae1e2..e6c5e42ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * calendar: Allow negative month to be specified. -1 is last month, etc. (And also negative years.) * calendar: Display year in title of month calendar. + * Use xhtml friendly pubdate setting. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 diff --git a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn index 2dd0d945f..1f6bdb333 100644 --- a/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn +++ b/doc/bugs/html5_time_element__39__s_pubdate_wrong_when_using_xhtml5___34__mode__34__.mdwn @@ -6,6 +6,9 @@ XML error: The pubdate REQUIRES a date, so e.g. `pubdate="2009-03-24T18:02:14Z"` +> No, `pubdate="pubdate"`. It's a boolean attribute. applied && [[done]] +> --[[Joey]] + Otherwise the XML parser chokes. -- cgit v1.2.3 From 8ff761afa24febdb280c672b3b31d6145990f050 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 May 2010 14:21:45 -0400 Subject: remove, rename: Add guards against XSRF attacks. --- IkiWiki/Plugin/remove.pm | 4 ++++ IkiWiki/Plugin/rename.pm | 4 ++++ debian/changelog | 1 + 3 files changed, 9 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index a46294e78..d23b2cc10 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -107,6 +107,8 @@ sub confirmation_form ($$) { fields => [qw{do page}], ); + $f->field(name => "sid", type => "hidden", value => $session->id, + force => 1); $f->field(name => "do", type => "hidden", value => "remove", force => 1); return $f, ["Remove", "Cancel"]; @@ -188,6 +190,8 @@ sub sessioncgi ($$) { postremove($session); } elsif ($form->submitted eq 'Remove' && $form->validate) { + IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); + my @pages=$form->field("page"); # Validate removal by checking that the page exists, diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index 537e91317..0da90a538 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -131,6 +131,8 @@ sub rename_form ($$$) { ); $f->field(name => "do", type => "hidden", value => "rename", force => 1); + $f->field(name => "sid", type => "hidden", value => $session->id, + force => 1); $f->field(name => "page", type => "hidden", value => $page, force => 1); $f->field(name => "new_name", value => pagetitle($page, 1), size => 60); if (!$q->param("attachment")) { @@ -286,6 +288,8 @@ sub sessioncgi ($$) { postrename($session); } elsif ($form->submitted eq 'Rename' && $form->validate) { + IkiWiki::checksessionexpiry($q, $session, $q->param('sid')); + # Queue of rename actions to perfom. my @torename; diff --git a/debian/changelog b/debian/changelog index e6c5e42ae..a09c8e228 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low (And also negative years.) * calendar: Display year in title of month calendar. * Use xhtml friendly pubdate setting. + * remove, rename: Add guards against XSRF attacks. -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 -- cgit v1.2.3 From 8c05fcde9ee5ae9da5de71e0c27d59aca106c877 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 May 2010 21:09:38 -0400 Subject: relase finalised --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a09c8e228..50b1fddff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100505) UNRELEASED; urgency=low +ikiwiki (3.20100515) unstable; urgency=low * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise a single template, page.tmpl. @@ -32,7 +32,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low * Use xhtml friendly pubdate setting. * remove, rename: Add guards against XSRF attacks. - -- Joey Hess Wed, 05 May 2010 18:07:29 -0400 + -- Joey Hess Sat, 15 May 2010 21:00:45 -0400 ikiwiki (3.20100504) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index b2b5af3dc..09f07c6ce 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100505 +Version: 3.20100515 Release: 1%{?dist} Summary: A wiki compiler -- cgit v1.2.3 From 083e491262b337296e28de2c9b2a53401ec780ef Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 May 2010 22:21:17 -0400 Subject: add missing closing tmpl_if --- debian/NEWS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 68f0a207b..e8408edff 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -ikiwiki (3.20100505) UNRELEASED; urgency=low +ikiwiki (3.20100515) unstable; urgency=low There is a significant change to the page.tmpl template in this version. If you have locally modified versions of that template, you will need @@ -8,6 +8,7 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low + Also, there is a new "comment()" pagespec, that can be used to match a comment on a page. It is recommended it be used instead of the old -- cgit v1.2.3 From e2ad879932446ee25b61fa3b30f5233df59dad59 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 May 2010 22:32:24 -0400 Subject: reword --- debian/NEWS | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index e8408edff..0a00ea6dd 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,8 +1,9 @@ ikiwiki (3.20100515) unstable; urgency=low - There is a significant change to the page.tmpl template in this version. - If you have locally modified versions of that template, you will need - to update it to contain the following in the HTML : + There is a significant change to the page.tmpl template in this version, + (and several less significant changes). If you have a locally modified + version of that template, you will need to update it at least to + contain the following in the HTML : -- cgit v1.2.3 From e02c1bcf3df6b269ed7d5a29a97ea7f8f9464a3d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 May 2010 22:41:37 -0400 Subject: document needing to wrap footer in dynamic test --- debian/NEWS | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/NEWS b/debian/NEWS index 0a00ea6dd..f73ac9c3d 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,17 +1,18 @@ ikiwiki (3.20100515) unstable; urgency=low - There is a significant change to the page.tmpl template in this version, - (and several less significant changes). If you have a locally modified - version of that template, you will need to update it at least to - contain the following in the HTML : + There are two significant changes to the page.tmpl template in this version. + If you have a locally modified version of that template, you will need to + update it at least to contain the following in the HTML : + + Also, the footer should be wrapped in ... - Also, there is a new "comment()" pagespec, that can be used to match a + There is a new "comment()" pagespec, that can be used to match a comment on a page. It is recommended it be used instead of the old method of using a pagespec such as "internal(comment_*)" to match things that looked like comments. The old pagespec will now also match -- cgit v1.2.3 From ffcd2da8274b44663207bb866007ee3bc8d8a15f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 May 2010 00:03:35 -0400 Subject: page.tmpl: Accidentially broke po plugin's otherlanguages list styling when modifying for html5; now fixed. --- debian/changelog | 7 +++++++ templates/page.tmpl | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 50b1fddff..918970a3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20100516) UNRELEASED; urgency=low + + * page.tmpl: Accidentially broke po plugin's otherlanguages list styling + when modifying for html5; now fixed. + + -- Joey Hess Sun, 16 May 2010 00:03:06 -0400 + ikiwiki (3.20100515) unstable; urgency=low * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise diff --git a/templates/page.tmpl b/templates/page.tmpl index f7944e40e..235b693fe 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -88,7 +88,7 @@ -
    -- cgit v1.2.3 From c30f22fc83b78b8e99a220b46aa7717bbb9795b0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Jul 2010 16:59:11 -0400 Subject: releasing version 3.20100722 --- debian/changelog | 6 +- ikiwiki.spec | 2 +- po/bg.po | 210 ++++++++++++++-------------- po/cs.po | 211 ++++++++++++++-------------- po/da.po | 211 ++++++++++++++-------------- po/de.po | 211 ++++++++++++++-------------- po/es.po | 211 ++++++++++++++-------------- po/fr.po | 414 +++++++++++++++++++++++++++++++------------------------ po/gu.po | 202 ++++++++++++++------------- po/ikiwiki.pot | 130 ++++++++--------- po/it.po | 203 ++++++++++++++------------- po/pl.po | 202 ++++++++++++++------------- po/sv.po | 202 ++++++++++++++------------- po/tr.po | 202 ++++++++++++++------------- po/vi.po | 202 ++++++++++++++------------- 15 files changed, 1464 insertions(+), 1355 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8013e5cdd..209b170eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100705) UNRELEASED; urgency=low +ikiwiki (3.20100722) unstable; urgency=low * img: Add a margin around images displayed by this directive. * comments: Added commentmoderation directive for easy linking to the @@ -20,11 +20,11 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low the caching problem that was added to work around). Closes: #588623 * Made much more robust in cases where multiple source files produce conflicting files/directories in the destdir. - * Updated French program translation from Philippe Batailler. Closes: #589423 + * Updated French translation from Philippe Batailler. Closes: #589423 * po: Fix selflink display on tranlsated pages. (intrigeri) * Avoid showing 'Add a comment' link at the bottom of the comment post form. - -- Joey Hess Mon, 05 Jul 2010 13:59:42 -0400 + -- Joey Hess Thu, 22 Jul 2010 16:49:05 -0400 ikiwiki (3.20100704) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 7c2c94376..43065b7f5 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100704 +Version: 3.20100722 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index 49dddee2b..c9fd77b8f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -52,7 +52,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Грешка" @@ -81,51 +81,51 @@ msgstr "съобщения" msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -134,7 +134,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "готово" @@ -167,19 +167,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -194,77 +194,81 @@ msgstr "" msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, fuzzy, perl-format msgid "commenting on %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -274,7 +278,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -309,9 +313,9 @@ msgstr "" msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "промяна на %s" @@ -326,12 +330,12 @@ msgstr "шаблонът „%s” не е намерен" msgid "match not specified" msgstr "не е указан файл на обвивката" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -345,12 +349,12 @@ msgstr "" msgid "fortune failed" msgstr "грешшка в приставката „fortune”" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -365,22 +369,22 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -391,7 +395,7 @@ msgstr "При използване на приеставката „search” msgid "failed to run graphviz" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "" @@ -430,12 +434,12 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, fuzzy, perl-format msgid "failed to determine size of image %s" msgstr "грешка при запис на файла „%s”: %s" @@ -536,7 +540,7 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "крешка при компилиране на файла %s" @@ -613,94 +617,94 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -831,7 +835,7 @@ msgstr "" msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "" @@ -882,7 +886,7 @@ msgstr "" msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "обновяване на страниците от уики „%s”: %s от потребител „%s”" @@ -1026,26 +1030,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1055,7 +1059,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, fuzzy, perl-format msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" @@ -1072,47 +1076,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1129,7 +1133,7 @@ msgstr "грешка при четене на „%s”: %s" msgid "cannot load %s in safe mode" msgstr "грешка при четене на „%s”: %s" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, fuzzy, perl-format msgid "failed to parse %s" msgstr "крешка при компилиране на файла %s" @@ -1166,13 +1170,13 @@ msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1185,23 +1189,23 @@ msgstr "формат: ikiwiki [опции] източник местоназна msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "генериране на обвивки..." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." @@ -1209,41 +1213,41 @@ msgstr "осъвременяване на уики..." msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2281 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index c3fb1f832..06e351841 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -52,7 +52,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Chyba" @@ -81,50 +81,50 @@ msgstr "příspěvky" msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "poslední kontrola %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji kanál %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít kanál na %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "kanál nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(entity byly v kanálu zakódovány)" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "kanál shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -133,7 +133,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "hotovo" @@ -163,19 +163,19 @@ msgstr "stránka nazvaná %s již existuje" msgid "prohibited by allowed_attachments" msgstr "zakázáno proměnnou allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "chybné jméno souboru s přílohou" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "příloha nahrána" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "automatické vytváření indexu" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -192,78 +192,83 @@ msgstr "%s z %s" msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "komentář k %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 #, fuzzy msgid "moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "komentář musí mít obsah" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Schvalování komentářů" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "chybný název stránky" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "komentář k %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "komentáře na stránce „%s“ jsou uzamčeny" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "komentář uložen pro schválení" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Váš komentář bude zobrazen po schválení moderátorem" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Přidán komentář" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -273,7 +278,7 @@ msgstr[1] "Komentáře" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 #, fuzzy msgid "Comment" msgstr "Komentáře" @@ -309,9 +314,9 @@ msgstr "%s není editovatelná stránka" msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "upravuji %s" @@ -324,12 +329,12 @@ msgstr "nebyl zadán parametr template" msgid "match not specified" msgstr "nebyl zadán parametr match" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s byla zaregistrována pro %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -343,11 +348,11 @@ msgstr "musíte zadat formát a text" msgid "fortune failed" msgstr "fortune selhal" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "chybějící stránka" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "Stránka %s neexistuje." @@ -361,22 +366,22 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -386,7 +391,7 @@ msgstr "%s musíte zadat při každém použití modulu %s" msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" @@ -423,12 +428,12 @@ msgstr "nelze číst %s: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "nelze určit velikost obrázku %s" @@ -521,7 +526,7 @@ msgstr "schvalování komentářů" msgid "more" msgstr "více" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "nelze zkompilovat %s" @@ -596,40 +601,40 @@ msgstr "LWP nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -637,7 +642,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -645,50 +650,50 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " @@ -819,7 +824,7 @@ msgstr "potvrďte odstranění %s" msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "odstraněno" @@ -869,7 +874,7 @@ msgstr "Vyberte přílohu, kterou chcete přejmenovat." msgid "rename %s to %s" msgstr "přejmenování %s na %s" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualizace pro přejmenování %s na %s" @@ -1004,20 +1009,20 @@ msgstr "moduly" msgid "enable %s?" msgstr "povolit %s?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "konfigurační soubor této wiki je neznámý" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "hlavní" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "Níže uvedené změny v konfiguraci se projeví až po znovusestavení wiki." -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1025,7 +1030,7 @@ msgstr "" "Aby se níže uvedené změny v konfiguraci zcela projevily, budete možná muset " "znovusestavit wiki." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1037,7 +1042,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "nemohu určit identitu nedůvěryhodného uživatele %s" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "chybné jméno souboru %s" @@ -1056,47 +1061,47 @@ msgstr "" "v cestě ke zdrojovému adresáři (%s) byl nalezen symbolický odkaz -- chcete-" "li to povolit, nastavte proměnnou allow_symlinks_before_srcdir" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s má několik možných zdrojových stránek" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "sestavuji %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "odstraňuji %s, již není sestavována pomocí %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "sestavuji %s, která závisí na %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1113,7 +1118,7 @@ msgstr "nemohu číst %s: %s" msgid "cannot load %s in safe mode" msgstr "nemohu číst %s: %s" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, fuzzy, perl-format msgid "failed to parse %s" msgstr "nepodařilo se aktualizovat %s" @@ -1150,13 +1155,13 @@ msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1169,24 +1174,24 @@ msgstr "použití: ikiwiki [volby] zdroj cíl" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup konfigurační.soubor" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "generuji obaly..." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "obnovuji wiki..." @@ -1194,39 +1199,39 @@ msgstr "obnovuji wiki..." msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 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:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index fb0ec754d..cb550fa4f 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -56,7 +56,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Fejl" @@ -85,50 +85,50 @@ msgstr "indlæg" msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "færdig" @@ -170,19 +170,19 @@ msgstr "der er allerede en side ved navn %s" msgid "prohibited by allowed_attachments" msgstr "forhindret af allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "vedhæftningsoplægning" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "automatisk indeks-dannelse" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,78 +199,83 @@ msgstr "%s fra %s" msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 #, fuzzy msgid "moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "kommentar skal have indhold" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Kommentarmoderering" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "dårligt sidenavn" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -280,7 +285,7 @@ msgstr[1] "Kommentarer" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 #, fuzzy msgid "Comment" msgstr "Kommentarer" @@ -316,9 +321,9 @@ msgstr "%s er ikke en redigérbar side" msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -331,12 +336,12 @@ msgstr "skabelon %s ikke angivet" msgid "match not specified" msgstr "sammenligning ikke angivet" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "redigeringsskabelon %s registreret for %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -350,11 +355,11 @@ msgstr "skal angive format og tekst" msgid "fortune failed" msgstr "spådom (fortune) fejlede" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." @@ -369,22 +374,22 @@ msgstr "kan ikke få sider til at passe sammen: %s" msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -394,7 +399,7 @@ msgstr "Skal angive %s når udvidelsen %s bruges" msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" @@ -434,12 +439,12 @@ msgstr "læsning af %s mislykkedes: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "Vurdering af billedstørrelse mislykkedes: %s" @@ -534,7 +539,7 @@ msgstr "kommentarkoderering" msgid "more" msgstr "mere" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "kompilering af %s mislykkedes" @@ -610,12 +615,12 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -623,7 +628,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -631,21 +636,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -653,7 +658,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -661,50 +666,50 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -834,7 +839,7 @@ msgstr "bekræft at %s bliver fjernet" msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "fjernet" @@ -884,7 +889,7 @@ msgstr "Vælg vedhæftningen som skal omdøbes." msgid "rename %s to %s" msgstr "omdøb %s til %s" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "opdatering til omdøbning af %s til %s" @@ -1019,22 +1024,22 @@ msgstr "udvidelser" msgid "enable %s?" msgstr "aktivér %s?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "opsætningsfilen for denne wiki er ukendt" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "primær" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Opsætningsændringerne vist nedenfor kræver wiki-genopbygning for at træde i " "kraft." -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1042,7 +1047,7 @@ msgstr "" "For at opsætningsændringerne vist nedenfor træder fuldt ud i kraft, skal du " "muligvis genopbygge wikien." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." @@ -1052,7 +1057,7 @@ msgstr "Fejl: %s returnerede ikke-nul (%s). Dropper opsætningsændringer." msgid "cannot determine id of untrusted committer %s" msgstr "kan ikke afgøre id for ikke-tillidsfulde skribent %s" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" @@ -1071,47 +1076,47 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1128,7 +1133,7 @@ msgstr "kan ikke læse %s: %s" msgid "cannot load %s in safe mode" msgstr "kan ikke læse %s: %s" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, fuzzy, perl-format msgid "failed to parse %s" msgstr "opdatering af %s mislykkedes" @@ -1165,13 +1170,13 @@ msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1184,24 +1189,24 @@ msgstr "brug: ikiwiki [valg] kilde mål" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup opsætningsfil" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "bygger wrappers.." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1209,40 +1214,40 @@ msgstr "genopfrisker wiki..." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index 1cfc57886..a47add580 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -53,7 +53,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Fehler" @@ -82,50 +82,50 @@ msgstr "Beiträge" msgid "new" msgstr "neu" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s läuft aus (%s Tage alt)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "%s läuft aus" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "zuletzt geprüft %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "überprüfe Vorlage (feed) %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "konnte Vorlage (feed) unter %s nicht finden" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(Einträge in der Vorlage (feed) wurden maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" @@ -134,7 +134,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "fertig" @@ -165,19 +165,19 @@ msgstr "eine Seite mit dem Namen %s existiert bereits" msgid "prohibited by allowed_attachments" msgstr "durch allowed_attachements verboten" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "fehlerhafter Dateiname für Anhang" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "Anhang hochladen" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "automatische Index-Erstellung" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -194,79 +194,84 @@ msgstr "%s von %s" msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "kommentiere %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 #, fuzzy msgid "moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "ein Kommentar sollte Inhalt haben" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Kommentar-Moderation" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "fehlerhafter Seitenname" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "kommentiere %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "Kommentare zur Seite %s sind gesperrt" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "Der Kommentar wurde zur Moderation gespeichert" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Ihr Kommentar wird nach Moderation verschickt" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Kommentar hinzugefügt" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -276,7 +281,7 @@ msgstr[1] "%i Kommentare" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "Kommentieren" @@ -311,9 +316,9 @@ msgstr "Seite %s kann nicht bearbeitet werden" msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "bearbeite %s" @@ -326,12 +331,12 @@ msgstr "Vorlage nicht angegeben" msgid "match not specified" msgstr "Übereinstimmung nicht angegeben" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s für %s registriert" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -345,11 +350,11 @@ msgstr "Format und Text müssen spezifiziert werden" msgid "fortune failed" msgstr "fortune fehlgeschlagen" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." @@ -363,22 +368,22 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -388,7 +393,7 @@ msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" @@ -427,12 +432,12 @@ msgstr "Lesen von %s fehlgeschlagen: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "Größe des Bildes %s konnte nicht festgestellt werden." @@ -529,7 +534,7 @@ msgstr "Kommentar muss moderiert werden" msgid "more" msgstr "mehr" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "erzeugen von %s fehlgeschlagen" @@ -606,12 +611,12 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -619,7 +624,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -627,21 +632,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -649,7 +654,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -657,50 +662,50 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -833,7 +838,7 @@ msgstr "bestätigen Sie die Entfernung von %s" msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "entfernt" @@ -883,7 +888,7 @@ msgstr "Bitte wählen Sie den Anhang aus, der umbenannt werden soll." msgid "rename %s to %s" msgstr "benenne %s in %s um" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "aktualisiert zum Umbenennen von %s nach %s" @@ -1018,22 +1023,22 @@ msgstr "%s-Erweiterungen" msgid "enable %s?" msgstr "%s aktivieren?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "Die Einrichtungsdatei für dieses Wiki ist unbekannt" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "Hauptseite" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Die unten aufgeführten Konfigurationsänderungen erfordern ein Neubau des " "Wikis, um wirksam zu werden." -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1041,7 +1046,7 @@ msgstr "" "Damit die unten aufgeführten Konfigurationsänderungen insgesamt wirksam " "werden, kann es notwendig sein, das Wikis neu zu bauen." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1054,7 +1059,7 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "id des nicht vertrauenswürdigen Absenders %s konnte nicht feststellt werden" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" @@ -1073,47 +1078,47 @@ msgstr "" "symbolischer Verweis im srcdir Pfad (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "erzeuge %s, die auf %s verweist" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1130,7 +1135,7 @@ msgstr "kann %s nicht lesen: %s" msgid "cannot load %s in safe mode" msgstr "kann %s nicht lesen: %s" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, fuzzy, perl-format msgid "failed to parse %s" msgstr "aktualisieren von %s fehlgeschlagen" @@ -1170,13 +1175,13 @@ msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1189,24 +1194,24 @@ msgstr "Aufruf: ikiwiki [Optionen] Quelle Ziel" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup Konfigurationsdatei" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "erzeuge Wrapper.." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." @@ -1214,42 +1219,42 @@ msgstr "aktualisiere Wiki.." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index 34c704238..d9155a921 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-18 14:18-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -57,7 +57,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Error" @@ -87,50 +87,50 @@ msgstr "entradas" msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "última comprobación el %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, 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:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -139,7 +139,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "completado" @@ -172,19 +172,19 @@ msgstr "ya existe una página de nombre %s" msgid "prohibited by allowed_attachments" msgstr "prohibido por la claúsula allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "enviado el adjunto" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "creación de índice automática" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -201,78 +201,83 @@ msgstr "%s desde la página %s" msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "creando comentarios en la página %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 #, fuzzy msgid "moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "Un comentario debe tener algún contenido" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anónimo" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Aprobación de comentarios" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nombre de página erróneo" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "creando comentarios en la página %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "la página '%s' no existe, así que no se puede comentar sobre ella" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "los comentarios para la página '%s' están cerrados" -#: ../IkiWiki/Plugin/comments.pm:490 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "comentario guardado a la espera de aprobación" -#: ../IkiWiki/Plugin/comments.pm:492 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Su comentario será publicado después de que el moderador lo revise" -#: ../IkiWiki/Plugin/comments.pm:505 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Añadir un comentario" -#: ../IkiWiki/Plugin/comments.pm:509 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:551 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" -#: ../IkiWiki/Plugin/comments.pm:602 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:640 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:789 +#: ../IkiWiki/Plugin/comments.pm:822 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -282,7 +287,7 @@ msgstr[1] "Comentarios" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:799 +#: ../IkiWiki/Plugin/comments.pm:832 #, fuzzy msgid "Comment" msgstr "Comentarios" @@ -318,9 +323,9 @@ msgstr "la página %s no es modificable" msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:331 -#: ../IkiWiki/Plugin/editpage.pm:341 ../IkiWiki/Plugin/editpage.pm:385 -#: ../IkiWiki/Plugin/editpage.pm:424 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "modificando página %s" @@ -333,12 +338,12 @@ msgstr "falta indicar la plantilla (template)" msgid "match not specified" msgstr "falta indicar la coincidencia de páginas (match)" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "plantilla de edición %s registrada para %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -352,11 +357,11 @@ msgstr "se deben especificar tanto el formato como el texto" msgid "fortune failed" msgstr "el programa fortune ha fallado" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." @@ -371,22 +376,22 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -396,7 +401,7 @@ msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " -#: ../IkiWiki/Plugin/graphviz.pm:90 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " @@ -436,12 +441,12 @@ msgstr "no puedo leer de %s: %s " msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "no he podido determinar el tamaño de la imagen %s" @@ -538,7 +543,7 @@ msgstr "aprobación de comentarios" msgid "more" msgstr "ver más" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "ha fallado la compilación del programa %s" @@ -618,94 +623,94 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -834,7 +839,7 @@ msgstr "confirme el borrado de %s" msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "borrado" @@ -884,7 +889,7 @@ msgstr "Por favor, seleccione el adjunto al que cambiar el nombre." msgid "rename %s to %s" msgstr "%s cambia de nombre a %s" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "actualizado el cambio de nombre de %s a %s" @@ -1023,22 +1028,22 @@ msgstr "complementos" msgid "enable %s?" msgstr "¿ activar %s ?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "El archivo de configuración para este wiki es desconocido" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "principal" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Los cambios en la configuración que se muestran más abajo precisan una " "reconstrucción del wiki para tener efecto." -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1046,7 +1051,7 @@ msgstr "" "Para que los cambios en la configuración mostrados más abajo tengan efecto, " "es posible que necesite reconstruir el wiki." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1058,7 +1063,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "no puedo determinar el identificador de un usuario no fiable como %s" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" @@ -1077,49 +1082,49 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1136,7 +1141,7 @@ msgstr "no puedo leer el archivo %s: %s" msgid "cannot load %s in safe mode" msgstr "no puedo leer el archivo %s: %s" -#: ../IkiWiki/Setup.pm:46 +#: ../IkiWiki/Setup.pm:47 #, fuzzy, perl-format msgid "failed to parse %s" msgstr "ha fallado la compilación del programa %s" @@ -1175,13 +1180,13 @@ msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, 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:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1194,24 +1199,24 @@ msgstr "uso: ikiwiki [opciones] origen destino" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup archivo_de_configuración" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "generando programas auxiliares.." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "actualizando el wiki.." @@ -1219,43 +1224,43 @@ msgstr "actualizando el wiki.." msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 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:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1984 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2061 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2082 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2218 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 94e6d6b02..a080dcd34 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,19 +9,16 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-02 22:18-0500\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2010-07-17 18:13+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../IkiWiki/CGI.pm:116 -msgid "You need to log in first." -msgstr "Vous devez d'abord vous identifier." - -#: ../IkiWiki/CGI.pm:149 +#: ../IkiWiki/CGI.pm:162 msgid "" "probable misconfiguration: sslcookie is set, but you are attempting to login " "via http, not https" @@ -29,35 +26,35 @@ msgstr "" "Erreur de configuration probable : sslcookie est positionné mais vous tentez " "de vous connecter avec http au lieu de https" -#: ../IkiWiki/CGI.pm:152 +#: ../IkiWiki/CGI.pm:165 msgid "login failed, perhaps you need to turn on cookies?" msgstr "Échec de l'identification, vous devez autoriser les cookies." -#: ../IkiWiki/CGI.pm:171 ../IkiWiki/CGI.pm:320 +#: ../IkiWiki/CGI.pm:184 ../IkiWiki/CGI.pm:335 msgid "Your login session has expired." msgstr "Session d'authentification expirée." -#: ../IkiWiki/CGI.pm:192 +#: ../IkiWiki/CGI.pm:205 msgid "Login" msgstr "S’identifier" -#: ../IkiWiki/CGI.pm:193 +#: ../IkiWiki/CGI.pm:206 msgid "Preferences" msgstr "Préférences" -#: ../IkiWiki/CGI.pm:194 +#: ../IkiWiki/CGI.pm:207 msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:234 +#: ../IkiWiki/CGI.pm:247 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:284 +#: ../IkiWiki/CGI.pm:299 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:411 ../IkiWiki/CGI.pm:412 ../IkiWiki.pm:1280 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Erreur" @@ -86,50 +83,50 @@ msgstr "Articles" msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -138,7 +135,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:216 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "Terminé" @@ -168,19 +165,19 @@ msgstr "Il existe déjà une page nommée %s" msgid "prohibited by allowed_attachments" msgstr "Action interdite par allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "Envoi de la pièce jointe" -#: ../IkiWiki/Plugin/autoindex.pm:105 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "Génération de l'index automatique" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -197,68 +194,83 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:125 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:113 +#, fuzzy, perl-format +msgid "this comment needs %s" +msgstr "Faire un commentaire sur %s" + +#: ../IkiWiki/Plugin/comments.pm:116 +#, fuzzy +msgid "moderation" +msgstr "Modération du commentaire" + +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:130 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:185 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Modération du commentaire" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:345 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:363 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:370 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:467 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:469 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:482 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:486 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:528 ../IkiWiki/Plugin/websetup.pm:256 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:579 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:618 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:761 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -268,7 +280,7 @@ msgstr[1] "%i commentaires" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:771 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "poster un commentaire" @@ -298,14 +310,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s" msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:296 +#: ../IkiWiki/Plugin/editpage.pm:294 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:314 ../IkiWiki/Plugin/editpage.pm:333 -#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:387 -#: ../IkiWiki/Plugin/editpage.pm:426 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "Édition de %s" @@ -318,14 +330,16 @@ msgstr "modèle (« template ») non indiqué" msgid "match not specified" msgstr "correspondance non indiquée" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s enregistré pour %s" -#: ../IkiWiki/Plugin/edittemplate.pm:138 -msgid "failed to process" -msgstr "Échec du traitement" +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/template.pm:44 +#, fuzzy +msgid "failed to process template:" +msgstr "Échec du traitement :" #: ../IkiWiki/Plugin/format.pm:30 msgid "must specify format and text" @@ -335,11 +349,11 @@ msgstr "le format et le texte doivent être indiqués" msgid "fortune failed" msgstr "Échec du lancement de « fortune »" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:59 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." @@ -353,22 +367,22 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:658 ../IkiWiki/Plugin/git.pm:676 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:698 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:702 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:132 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -378,7 +392,7 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:95 +#: ../IkiWiki/Plugin/graphviz.pm:91 msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" @@ -417,12 +431,12 @@ msgstr "Échec de la lecture de %s : %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:125 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" -#: ../IkiWiki/Plugin/img.pm:145 +#: ../IkiWiki/Plugin/img.pm:146 #, perl-format msgid "failed to determine size of image %s" msgstr "Échec de la détermination de la taille de l'image : %s" @@ -450,12 +464,12 @@ msgstr "Les paramètres %s et %s ne peuvent être utilisés ensemble." msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:333 +#: ../IkiWiki/Plugin/inline.pm:342 #, perl-format -msgid "nonexistant template %s" -msgstr "Le modèle de page %s n'existe pas" +msgid "template %s not found" +msgstr "Modèle de page %s introuvable" -#: ../IkiWiki/Plugin/inline.pm:625 +#: ../IkiWiki/Plugin/inline.pm:633 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -484,18 +498,23 @@ msgstr "" "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:162 +#: ../IkiWiki/Plugin/meta.pm:174 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:200 +#: ../IkiWiki/Plugin/meta.pm:212 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:214 +#: ../IkiWiki/Plugin/meta.pm:226 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" +#: ../IkiWiki/Plugin/meta.pm:387 +#, fuzzy +msgid "sort=meta requires a parameter" +msgstr "les paramètres « from » et « to » sont nécessaires." + #: ../IkiWiki/Plugin/mirrorlist.pm:44 msgid "Mirrors" msgstr "Miroirs" @@ -504,7 +523,7 @@ msgstr "Miroirs" msgid "Mirror" msgstr "Miroir" -#: ../IkiWiki/Plugin/moderatedcomments.pm:42 +#: ../IkiWiki/Plugin/moderatedcomments.pm:57 msgid "comment needs moderation" msgstr "le commentaire doit passer par une instance de modération" @@ -512,17 +531,10 @@ msgstr "le commentaire doit passer par une instance de modération" msgid "more" msgstr "lire la suite" -#: ../IkiWiki/Plugin/norcs.pm:66 -msgid "getctime not implemented" -msgstr "getctime n'est pas implémenté" - -#: ../IkiWiki/Plugin/openid.pm:62 -msgid "Log in with" -msgstr "S'identifier en tant que" - -#: ../IkiWiki/Plugin/openid.pm:65 -msgid "Get an OpenID" -msgstr "Obtenir un compte OpenID" +#: ../IkiWiki/Plugin/openid.pm:70 +#, fuzzy, perl-format +msgid "failed to load openid module: " +msgstr "Échec de la compilation de %s" #: ../IkiWiki/Plugin/orphans.pm:56 msgid "All pages have other pages linking to them." @@ -532,43 +544,43 @@ msgstr "Toutes les pages sont liées à d'autres pages." msgid "bad or missing template" msgstr "Modèle de page incorrect ou manquant" -#: ../IkiWiki/Plugin/passwordauth.pm:229 +#: ../IkiWiki/Plugin/passwordauth.pm:231 msgid "Your user page: " msgstr "Votre page d'utilisateur :" -#: ../IkiWiki/Plugin/passwordauth.pm:236 +#: ../IkiWiki/Plugin/passwordauth.pm:238 msgid "Create your user page" msgstr "Création de votre page d'utilisateur" -#: ../IkiWiki/Plugin/passwordauth.pm:264 +#: ../IkiWiki/Plugin/passwordauth.pm:268 msgid "Account creation successful. Now you can Login." msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier." -#: ../IkiWiki/Plugin/passwordauth.pm:267 +#: ../IkiWiki/Plugin/passwordauth.pm:271 msgid "Error creating account." msgstr "Erreur lors de la création du compte." -#: ../IkiWiki/Plugin/passwordauth.pm:274 +#: ../IkiWiki/Plugin/passwordauth.pm:278 msgid "No email address, so cannot email password reset instructions." msgstr "" "Aucune adresse indiquée. Impossible d'envoyer les instructions pour " "réinitialiser le mot de passe." -#: ../IkiWiki/Plugin/passwordauth.pm:308 +#: ../IkiWiki/Plugin/passwordauth.pm:312 msgid "Failed to send mail" msgstr "Impossible d'envoyer un courriel" -#: ../IkiWiki/Plugin/passwordauth.pm:310 +#: ../IkiWiki/Plugin/passwordauth.pm:314 msgid "You have been mailed password reset instructions." msgstr "" "Vous avez reçu un message contenant les instructions pour réinitialiser le " "mot de passe" -#: ../IkiWiki/Plugin/passwordauth.pm:345 +#: ../IkiWiki/Plugin/passwordauth.pm:349 msgid "incorrect password reset url" msgstr "Adresse pour la réinitialisation du mot de passe incorrecte" -#: ../IkiWiki/Plugin/passwordauth.pm:348 +#: ../IkiWiki/Plugin/passwordauth.pm:352 msgid "password reset denied" msgstr "réinitialisation du mot de passe refusée" @@ -600,12 +612,12 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:139 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:151 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -613,7 +625,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -621,23 +633,23 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:386 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:390 ../IkiWiki/Render.pm:655 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:428 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:452 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -645,7 +657,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:472 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -653,50 +665,50 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:871 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:885 +#: ../IkiWiki/Plugin/po.pm:902 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:894 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:900 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:936 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:949 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1033 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1089 ../IkiWiki/Plugin/po.pm:1103 -#: ../IkiWiki/Plugin/po.pm:1142 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1101 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1154 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " @@ -798,7 +810,8 @@ msgstr "pourcentage %s illégal" #: ../IkiWiki/Plugin/progress.pm:56 msgid "need either `percent` or `totalpages` and `donepages` parameters" msgstr "" -"L'un des paramètres « percent », « totalpages » ou « donepages » est nécessaire." +"L'un des paramètres « percent », « totalpages » ou « donepages » est " +"nécessaire." #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" @@ -819,16 +832,16 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:135 +#: ../IkiWiki/Plugin/remove.pm:137 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:172 +#: ../IkiWiki/Plugin/remove.pm:174 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:212 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "supprimé" @@ -841,44 +854,44 @@ msgstr "%s n'est pas dans srcdir. Impossible de le renommer" msgid "no change to the file name was specified" msgstr "Aucun changement dans le nom du fichier n'a été spécifié" -#: ../IkiWiki/Plugin/rename.pm:69 +#: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" msgstr "Appellation interdite" -#: ../IkiWiki/Plugin/rename.pm:74 +#: ../IkiWiki/Plugin/rename.pm:73 #, perl-format msgid "%s already exists" msgstr "%s existe déjà" -#: ../IkiWiki/Plugin/rename.pm:80 +#: ../IkiWiki/Plugin/rename.pm:79 #, perl-format msgid "%s already exists on disk" msgstr "%s existe déjà sur le disque" -#: ../IkiWiki/Plugin/rename.pm:123 +#: ../IkiWiki/Plugin/rename.pm:122 #, perl-format msgid "rename %s" msgstr "%s renommé" -#: ../IkiWiki/Plugin/rename.pm:162 +#: ../IkiWiki/Plugin/rename.pm:163 msgid "Also rename SubPages and attachments" msgstr "« SubPages » et attachements renommés." -#: ../IkiWiki/Plugin/rename.pm:249 +#: ../IkiWiki/Plugin/rename.pm:250 msgid "Only one attachment can be renamed at a time." msgstr "Modification de pièce jointe : une seule à la fois" -#: ../IkiWiki/Plugin/rename.pm:252 +#: ../IkiWiki/Plugin/rename.pm:253 msgid "Please select the attachment to rename." msgstr "Veuillez sélectionner la pièce jointe à renommer" -#: ../IkiWiki/Plugin/rename.pm:349 +#: ../IkiWiki/Plugin/rename.pm:352 #, perl-format msgid "rename %s to %s" msgstr "Renomme %s en %s" -#: ../IkiWiki/Plugin/rename.pm:573 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "mise à jour, suite au changement de %s en %s" @@ -893,12 +906,12 @@ msgstr "Impossible d'exécuter la commande rsync : %s" msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" -#: ../IkiWiki/Plugin/search.pm:183 +#: ../IkiWiki/Plugin/search.pm:194 #, perl-format msgid "need Digest::SHA1 to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:218 +#: ../IkiWiki/Plugin/search.pm:231 msgid "search" msgstr "recherche" @@ -976,58 +989,59 @@ msgstr "Téléchargement direct des données" msgid "parse fail at line %d: %s" msgstr "Erreur d'analyse à la ligne %d : %s" -#: ../IkiWiki/Plugin/template.pm:34 +#: ../IkiWiki/Plugin/tag.pm:83 +#, fuzzy, perl-format +msgid "creating tag page %s" +msgstr "Création de la nouvelle page %s" + +#: ../IkiWiki/Plugin/template.pm:33 msgid "missing id parameter" msgstr "Paramètre d'identification manquant" -#: ../IkiWiki/Plugin/template.pm:41 -#, perl-format -msgid "template %s not found" -msgstr "Modèle de page %s introuvable" - -#: ../IkiWiki/Plugin/template.pm:60 -msgid "failed to process:" -msgstr "Échec du traitement :" +#: ../IkiWiki/Plugin/template.pm:47 +#, fuzzy, perl-format +msgid "%s not found" +msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/teximg.pm:71 +#: ../IkiWiki/Plugin/teximg.pm:72 msgid "missing tex code" msgstr "Il manque le code TeX" -#: ../IkiWiki/Plugin/teximg.pm:123 +#: ../IkiWiki/Plugin/teximg.pm:124 msgid "failed to generate image from code" msgstr "Échec de la création de l'image à partir du code" -#: ../IkiWiki/Plugin/websetup.pm:91 +#: ../IkiWiki/Plugin/websetup.pm:105 #, perl-format msgid "%s plugin:" msgstr "greffon %s" -#: ../IkiWiki/Plugin/websetup.pm:107 +#: ../IkiWiki/Plugin/websetup.pm:121 #, perl-format msgid "%s plugins" msgstr "Greffons %s" -#: ../IkiWiki/Plugin/websetup.pm:121 +#: ../IkiWiki/Plugin/websetup.pm:135 #, perl-format msgid "enable %s?" msgstr "activer %s ?" -#: ../IkiWiki/Plugin/websetup.pm:260 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "Le fichier de configuration de ce wiki n'est pas connu" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "Partie principale" -#: ../IkiWiki/Plugin/websetup.pm:419 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Les changements de configuration ci-dessous nécessitent une recompilation du " "wiki pour prendre effet" -#: ../IkiWiki/Plugin/websetup.pm:423 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1035,7 +1049,7 @@ msgstr "" "Pour que les changements de configuration ci-dessous prennent effet vous " "devez recompiler le wiki" -#: ../IkiWiki/Plugin/websetup.pm:460 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." @@ -1046,17 +1060,17 @@ msgid "cannot determine id of untrusted committer %s" msgstr "" "Impossible de déterminer l'identifiant de %s, (enregistrement non fiable)" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:153 +#: ../IkiWiki/Render.pm:158 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:274 +#: ../IkiWiki/Render.pm:280 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -1065,69 +1079,84 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:303 ../IkiWiki/Render.pm:330 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:308 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:413 +#: ../IkiWiki/Render.pm:372 #, perl-format -msgid "removing old page %s" +msgid "querying %s for file creation and modification times.." +msgstr "" + +#: ../IkiWiki/Render.pm:446 +#, fuzzy, perl-format +msgid "removing obsolete %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:495 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:618 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:631 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:707 +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" #. translators: The first parameter is a filename, and the second #. translators: is a (probably not translated) error message. -#: ../IkiWiki/Setup.pm:19 +#: ../IkiWiki/Setup.pm:23 #, perl-format msgid "cannot read %s: %s" msgstr "Lecture impossible de %s : %s" +#: ../IkiWiki/Setup.pm:34 +#, fuzzy, perl-format +msgid "cannot load %s in safe mode" +msgstr "Lecture impossible de %s : %s" + +#: ../IkiWiki/Setup.pm:47 +#, fuzzy, perl-format +msgid "failed to parse %s" +msgstr "Impossible de mettre à jour %s" + #: ../IkiWiki/Setup/Automator.pm:34 msgid "you must enter a wikiname (that contains alphanumerics)" msgstr "" "Vous devez spécifier un nom de wiki (contenant des caractères " "alphanumériques)" -#: ../IkiWiki/Setup/Automator.pm:82 +#: ../IkiWiki/Setup/Automator.pm:89 #, perl-format msgid "unsupported revision control system %s" msgstr "Système de contrôle de version non reconnu : %s" -#: ../IkiWiki/Setup/Automator.pm:108 +#: ../IkiWiki/Setup/Automator.pm:115 msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" -#: ../IkiWiki/Setup/Automator.pm:126 +#: ../IkiWiki/Setup/Automator.pm:134 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" @@ -1149,13 +1178,13 @@ msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:149 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:169 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1168,59 +1197,65 @@ msgstr "Syntaxe : ikiwiki [options] source destination" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup fichier de configuration" -#: ../ikiwiki.in:92 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:142 +#: ../ikiwiki.in:112 +#, fuzzy +msgid "usage: --set-yaml var=value" +msgstr "Syntaxe : -- set var=valeur" + +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "Création des fichiers CGI..." -#: ../ikiwiki.in:205 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:208 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." -#: ../IkiWiki.pm:238 +#: ../IkiWiki.pm:232 msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:514 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:560 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:589 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1262 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1877 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2020 -msgid "Sort::Naturally needed for title_natural sort" -msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" +#: ../IkiWiki.pm:2124 +#, fuzzy, perl-format +msgid "invalid sort type %s" +msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2031 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2050 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1245,6 +1280,27 @@ msgstr "Identifiant de l'administrateur (utilisateur du wiki ou openid) :" msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "You need to log in first." +#~ msgstr "Vous devez d'abord vous identifier." + +#~ msgid "failed to process" +#~ msgstr "Échec du traitement" + +#~ msgid "nonexistant template %s" +#~ msgstr "Le modèle de page %s n'existe pas" + +#~ msgid "getctime not implemented" +#~ msgstr "getctime n'est pas implémenté" + +#~ msgid "Log in with" +#~ msgstr "S'identifier en tant que" + +#~ msgid "Get an OpenID" +#~ msgstr "Obtenir un compte OpenID" + +#~ msgid "Sort::Naturally needed for title_natural sort" +#~ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" + #~ msgid "failed to read %s" #~ msgstr "Impossible de lire %s" @@ -1268,5 +1324,5 @@ msgstr "Nom de domaine du serveur HTTP :" #~ msgid "

    Error: %s exited nonzero (%s)" #~ msgstr "" -#~ "

    Erreur : %s s'est terminé, valeur de sortie nonzero (%" -#~ "s)" +#~ "

    Erreur : %s s'est terminé, valeur de sortie nonzero " +#~ "(%s)" diff --git a/po/gu.po b/po/gu.po index c0dfb145b..8e796f51f 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 15:02-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -51,7 +51,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "ક્ષતિ" @@ -80,50 +80,50 @@ msgstr "પોસ્ટ" msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -132,7 +132,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "સંપૂર્ણ" @@ -165,19 +165,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -192,77 +192,81 @@ msgstr "" msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, fuzzy, perl-format msgid "commenting on %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:491 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:493 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:506 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:603 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:641 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:790 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -272,7 +276,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:800 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -307,9 +311,9 @@ msgstr "%s એ સુધારી શકાય તેવું પાનું msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334 -#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390 -#: ../IkiWiki/Plugin/editpage.pm:429 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" @@ -324,12 +328,12 @@ msgstr "ટેમ્પલેટ %s મળ્યું નહી" msgid "match not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -343,12 +347,12 @@ msgstr "" msgid "fortune failed" msgstr "ભવિષ્ય નિષ્ફળ" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -363,22 +367,22 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -526,7 +530,7 @@ msgstr "" msgid "more" msgstr "વધુ" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" @@ -603,94 +607,94 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -821,7 +825,7 @@ msgstr "" msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "" @@ -872,7 +876,7 @@ msgstr "" msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "%s નો સુધારો %s નાં %s વડે" @@ -1013,26 +1017,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1042,7 +1046,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, fuzzy, perl-format msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" @@ -1059,47 +1063,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1153,13 +1157,13 @@ msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1172,23 +1176,23 @@ msgstr "ઉપયોગ: ikiwiki [વિકલ્પો] source dest" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "આવરણ બનાવે છે.." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." @@ -1196,39 +1200,39 @@ msgstr "વીકીને તાજી કરે છે.." msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1993 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2070 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2091 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2281 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index bb0d6e526..e42195ecb 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-04 16:46-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,7 +52,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1324 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "" @@ -81,50 +81,50 @@ msgstr "" msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "" @@ -190,77 +190,81 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, perl-format msgid "this comment needs %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:495 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:497 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:514 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:558 ../IkiWiki/Plugin/websetup.pm:268 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:610 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:650 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:807 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -270,7 +274,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:817 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -338,11 +342,11 @@ msgstr "" msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -371,7 +375,7 @@ msgstr "" msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -588,93 +592,93 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:455 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:475 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:875 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:889 +#: ../IkiWiki/Plugin/po.pm:902 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:898 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:904 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:940 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:951 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1035 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1092 ../IkiWiki/Plugin/po.pm:1104 -#: ../IkiWiki/Plugin/po.pm:1143 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1102 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1155 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -1147,23 +1151,23 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "" @@ -1184,26 +1188,26 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1306 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2001 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2078 +#: ../IkiWiki.pm:2124 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2099 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2235 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index e6fd4b42f..8ebf695f4 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 15:02-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -50,7 +50,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Errore" @@ -80,50 +80,50 @@ msgstr "articoli" msgid "new" msgstr "nuovo" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "in scadenza %s (vecchio di %s giorni)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "in scadenza %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "ultimo controllo %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "controllo notiziario %s..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "impossibile trovare il notiziario %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(entità del notiziario espanse con escape)" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "il notiziario ha fatto andare in crash XML::Feed." -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "creazione nuova pagina %s" @@ -132,7 +132,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "fatto" @@ -162,19 +162,19 @@ msgstr "esiste già una pagina chiamata %s" msgid "prohibited by allowed_attachments" msgstr "non permesso da allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "nome file dell'allegato non valido" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "carica allegato" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "generazione automatica dell'indice" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -191,78 +191,83 @@ msgstr "%s da %s" msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "commento su %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 #, fuzzy msgid "moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "i commenti devono avere un contenuto" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +#, fuzzy +msgid "Comment Moderation" +msgstr "Moderazione commenti" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "nome pagina non valido" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "commento su %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "la pagina «%s» non esiste, impossibile commentarla" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "i commenti per la pagina «%s» sono chiusi" -#: ../IkiWiki/Plugin/comments.pm:491 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "commento trattenuto per moderazione" -#: ../IkiWiki/Plugin/comments.pm:493 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "Il commento sarà pubblicato dopo la verifica del moderatore" -#: ../IkiWiki/Plugin/comments.pm:506 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "Aggiunto commento" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" -#: ../IkiWiki/Plugin/comments.pm:603 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:641 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "moderazione commento" -#: ../IkiWiki/Plugin/comments.pm:790 +#: ../IkiWiki/Plugin/comments.pm:822 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -272,7 +277,7 @@ msgstr[1] "Commenti" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:800 +#: ../IkiWiki/Plugin/comments.pm:832 #, fuzzy msgid "Comment" msgstr "Commenti" @@ -308,9 +313,9 @@ msgstr "%s non è una pagina modificabile" msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334 -#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390 -#: ../IkiWiki/Plugin/editpage.pm:429 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "modifica %s" @@ -323,12 +328,12 @@ msgstr "modello non specificato" msgid "match not specified" msgstr "corrispondenza non specificata" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "edittemplate %s registrato per %s" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -342,11 +347,11 @@ msgstr "occorre specificare formato e testo" msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." @@ -360,22 +365,22 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -524,7 +529,7 @@ msgstr "moderazione commento" msgid "more" msgstr "altro" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "errore nel compilare %s" @@ -604,19 +609,19 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -624,21 +629,21 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -646,7 +651,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -654,50 +659,50 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " @@ -830,7 +835,7 @@ msgstr "conferma rimozione di %s" msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "rimosso" @@ -880,7 +885,7 @@ msgstr "Selezionare l'allegato da rinominare." msgid "rename %s to %s" msgstr "rinomina %s in %s" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "aggiornamento per rinomina di %s in %s" @@ -1015,22 +1020,22 @@ msgstr "plugin" msgid "enable %s?" msgstr "abilitare %s?" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "il file di setup di questo wiki non è noto" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "principale" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" "Le sottostanti modifiche alla configurazione richiedono la ricompilazione " "del wiki." -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." @@ -1038,7 +1043,7 @@ msgstr "" "Affinché le sottostanti modifiche alla configurazione abbiano effetto, " "occorre ricostruire il wiki." -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." @@ -1048,7 +1053,7 @@ msgstr "Errore: %s è terminato con errore (%s). Modifiche al setup scartate." msgid "cannot determine id of untrusted committer %s" msgstr "impossibile determinare l'id del committer non fidato %s" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "nome file %s scorretto" @@ -1067,47 +1072,47 @@ msgstr "" "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " "allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s ha diverse pagine sorgenti possibili" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "rimozione della vecchia pagina %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1162,13 +1167,13 @@ msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1181,24 +1186,24 @@ msgstr "utilizzo: ikiwiki [opzioni] sorgente destinazione" msgid " ikiwiki --setup configfile" msgstr " ikiwiki --setup configfile" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 #, fuzzy msgid "usage: --set-yaml var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "generazione contenitori..." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." @@ -1206,39 +1211,39 @@ msgstr "aggiornamento wiki..." msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1993 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2070 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2091 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index 299c22e7f..7d2dc876b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 15:02-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -54,7 +54,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Błąd" @@ -83,51 +83,51 @@ msgstr "wpisy" msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, 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:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -136,7 +136,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "gotowe" @@ -169,19 +169,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -196,77 +196,81 @@ msgstr "" msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, fuzzy, perl-format msgid "commenting on %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:491 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:493 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:506 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:603 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:641 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:790 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -276,7 +280,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:800 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -311,9 +315,9 @@ msgstr "Strona %s nie może być edytowana" msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334 -#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390 -#: ../IkiWiki/Plugin/editpage.pm:429 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "edycja %s" @@ -328,12 +332,12 @@ msgstr "nieznaleziony szablon %s" msgid "match not specified" msgstr "nieokreślona nazwa pliku osłony" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -347,12 +351,12 @@ msgstr "" msgid "fortune failed" msgstr "awaria fortunki" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -367,22 +371,22 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -539,7 +543,7 @@ msgstr "" msgid "more" msgstr "więcej" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "awaria w trakcie kompilowania %s" @@ -616,94 +620,94 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -836,7 +840,7 @@ msgstr "" msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "" @@ -887,7 +891,7 @@ msgstr "" msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "aktualizacja stron wiki %s: %s przez użytkownika %s" @@ -1034,26 +1038,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1063,7 +1067,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, fuzzy, perl-format msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" @@ -1080,47 +1084,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1174,13 +1178,13 @@ msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1193,23 +1197,23 @@ msgstr "użycie: ikiwiki [parametry] źródło cel" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "tworzenie osłon..." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." @@ -1217,41 +1221,41 @@ msgstr "odświeżanie wiki..." msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 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:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1993 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2070 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2091 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2281 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 6288101e8..770a7e515 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 15:02-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -51,7 +51,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Fel" @@ -80,51 +80,51 @@ msgstr "inlägg" msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -133,7 +133,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "klar" @@ -166,19 +166,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -193,77 +193,81 @@ msgstr "" msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, fuzzy, perl-format msgid "commenting on %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:491 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:493 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:506 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:603 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:641 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:790 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -273,7 +277,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:800 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -308,9 +312,9 @@ msgstr "" msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334 -#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390 -#: ../IkiWiki/Plugin/editpage.pm:429 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "redigerar %s" @@ -325,12 +329,12 @@ msgstr "mallen %s hittades inte" msgid "match not specified" msgstr "filnamn för wrapper har inte angivits" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -344,12 +348,12 @@ msgstr "" msgid "fortune failed" msgstr "fortune misslyckades" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -364,22 +368,22 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -532,7 +536,7 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "misslyckades med att kompilera %s" @@ -609,94 +613,94 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -826,7 +830,7 @@ msgstr "" msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "" @@ -877,7 +881,7 @@ msgstr "" msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "uppdatering av %s, %s av %s" @@ -1021,26 +1025,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1050,7 +1054,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, fuzzy, perl-format msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" @@ -1067,47 +1071,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1161,13 +1165,13 @@ msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1180,23 +1184,23 @@ msgstr "användning: ikiwiki [flaggor] källa mål" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "genererar wrappers.." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." @@ -1204,39 +1208,39 @@ msgstr "uppdaterar wiki.." msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 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:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1993 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2070 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2091 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2281 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index 165dfc59f..e68b77676 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 15:02-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -48,7 +48,7 @@ msgstr "Tercihler kaydedildi." msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Hata" @@ -77,50 +77,50 @@ msgstr "gönderi" msgid "new" msgstr "yeni" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s için zaman aşımı (%s gün eski)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "%s için zaman aşımı" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "son güncelleme: %s" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "%s özet akışı denetleniyor ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "%s özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 msgid "feed not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "(özet akışı girdileri işlendi)" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" @@ -129,7 +129,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "" @@ -159,19 +159,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -186,77 +186,81 @@ msgstr "" msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, perl-format msgid "this comment needs %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:491 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:493 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:506 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:603 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:641 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:790 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -266,7 +270,7 @@ msgstr[1] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:800 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -301,9 +305,9 @@ msgstr "" msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334 -#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390 -#: ../IkiWiki/Plugin/editpage.pm:429 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "" @@ -316,12 +320,12 @@ msgstr "" msgid "match not specified" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 msgid "failed to process template:" msgstr "" @@ -334,11 +338,11 @@ msgstr "" msgid "fortune failed" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -352,22 +356,22 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -509,7 +513,7 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, perl-format msgid "failed to load openid module: " msgstr "" @@ -584,93 +588,93 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -799,7 +803,7 @@ msgstr "" msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "" @@ -849,7 +853,7 @@ msgstr "" msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, perl-format msgid "update for rename of %s to %s" msgstr "" @@ -984,26 +988,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1013,7 +1017,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, perl-format msgid "bad file name %s" msgstr "" @@ -1030,47 +1034,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, perl-format msgid "removing obsolete %s" msgstr "" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, perl-format msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1124,13 +1128,13 @@ msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1143,23 +1147,23 @@ msgstr "" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "" -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "" @@ -1167,39 +1171,39 @@ msgstr "" msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1993 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2070 +#: ../IkiWiki.pm:2124 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2091 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2281 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index a1aa8db55..c4422d95b 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-10 15:02-0400\n" +"POT-Creation-Date: 2010-07-22 16:50-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -52,7 +52,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1316 +#: ../IkiWiki/CGI.pm:426 ../IkiWiki/CGI.pm:427 ../IkiWiki.pm:1370 msgid "Error" msgstr "Lỗi" @@ -81,51 +81,51 @@ msgstr "bài" msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:441 +#: ../IkiWiki/Plugin/aggregate.pm:455 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:448 +#: ../IkiWiki/Plugin/aggregate.pm:462 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:475 +#: ../IkiWiki/Plugin/aggregate.pm:489 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:479 +#: ../IkiWiki/Plugin/aggregate.pm:493 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:484 +#: ../IkiWiki/Plugin/aggregate.pm:498 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:503 +#: ../IkiWiki/Plugin/aggregate.pm:517 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:514 +#: ../IkiWiki/Plugin/aggregate.pm:528 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:522 +#: ../IkiWiki/Plugin/aggregate.pm:536 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:530 +#: ../IkiWiki/Plugin/aggregate.pm:544 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:616 +#: ../IkiWiki/Plugin/aggregate.pm:630 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -134,7 +134,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:231 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 msgid "done" msgstr "xong" @@ -167,19 +167,19 @@ msgstr "" msgid "prohibited by allowed_attachments" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:141 +#: ../IkiWiki/Plugin/attachment.pm:144 msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:183 +#: ../IkiWiki/Plugin/attachment.pm:188 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/autoindex.pm:117 +#: ../IkiWiki/Plugin/autoindex.pm:120 msgid "automatic index generation" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:109 +#: ../IkiWiki/Plugin/blogspam.pm:110 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -194,77 +194,81 @@ msgstr "" msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." -#: ../IkiWiki/Plugin/comments.pm:112 +#: ../IkiWiki/Plugin/comments.pm:113 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:115 +#: ../IkiWiki/Plugin/comments.pm:116 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:136 ../IkiWiki/Plugin/format.pm:48 +#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:48 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:141 +#: ../IkiWiki/Plugin/comments.pm:142 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:196 +#: ../IkiWiki/Plugin/comments.pm:195 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:357 ../IkiWiki/Plugin/editpage.pm:98 +#: ../IkiWiki/Plugin/comments.pm:256 +msgid "Comment Moderation" +msgstr "" + +#: ../IkiWiki/Plugin/comments.pm:372 ../IkiWiki/Plugin/editpage.pm:98 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:377 #, fuzzy, perl-format msgid "commenting on %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:380 +#: ../IkiWiki/Plugin/comments.pm:395 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:387 +#: ../IkiWiki/Plugin/comments.pm:402 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:491 +#: ../IkiWiki/Plugin/comments.pm:510 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:493 +#: ../IkiWiki/Plugin/comments.pm:512 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:506 +#: ../IkiWiki/Plugin/comments.pm:525 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:510 +#: ../IkiWiki/Plugin/comments.pm:529 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:552 ../IkiWiki/Plugin/websetup.pm:272 +#: ../IkiWiki/Plugin/comments.pm:573 ../IkiWiki/Plugin/websetup.pm:268 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:603 +#: ../IkiWiki/Plugin/comments.pm:625 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:641 +#: ../IkiWiki/Plugin/comments.pm:665 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:790 +#: ../IkiWiki/Plugin/comments.pm:822 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -273,7 +277,7 @@ msgstr[0] "" #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:800 +#: ../IkiWiki/Plugin/comments.pm:832 msgid "Comment" msgstr "" @@ -308,9 +312,9 @@ msgstr "" msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:334 -#: ../IkiWiki/Plugin/editpage.pm:345 ../IkiWiki/Plugin/editpage.pm:390 -#: ../IkiWiki/Plugin/editpage.pm:429 +#: ../IkiWiki/Plugin/editpage.pm:312 ../IkiWiki/Plugin/editpage.pm:332 +#: ../IkiWiki/Plugin/editpage.pm:343 ../IkiWiki/Plugin/editpage.pm:388 +#: ../IkiWiki/Plugin/editpage.pm:430 #, perl-format msgid "editing %s" msgstr "đang sửa %s" @@ -325,12 +329,12 @@ msgstr "không tìm thấy mẫu %s" msgid "match not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" -#: ../IkiWiki/Plugin/edittemplate.pm:64 +#: ../IkiWiki/Plugin/edittemplate.pm:70 #, perl-format msgid "edittemplate %s registered for %s" msgstr "" -#: ../IkiWiki/Plugin/edittemplate.pm:125 ../IkiWiki/Plugin/inline.pm:339 +#: ../IkiWiki/Plugin/edittemplate.pm:131 ../IkiWiki/Plugin/inline.pm:339 #: ../IkiWiki/Plugin/template.pm:44 #, fuzzy msgid "failed to process template:" @@ -344,12 +348,12 @@ msgstr "" msgid "fortune failed" msgstr "fortune bị lỗi" -#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:58 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:59 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:60 +#: ../IkiWiki/Plugin/getsource.pm:66 ../IkiWiki/Plugin/goto.pm:61 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -364,22 +368,22 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:687 ../IkiWiki/Plugin/git.pm:705 -#: ../IkiWiki/Receive.pm:130 +#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:727 +#: ../IkiWiki/Plugin/git.pm:780 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:731 +#: ../IkiWiki/Plugin/git.pm:784 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:134 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 #: ../IkiWiki/Plugin/search.pm:37 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" @@ -532,7 +536,7 @@ msgstr "" msgid "more" msgstr "" -#: ../IkiWiki/Plugin/openid.pm:58 +#: ../IkiWiki/Plugin/openid.pm:70 #, fuzzy, perl-format msgid "failed to load openid module: " msgstr "lỗi biên dịch %s" @@ -609,94 +613,94 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:142 +#: ../IkiWiki/Plugin/po.pm:144 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:154 +#: ../IkiWiki/Plugin/po.pm:156 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:159 +#: ../IkiWiki/Plugin/po.pm:161 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:390 +#: ../IkiWiki/Plugin/po.pm:392 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:394 ../IkiWiki/Render.pm:769 +#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:432 +#: ../IkiWiki/Plugin/po.pm:434 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:476 +#: ../IkiWiki/Plugin/po.pm:477 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:876 +#: ../IkiWiki/Plugin/po.pm:888 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:890 +#: ../IkiWiki/Plugin/po.pm:902 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:899 +#: ../IkiWiki/Plugin/po.pm:911 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:905 +#: ../IkiWiki/Plugin/po.pm:917 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:953 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:954 +#: ../IkiWiki/Plugin/po.pm:964 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1038 +#: ../IkiWiki/Plugin/po.pm:1048 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1094 ../IkiWiki/Plugin/po.pm:1108 -#: ../IkiWiki/Plugin/po.pm:1147 +#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 +#: ../IkiWiki/Plugin/po.pm:1156 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1106 +#: ../IkiWiki/Plugin/po.pm:1115 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1159 +#: ../IkiWiki/Plugin/po.pm:1168 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -826,7 +830,7 @@ msgstr "" msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:216 +#: ../IkiWiki/Plugin/remove.pm:217 msgid "removed" msgstr "" @@ -877,7 +881,7 @@ msgstr "" msgid "rename %s to %s" msgstr "" -#: ../IkiWiki/Plugin/rename.pm:576 +#: ../IkiWiki/Plugin/rename.pm:577 #, fuzzy, perl-format msgid "update for rename of %s to %s" msgstr "cập nhật %2$s của %1$s bởi %3$s" @@ -1021,26 +1025,26 @@ msgstr "" msgid "enable %s?" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:276 +#: ../IkiWiki/Plugin/websetup.pm:272 msgid "setup file for this wiki is not known" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:292 +#: ../IkiWiki/Plugin/websetup.pm:288 msgid "main" msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:435 +#: ../IkiWiki/Plugin/websetup.pm:431 msgid "" "The configuration changes shown below require a wiki rebuild to take effect." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:439 +#: ../IkiWiki/Plugin/websetup.pm:435 msgid "" "For the configuration changes shown below to fully take effect, you may need " "to rebuild the wiki." msgstr "" -#: ../IkiWiki/Plugin/websetup.pm:476 +#: ../IkiWiki/Plugin/websetup.pm:472 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." msgstr "" @@ -1050,7 +1054,7 @@ msgstr "" msgid "cannot determine id of untrusted committer %s" msgstr "" -#: ../IkiWiki/Receive.pm:86 +#: ../IkiWiki/Receive.pm:85 #, fuzzy, perl-format msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" @@ -1067,47 +1071,47 @@ msgid "" "allow this" msgstr "" -#: ../IkiWiki/Render.pm:311 +#: ../IkiWiki/Render.pm:316 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:327 +#: ../IkiWiki/Render.pm:332 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:369 +#: ../IkiWiki/Render.pm:372 #, perl-format msgid "querying %s for file creation and modification times.." msgstr "" -#: ../IkiWiki/Render.pm:431 +#: ../IkiWiki/Render.pm:446 #, fuzzy, perl-format msgid "removing obsolete %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:505 +#: ../IkiWiki/Render.pm:520 #, fuzzy, perl-format msgid "building %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:514 +#: ../IkiWiki/Render.pm:529 #, fuzzy, perl-format msgid "removing %s, no longer built by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:597 ../IkiWiki/Render.pm:679 +#: ../IkiWiki/Render.pm:612 ../IkiWiki/Render.pm:694 #, fuzzy, perl-format msgid "building %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:692 +#: ../IkiWiki/Render.pm:707 #, fuzzy, perl-format msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:821 +#: ../IkiWiki/Render.pm:836 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1161,13 +1165,13 @@ msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:160 +#: ../IkiWiki/Wrapper.pm:198 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:180 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1180,23 +1184,23 @@ msgstr "cách sử dụng: ikiwiki [tùy chọn] nguồn đích" msgid " ikiwiki --setup configfile" msgstr "" -#: ../ikiwiki.in:96 +#: ../ikiwiki.in:105 msgid "usage: --set var=value" msgstr "" -#: ../ikiwiki.in:103 +#: ../ikiwiki.in:112 msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:157 +#: ../ikiwiki.in:166 msgid "generating wrappers.." msgstr "đang tạo ra các bộ bao bọc.." -#: ../ikiwiki.in:220 +#: ../ikiwiki.in:234 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:223 +#: ../ikiwiki.in:237 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." @@ -1204,40 +1208,40 @@ msgstr "đang làm tươi wiki.." msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:531 +#: ../IkiWiki.pm:538 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:577 +#: ../IkiWiki.pm:584 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:606 +#: ../IkiWiki.pm:614 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1298 +#: ../IkiWiki.pm:1352 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1993 +#: ../IkiWiki.pm:2047 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2070 +#: ../IkiWiki.pm:2124 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2091 +#: ../IkiWiki.pm:2145 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2281 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From 1b0bef6d49722d37eca3e871e808e46b2a1461a3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 14:14:25 -0400 Subject: template: Fix dependency tracking. Broken in version 3.20100427. template_depends was adding a dependency on the source filename, instead of on the page name when a template is a page. Such a dependency doesn't work. --- IkiWiki.pm | 7 +++++-- debian/changelog | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index 0c0b7bd4c..cfa4f5f03 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1730,12 +1730,15 @@ sub template_file ($) { my $name=shift; my $tpage=($name =~ s/^\///) ? $name : "templates/$name"; + my $template; if ($name !~ /\.tmpl$/ && exists $pagesources{$tpage}) { - $tpage=$pagesources{$tpage}; + $template=srcfile($pagesources{$tpage}, 1); $name.=".tmpl"; } + else { + $template=srcfile($tpage, 1); + } - my $template=srcfile($tpage, 1); if (defined $template) { return $template, $tpage, 1 if wantarray; return $template; diff --git a/debian/changelog b/debian/changelog index 209b170eb..c27af5615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20100723) UNRELEASED; urgency=low + + * template: Fix dependency tracking. Broken in version 3.20100427. + + -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 + ikiwiki (3.20100722) unstable; urgency=low * img: Add a margin around images displayed by this directive. -- cgit v1.2.3 From d2f56f7dea7252ce8c11b6c58049ecce515f155c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 23 Jul 2010 14:29:17 -0400 Subject: merged; notes --- debian/changelog | 2 ++ doc/plugins/po.mdwn | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c27af5615..0f6a7c810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. + * po: The po_slave_languages setting is now a list, so the order of + translated languages can be controlled. (intrigeri) -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index ddaba86f0..d70247295 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -304,6 +304,10 @@ to an array to support this. (If twere done, twere best done quickly.) >>>>> Implemented using the pipe separator, fixed the po.t test suite >>>>> accordingly. Please have a look. --[[intrigeri]] +>>>>>> Merged. I wonder if "ll: Lang" would be better than pipe? +>>>>>> Also, the compatability code for HASH is not really needed, +>>>>>> ikiwiki has not been released using a hash for it. --[[Joey]] + Pagespecs --------- -- cgit v1.2.3 From a7454c0e3220153a1f770df796e45ef1c1ee95ae Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Jul 2010 06:18:19 -0400 Subject: git: Fix gitweb historyurl examples so "diff to current" links work. (Thanks jrayhawk) --- IkiWiki/Plugin/git.pm | 2 +- debian/changelog | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index cb3437e18..899ac4a85 100644 --- a/IkiWiki/Plugin/git.pm +++ b/IkiWiki/Plugin/git.pm @@ -109,7 +109,7 @@ sub getsetup () { }, historyurl => { type => "string", - example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]]", + example => "http://git.example.com/gitweb.cgi?p=wiki.git;a=history;f=[[file]];hb=HEAD", description => "gitweb url to show file history ([[file]] substituted)", safe => 1, rebuild => 1, diff --git a/debian/changelog b/debian/changelog index 0f6a7c810..b6a783787 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. * po: The po_slave_languages setting is now a list, so the order of translated languages can be controlled. (intrigeri) + * git: Fix gitweb historyurl examples so "diff to current" links work. + (Thanks jrayhawk) -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 -- cgit v1.2.3 From dd9d117894952efb23c8b444ae27672571d6548a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 25 Jul 2010 20:18:02 -0400 Subject: meta: Allow syntax closer to html meta to be used. The idea here is that can be written like [[!meta name="foo" description="bar">. Of course, [[!meta foo=bar]] is still supported; this new feature provides some DWIM when trying to directly convert a meta tag into a meta directive. --- IkiWiki/Plugin/meta.pm | 14 +++++++++++--- debian/changelog | 1 + 2 files changed, 12 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 7d68a9b2d..d18585d3d 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -253,12 +253,20 @@ sub preprocess (@) { ' content="'.encode_entities($value).'" />'; } elsif ($key eq 'description') { - push @{$metaheaders{$page}}, ''; } + elsif ($key eq 'name') { + push @{$metaheaders{$page}}, scrub('', $destpage); + } else { - push @{$metaheaders{$page}}, scrub('', $destpage); + push @{$metaheaders{$page}}, scrub('', $destpage); } return ""; diff --git a/debian/changelog b/debian/changelog index b6a783787..167d02c6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low translated languages can be controlled. (intrigeri) * git: Fix gitweb historyurl examples so "diff to current" links work. (Thanks jrayhawk) + * meta: Allow syntax closer to html meta to be used. -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 -- cgit v1.2.3 From c401b6958af7e12c1c2c46f870691bfb0a998fd3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Jul 2010 16:24:17 -0400 Subject: Add new disable hook, allowing plugins to perform cleanup after they have been disabled. --- IkiWiki.pm | 17 ++++++++++------- IkiWiki/Plugin/skeleton.pm.example | 5 +++++ IkiWiki/Setup.pm | 24 ++++++++++++++++++++++++ debian/changelog | 2 ++ doc/plugins/write.mdwn | 7 +++++++ 5 files changed, 48 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index cfa4f5f03..e08d02922 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1596,6 +1596,12 @@ sub loadindex () { if (exists $index->{version} && ! ref $index->{version}) { $pages=$index->{page}; %wikistate=%{$index->{state}}; + # Handle plugins that got disabled by loading a new setup. + if (exists $config{setupfile}) { + require IkiWiki::Setup; + IkiWiki::Setup::disabled_plugins( + grep { ! $loaded_plugins{$_} } keys %wikistate); + } } else { $pages=$index; @@ -1663,11 +1669,7 @@ sub loadindex () { sub saveindex () { run_hooks(savestate => sub { shift->() }); - my %hookids; - foreach my $type (keys %hooks) { - $hookids{$_}=1 foreach keys %{$hooks{$type}}; - } - my @hookids=keys %hookids; + my @plugins=keys %loaded_plugins; if (! -d $config{wikistatedir}) { mkdir($config{wikistatedir}); @@ -1701,7 +1703,7 @@ sub saveindex () { } if (exists $pagestate{$page}) { - foreach my $id (@hookids) { + foreach my $id (@plugins) { foreach my $key (keys %{$pagestate{$page}{$id}}) { $index{page}{$src}{state}{$id}{$key}=$pagestate{$page}{$id}{$key}; } @@ -1710,7 +1712,8 @@ sub saveindex () { } $index{state}={}; - foreach my $id (@hookids) { + foreach my $id (@plugins) { + $index{state}{$id}={}; # used to detect disabled plugins foreach my $key (keys %{$wikistate{$id}}) { $index{state}{$id}{$key}=$wikistate{$id}{$key}; } diff --git a/IkiWiki/Plugin/skeleton.pm.example b/IkiWiki/Plugin/skeleton.pm.example index c3a3b0c01..a57a2c8fe 100644 --- a/IkiWiki/Plugin/skeleton.pm.example +++ b/IkiWiki/Plugin/skeleton.pm.example @@ -41,6 +41,7 @@ sub import { hook(type => "rename", id => "skeleton", call => \&rename); hook(type => "savestate", id => "skeleton", call => \&savestate); hook(type => "genwrapper", id => "skeleton", call => \&genwrapper); + hook(type => "disable", id => "skeleton", call => \&disable); } sub getopt () { @@ -254,4 +255,8 @@ sub genwrapper () { debug("skeleton plugin running in genwrapper"); } +sub savestate () { + debug("skeleton plugin running in disable"); +} + 1 diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 7af744f6a..f34571bcf 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -124,6 +124,28 @@ sub merge ($) { } } +sub disabled_plugins (@) { + # Handles running disable hooks of plugins that were enabled + # previously, but got disabled when a new setup file was loaded. + if (exists $config{setupfile} && @_) { + # Fork a child to load the disabled plugins. + my $pid=fork(); + if ($pid == 0) { + foreach my $plugin (@_) { + print STDERR "** plugin $plugin disabled\n"; + eval { IkiWiki::loadplugin($plugin, 1) }; + if (exists $IkiWiki::hooks{disable}{$plugin}{call}) { + eval { $IkiWiki::hooks{disable}{$plugin}{call}->() }; + } + } + exit(0); + } + else { + waitpid $pid, 0; + } + } +} + sub getsetup () { # Gets all available setup data from all plugins. Returns an # ordered list of [plugin, setup] pairs. @@ -134,6 +156,7 @@ sub getsetup () { $config{syslog}=undef; # Load all plugins, so that all setup options are available. + my %original_loaded_plugins=%IkiWiki::loaded_plugins; my @plugins=IkiWiki::listplugins(); foreach my $plugin (@plugins) { eval { IkiWiki::loadplugin($plugin, 1) }; @@ -141,6 +164,7 @@ sub getsetup () { my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() }; } } + %IkiWiki::loaded_plugins=%original_loaded_plugins; my %sections; foreach my $plugin (@plugins) { diff --git a/debian/changelog b/debian/changelog index 167d02c6f..5645b34d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * git: Fix gitweb historyurl examples so "diff to current" links work. (Thanks jrayhawk) * meta: Allow syntax closer to html meta to be used. + * Add new disable hook, allowing plugins to perform cleanup after they + have been disabled. -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn index 2e3902388..10b4df835 100644 --- a/doc/plugins/write.mdwn +++ b/doc/plugins/write.mdwn @@ -600,6 +600,13 @@ function of the ikiwiki wrapper when it is being generated. The code runs before anything else -- in particular it runs before the suid wrapper has sanitized its environment. +### disable + + hook(type => "disable", id => "foo", call => \&disable); + +This hook is only run when a previously enabled plugin gets disabled +during ikiwiki setup. Plugins can use this to perform cleanups. + ## Exported variables Several variables are exported to your plugin when you `use IkiWiki;` -- cgit v1.2.3 From fee00fdb7a4ebb52e90f739cca33def70497620e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 31 Jul 2010 15:54:25 -0400 Subject: Use Digest::SHA built into perl rather than external Digest::SHA1 to simplify dependencies. Closes: #591040 --- Bundle/IkiWiki/Extras.pm | 1 - IkiWiki/Plugin/graphviz.pm | 4 ++-- IkiWiki/Plugin/search.pm | 6 +++--- IkiWiki/Plugin/sparkline.pm | 4 ++-- debian/changelog | 2 ++ debian/control | 2 +- doc/plugins/graphviz.mdwn | 2 +- doc/plugins/search.mdwn | 2 +- doc/plugins/sparkline.mdwn | 2 +- ikiwiki.spec | 1 - 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'debian') diff --git a/Bundle/IkiWiki/Extras.pm b/Bundle/IkiWiki/Extras.pm index 5bbd7b8c6..64e907306 100644 --- a/Bundle/IkiWiki/Extras.pm +++ b/Bundle/IkiWiki/Extras.pm @@ -16,7 +16,6 @@ perl -MCPAN -e 'install Bundle::IkiWiki::Extras' =head1 CONTENTS -Digest::SHA1 Authen::Passphrase Search::Xapian RPC::XML diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index dfd66a03e..4ed8b89f1 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -37,10 +37,10 @@ sub render_graph (\%) { $src .= "}\n"; # Use the sha1 of the graphviz code as part of its filename. - eval q{use Digest::SHA1}; + eval q{use Digest::SHA}; error($@) if $@; my $dest=$params{page}."/graph-". - IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)). + IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)). ".png"; will_render($params{page}, $dest); diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm index 1cf762fce..8fb9dff0c 100644 --- a/IkiWiki/Plugin/search.pm +++ b/IkiWiki/Plugin/search.pm @@ -190,15 +190,15 @@ sub pageterm ($) { # 240 is the number used by omindex to decide when to hash an # overlong term. This does not use a compatible hash method though. if (length $page > 240) { - eval q{use Digest::SHA1}; + eval q{use Digest::SHA}; if ($@) { - debug("search: ".sprintf(gettext("need Digest::SHA1 to index %s"), $page)) if $@; + debug("search: ".sprintf(gettext("need Digest::SHA to index %s"), $page)) if $@; return undef; } # Note no colon, therefore it's guaranteed to not overlap # with a page with the same name as the hash.. - return "U".lc(Digest::SHA1::sha1_hex($page)); + return "U".lc(Digest::SHA::sha1_hex($page)); } else { return "U:".$page; diff --git a/IkiWiki/Plugin/sparkline.pm b/IkiWiki/Plugin/sparkline.pm index 1b1d04cba..e28d2605a 100644 --- a/IkiWiki/Plugin/sparkline.pm +++ b/IkiWiki/Plugin/sparkline.pm @@ -122,10 +122,10 @@ sub preprocess (@) { # Use the sha1 of the php code that generates the sparkline as # the base for its filename. - eval q{use Digest::SHA1}; + eval q{use Digest::SHA}; error($@) if $@; my $fn=$params{page}."/sparkline-". - IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($php)). + IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($php)). ".png"; will_render($params{page}, $fn); diff --git a/debian/changelog b/debian/changelog index 5645b34d4..25123cecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * meta: Allow syntax closer to html meta to be used. * Add new disable hook, allowing plugins to perform cleanup after they have been disabled. + * Use Digest::SHA built into perl rather than external Digest::SHA1 + to simplify dependencies. Closes: #591040 -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/debian/control b/debian/control index 0562a4a99..049a685b0 100644 --- a/debian/control +++ b/debian/control @@ -34,7 +34,7 @@ Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, - libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, + libtext-csv-perl, graphviz, libnet-amazon-s3-perl, libsparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl, libhighlight-perl, po4a (>= 0.35-1), gettext, libyaml-perl diff --git a/doc/plugins/graphviz.mdwn b/doc/plugins/graphviz.mdwn index 65130ae8c..d57d7dc94 100644 --- a/doc/plugins/graphviz.mdwn +++ b/doc/plugins/graphviz.mdwn @@ -22,4 +22,4 @@ Some example graphs: [[!graph src="a -- b -- c -- a;" prog="circo" type="graph"]] """]] -This plugin uses the [[!cpan Digest::SHA1]] perl module. +This plugin uses the [[!cpan Digest::SHA]] perl module. diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn index 92cc5945a..e95739cf3 100644 --- a/doc/plugins/search.mdwn +++ b/doc/plugins/search.mdwn @@ -4,7 +4,7 @@ This plugin adds full text search to ikiwiki, using the [xapian](http://xapian.org/) engine, its [omega](http://xapian.org/docs/omega/overview.html) frontend, and the -[[!cpan Search::Xapian]], [[!cpan Digest::SHA1]], and [[!cpan HTML::Scrubber]] +[[!cpan Search::Xapian]], [[!cpan Digest::SHA]], and [[!cpan HTML::Scrubber]] perl modules. The [[ikiwiki/searching]] page describes how to write search queries. diff --git a/doc/plugins/sparkline.mdwn b/doc/plugins/sparkline.mdwn index ee3928d7e..83e24a27d 100644 --- a/doc/plugins/sparkline.mdwn +++ b/doc/plugins/sparkline.mdwn @@ -16,7 +16,7 @@ to use the plugin, you will need: php can find it when `sparkline/Sparkline.php` is required. * The GD PHP module used by the Sparkline library. * A "php" program in the path, that can run standalone php programs. -* [[!cpan Digest::SHA1]] +* [[!cpan Digest::SHA]] On a Debian system, this can be accomplished by installing these packages: `libsparkline-php` `php5-gd` `php5-cli` `libdigest-sha1-perl` diff --git a/ikiwiki.spec b/ikiwiki.spec index 43065b7f5..ca5794704 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -31,7 +31,6 @@ Requires: perl(HTML::Scrubber) Requires: perl(XML::Simple) Requires: perl(CGI::FormBuilder) Requires: perl(CGI::Session) -Requires: perl(Digest::SHA1) Requires: python-docutils -- cgit v1.2.3 From 5d88146861ac237ac89cbed2e90a985b9c3bfdc2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Aug 2010 08:24:47 -0400 Subject: Fixes a bug that prevented matching deleted pages when using the page() PageSpec. --- IkiWiki.pm | 15 +++++++++------ debian/changelog | 2 ++ ...t_post__34___deletion_does_not_refresh_front_page.mdwn | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki.pm b/IkiWiki.pm index e08d02922..df8abe2c2 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2439,13 +2439,16 @@ sub match_internal ($$;@) { sub match_page ($$;@) { my $page=shift; my $match=match_glob($page, shift, @_); - if ($match && ! (exists $IkiWiki::pagesources{$page} - && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) { - return IkiWiki::FailReason->new("$page is not a page"); - } - else { - return $match; + if ($match) { + my $source=exists $IkiWiki::pagesources{$page} ? + $IkiWiki::pagesources{$page} : + $IkiWiki::delpagesources{$page}; + my $type=defined $source ? IkiWiki::pagetype($source) : undef; + if (! defined $type) { + return IkiWiki::FailReason->new("$page is not a page"); + } } + return $match; } sub match_link ($$;@) { diff --git a/debian/changelog b/debian/changelog index 25123cecc..5c0064845 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low have been disabled. * Use Digest::SHA built into perl rather than external Digest::SHA1 to simplify dependencies. Closes: #591040 + * Fixes a bug that prevented matching deleted pages when using the page() + PageSpec. -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 diff --git a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn index 78009da75..2367335a7 100644 --- a/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn +++ b/doc/bugs/__34__First_post__34___deletion_does_not_refresh_front_page.mdwn @@ -3,4 +3,4 @@ Deleting that post removed it, but the front page did not get the re-generated, --[[liw]] > This is a bug involving the `page()` pagespec. Deleted -> pages matching this pagespec are not noticed. --[[Joey]] +> pages matching this pagespec are not noticed. --[[Joey]] [[done]] -- cgit v1.2.3 From 522f3d1d651892e7914ef43b9c33e7d062c9e0ae Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Aug 2010 09:26:43 -0400 Subject: releasing version 3.20100804 --- debian/changelog | 4 +-- ikiwiki.spec | 2 +- po/bg.po | 95 ++++++++++++++++++++++++++++-------------------------- po/cs.po | 97 +++++++++++++++++++++++++++++--------------------------- po/da.po | 97 +++++++++++++++++++++++++++++--------------------------- po/de.po | 97 +++++++++++++++++++++++++++++--------------------------- po/es.po | 97 +++++++++++++++++++++++++++++--------------------------- po/fr.po | 97 +++++++++++++++++++++++++++++--------------------------- po/gu.po | 95 ++++++++++++++++++++++++++++-------------------------- po/ikiwiki.pot | 95 ++++++++++++++++++++++++++++-------------------------- po/it.po | 97 +++++++++++++++++++++++++++++--------------------------- po/pl.po | 95 ++++++++++++++++++++++++++++-------------------------- po/sv.po | 95 ++++++++++++++++++++++++++++-------------------------- po/tr.po | 95 ++++++++++++++++++++++++++++-------------------------- po/vi.po | 95 ++++++++++++++++++++++++++++-------------------------- 15 files changed, 659 insertions(+), 594 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5c0064845..8223074f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20100723) UNRELEASED; urgency=low +ikiwiki (3.20100804) unstable; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. * po: The po_slave_languages setting is now a list, so the order of @@ -13,7 +13,7 @@ ikiwiki (3.20100723) UNRELEASED; urgency=low * Fixes a bug that prevented matching deleted pages when using the page() PageSpec. - -- Joey Hess Fri, 23 Jul 2010 14:00:32 -0400 + -- Joey Hess Wed, 04 Aug 2010 09:20:52 -0400 ikiwiki (3.20100722) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index ca5794704..99de59fb8 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20100722 +Version: 3.20100804 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index c9fd77b8f..8534c6d85 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -134,7 +134,7 @@ msgstr "създаване на нова страницa „%s”" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "готово" @@ -369,23 +369,23 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" @@ -520,7 +520,7 @@ msgstr "шаблонът „%s” не е намерен" msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -617,94 +617,99 @@ msgstr "модулът „RPC::XML::Client” не е намерен; източ msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -901,12 +906,12 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1156,27 +1161,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "генериране на обвивки..." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "„%s” не е изпълним файл" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "не може да бъде създадена обвивка, която използва файл за настройки" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "не е указан файл на обвивката" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "крешка при компилиране на файла %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "успешно генериране на %s" @@ -1197,15 +1206,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "генериране на обвивки..." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." @@ -1233,21 +1238,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 06e351841..11f1d05ed 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -133,7 +133,7 @@ msgstr "vytvářím novou stránku %s" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "hotovo" @@ -366,23 +366,23 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" @@ -504,7 +504,7 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -601,40 +601,45 @@ msgstr "LWP nebyl nalezen, nepinkám" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "varování: rozpoznána stará verze po4a, doporučen přechod na 0.35." -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s není platným kódem jazyka" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s není platnou hodnotou parametru po_link_to, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "znovusestavuji všechny stránky, aby se opravily meta nadpisy" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -642,7 +647,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -650,50 +655,50 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " @@ -889,12 +894,12 @@ msgstr "nepodařilo se přečíst %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "pro indexování %s je potřeba Digest::SHA1" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "hledání" @@ -1141,27 +1146,31 @@ msgstr "nepodařilo se nastavit repositář pomocí ikiwiki-makerepo" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktivuji modul %s, protože selhává s touto hláškou:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "generuji obaly..." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s není spustitelný soubor" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "nemohu vytvořit obal, který využívá soubor setup" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "jméno souboru s obalem nebylo zadáno" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "nelze zkompilovat %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "%s byl úspěšně vytvořen" @@ -1183,15 +1192,11 @@ msgstr "použití: --set proměnná=hodnota" msgid "usage: --set-yaml var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "generuji obaly..." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "obnovuji wiki..." @@ -1217,21 +1222,21 @@ msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index cb550fa4f..c3178a7ea 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2009-07-23 01:07+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -137,7 +137,7 @@ msgstr "opretter ny side %s" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "færdig" @@ -374,23 +374,23 @@ msgstr "kan ikke få sider til at passe sammen: %s" msgid "%s is an attachment, not a page." msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" @@ -517,7 +517,7 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 #, fuzzy msgid "sort=meta requires a parameter" msgstr "kræver 'from'- og 'to'-parametre" @@ -615,12 +615,17 @@ msgstr "LWP ikke fundet, pinger ikke" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s er ikke en gyldig sprogkode" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -628,7 +633,7 @@ msgstr "" "%s er ikke en gyldig værdi for po_link_to, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -636,21 +641,21 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "gendanner alle sider for at korrigere meta titler" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -658,7 +663,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -666,50 +671,50 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" @@ -904,12 +909,12 @@ msgstr "læsning af %s mislykkedes" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "behøver Digest::SHA1 til indeks %s" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "søg" @@ -1156,27 +1161,31 @@ msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "** Deaktiverer udvidelse %s, da den fejler med denne besked:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "bygger wrappers.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s ser ikke ud til at kunne afvikles" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "kan ikke oprette en wrapper som bruger en opsætningsfil" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "wrapper-navn ikke angivet" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "kompilering af %s mislykkedes" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "Korrekt bygget %s" @@ -1198,15 +1207,11 @@ msgstr "brug: --set var=værdi" msgid "usage: --set-yaml var=value" msgstr "brug: --set var=værdi" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "bygger wrappers.." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1233,21 +1238,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index a47add580..dc3f447f5 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -134,7 +134,7 @@ msgstr "erstelle neue Seite %s" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "fertig" @@ -368,23 +368,23 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" @@ -513,7 +513,7 @@ msgstr "Umleitungsseite nicht gefunden" msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -611,12 +611,17 @@ msgstr "LWP nicht gefunden, führe Ping nicht aus" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "Warnung: Altes po4a erkannt! Empfehle Aktualisierung auf 0.35" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s ist keine gültige Sprachkodierung" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -624,7 +629,7 @@ msgstr "" "%s ist kein gültiger Wert für po_link_to, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -632,21 +637,21 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "um die meta-titeln zu reparieren werden alle Seiten neu erstellt" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -654,7 +659,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -662,50 +667,50 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " @@ -903,12 +908,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s" msgid "rsync_command exited %d" msgstr "rsync_command gibt Fehler %d zurück" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "suchen" @@ -1161,27 +1166,31 @@ msgstr "" "** Erweiterung %s wurde ausgeschaltet, weil sie mit der folgenden Meldung " "fehlgeschlagen ist:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "erzeuge Wrapper.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s scheint nicht ausführbar zu sein" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "Kann keinen Wrapper erzeugen, der eine Einrichtungsdatei verwendet" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "Dateiname des Wrappers nicht angegeben" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "erzeugen von %s fehlgeschlagen" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "%s wurde erfolgreich erstellt" @@ -1203,15 +1212,11 @@ msgstr "Aufruf: --set Variable=Wert" msgid "usage: --set-yaml var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "erzeuge Wrapper.." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." @@ -1240,21 +1245,21 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index d9155a921..c7ec94678 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -139,7 +139,7 @@ msgstr "creando nueva página %s" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "completado" @@ -376,23 +376,23 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" @@ -521,7 +521,7 @@ msgstr "falta la página a donde redirigir" msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -623,94 +623,99 @@ msgstr "No he encontrado el componente LWP, no envío señal alguna" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -904,12 +909,12 @@ msgstr "no puedo leer de %s: %s " msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "se necesita la instalación de Digest::SHA1 para indexar %s" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "buscar" @@ -1165,28 +1170,32 @@ msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" "** Desactivando el complemento %s dado que está fallando con este mensaje:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "generando programas auxiliares.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "el programa %s no parece ser ejecutable" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "" "no puedo crear un programa envoltorio que utiliza un archivo de configuración" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, 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:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "creado con éxito el programa envoltorio %s" @@ -1208,15 +1217,11 @@ msgstr "uso: --set variable=valor" msgid "usage: --set-yaml var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "generando programas auxiliares.." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "actualizando el wiki.." @@ -1246,21 +1251,21 @@ msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index a080dcd34..e961ba0fa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2010-07-17 18:13+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -135,7 +135,7 @@ msgstr "Création de la nouvelle page %s" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "Terminé" @@ -367,23 +367,23 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." @@ -510,7 +510,7 @@ msgstr "Page de redirection introuvable" msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 #, fuzzy msgid "sort=meta requires a parameter" msgstr "les paramètres « from » et « to » sont nécessaires." @@ -612,12 +612,17 @@ msgstr "" "Note : ancienne version de po4a détectée. Il est recommandé d'installer la " "version 0.35." -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s n'est pas un code de langue valable" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" @@ -625,7 +630,7 @@ msgstr "" "%s n'est pas une valeur correcte pour po_link_to, retour à la valeur par " "défaut." -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -633,23 +638,23 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" "Reconstruction de toutes les pages pour corriger les titres (greffon " "« meta »)." -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -657,7 +662,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -665,50 +670,50 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " @@ -906,12 +911,12 @@ msgstr "Impossible d'exécuter la commande rsync : %s" msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "recherche" @@ -1163,28 +1168,32 @@ msgstr "" "** Désactivation du greffon %s, l'installation a échoué avec le message " "suivant :" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "Création des fichiers CGI..." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s ne semble pas être exécutable" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "" "Impossible de créer un fichier CGI utilisant un fichier de configuration" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "Le nom du fichier CGI n'a pas été indiqué" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "Échec de la compilation de %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "%s a été créé avec succès" @@ -1206,15 +1215,11 @@ msgstr "Syntaxe : -- set var=valeur" msgid "usage: --set-yaml var=value" msgstr "Syntaxe : -- set var=valeur" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "Création des fichiers CGI..." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." @@ -1241,21 +1246,21 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" diff --git a/po/gu.po b/po/gu.po index 8e796f51f..fbeea1492 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -132,7 +132,7 @@ msgstr "નવું પાનું %s બનાવે છે" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "સંપૂર્ણ" @@ -367,23 +367,23 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" @@ -510,7 +510,7 @@ msgstr "ફીડ મળ્યું નહી" msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -607,94 +607,99 @@ msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવા msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -891,12 +896,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1143,27 +1148,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "આવરણ બનાવે છે.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s એ ચલાવી શકાય તેમ લાગતું નથી" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "ગોઠવણ ફાઇલનો ઉપયોગ કરે છે તેનું આવરણ બનાવી શકાતું નથી" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "આવરણ ફાઇલનામ સ્પષ્ટ કરેલ નથી" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "સફળતાપૂર્વક પેદા કરેલ છે %s" @@ -1184,15 +1193,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "આવરણ બનાવે છે.." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." @@ -1218,21 +1223,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index e42195ecb..9d311a5ad 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -133,7 +133,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "" @@ -360,23 +360,23 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -497,7 +497,7 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -592,93 +592,98 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -872,12 +877,12 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1118,27 +1123,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "" + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1159,15 +1168,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "" - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "" @@ -1193,21 +1198,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 8ebf695f4..3fda6d221 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -132,7 +132,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "fatto" @@ -365,23 +365,23 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" @@ -507,7 +507,7 @@ msgstr "pagina di reindirizzamento non trovata" msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -609,19 +609,24 @@ msgstr "" "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " "alla versione 0.35." -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "%s non è una codifica di lingua valida" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" @@ -629,21 +634,21 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -651,7 +656,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -659,50 +664,50 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " @@ -900,12 +905,12 @@ msgstr "impossibile leggere %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 -#, perl-format -msgid "need Digest::SHA1 to index %s" +#: ../IkiWiki/Plugin/search.pm:195 +#, fuzzy, perl-format +msgid "need Digest::SHA to index %s" msgstr "è necessario Digest::SHA1 per l'indice di %s" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "cerca" @@ -1153,27 +1158,31 @@ msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "generazione contenitori..." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s non sembra essere eseguibile" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "impossibile creare un contenitore che utilizzi un file di setup" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "nome del file del contenitore non specificato" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "errore nel compilare %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "%s generato con successo" @@ -1195,15 +1204,11 @@ msgstr "utilizzo: --set var=valore" msgid "usage: --set-yaml var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "generazione contenitori..." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." @@ -1229,21 +1234,21 @@ msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index 7d2dc876b..e93753abd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -136,7 +136,7 @@ msgstr "tworzenie nowej strony %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "gotowe" @@ -371,23 +371,23 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" @@ -523,7 +523,7 @@ msgstr "nieznaleziony kanał RSS" msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -620,94 +620,99 @@ msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, fuzzy, perl-format msgid "%s is not a valid language code" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -906,12 +911,12 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1164,27 +1169,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "tworzenie osłon..." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "osłona %s nie jest wykonywalna" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "awaria w trakcie tworzenia osłony używającej pliku konfiguracyjnego" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "nieokreślona nazwa pliku osłony" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "awaria w trakcie kompilowania %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "pomyślnie utworzono %s" @@ -1205,15 +1214,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "tworzenie osłon..." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." @@ -1241,21 +1246,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 770a7e515..fee2693e2 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -133,7 +133,7 @@ msgstr "skapar nya sidan %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "klar" @@ -368,23 +368,23 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" @@ -516,7 +516,7 @@ msgstr "mallen %s hittades inte" msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -613,94 +613,99 @@ msgstr "RPC::XML::Client hittades inte, pingar inte" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -896,12 +901,12 @@ msgstr "misslyckades med att skriva %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1151,27 +1156,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "genererar wrappers.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "%s verkar inte vara körbar" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "kan inte skapa en wrapper som använder en konfigurationsfil" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "filnamn för wrapper har inte angivits" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "misslyckades med att kompilera %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "generering av %s lyckades" @@ -1192,15 +1201,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "genererar wrappers.." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." @@ -1226,21 +1231,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index e68b77676..e1c5f03b5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -129,7 +129,7 @@ msgstr "%s için yeni sayfa oluşturuluyor" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "" @@ -356,23 +356,23 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" @@ -493,7 +493,7 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -588,93 +588,98 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -868,12 +873,12 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1114,27 +1119,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "" + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "" @@ -1155,15 +1164,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "" - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "" @@ -1189,21 +1194,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index c4422d95b..b22f16418 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-22 16:50-0400\n" +"POT-Creation-Date: 2010-08-04 09:22-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -134,7 +134,7 @@ msgstr "đang tạo trang mới %s" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:245 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:229 msgid "done" msgstr "xong" @@ -368,23 +368,23 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:740 ../IkiWiki/Plugin/git.pm:758 +#: ../IkiWiki/Plugin/git.pm:742 ../IkiWiki/Plugin/git.pm:760 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:780 +#: ../IkiWiki/Plugin/git.pm:782 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:784 +#: ../IkiWiki/Plugin/git.pm:786 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:136 -#: ../IkiWiki/Plugin/search.pm:37 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/po.pm:137 +#: ../IkiWiki/Plugin/search.pm:38 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" @@ -516,7 +516,7 @@ msgstr "không tìm thấy mẫu %s" msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:387 +#: ../IkiWiki/Plugin/meta.pm:395 msgid "sort=meta requires a parameter" msgstr "" @@ -613,94 +613,99 @@ msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:144 +#: ../IkiWiki/Plugin/po.pm:147 +#, perl-format +msgid "%s has invalid syntax: must use CODE|NAME" +msgstr "" + +#: ../IkiWiki/Plugin/po.pm:166 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:156 +#: ../IkiWiki/Plugin/po.pm:178 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:161 +#: ../IkiWiki/Plugin/po.pm:183 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:392 +#: ../IkiWiki/Plugin/po.pm:414 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "" -#: ../IkiWiki/Plugin/po.pm:396 ../IkiWiki/Render.pm:784 +#: ../IkiWiki/Plugin/po.pm:418 ../IkiWiki/Render.pm:784 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Plugin/po.pm:434 +#: ../IkiWiki/Plugin/po.pm:456 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:457 +#: ../IkiWiki/Plugin/po.pm:479 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:477 +#: ../IkiWiki/Plugin/po.pm:499 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:888 +#: ../IkiWiki/Plugin/po.pm:924 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:902 +#: ../IkiWiki/Plugin/po.pm:938 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:911 +#: ../IkiWiki/Plugin/po.pm:947 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:917 +#: ../IkiWiki/Plugin/po.pm:953 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:953 +#: ../IkiWiki/Plugin/po.pm:989 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:1000 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1048 +#: ../IkiWiki/Plugin/po.pm:1079 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 ../IkiWiki/Plugin/po.pm:1117 -#: ../IkiWiki/Plugin/po.pm:1156 +#: ../IkiWiki/Plugin/po.pm:1136 ../IkiWiki/Plugin/po.pm:1148 +#: ../IkiWiki/Plugin/po.pm:1187 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1115 +#: ../IkiWiki/Plugin/po.pm:1146 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1168 +#: ../IkiWiki/Plugin/po.pm:1199 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" @@ -896,12 +901,12 @@ msgstr "lỗi ghi %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:194 +#: ../IkiWiki/Plugin/search.pm:195 #, perl-format -msgid "need Digest::SHA1 to index %s" +msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:231 +#: ../IkiWiki/Plugin/search.pm:232 msgid "search" msgstr "" @@ -1151,27 +1156,31 @@ msgstr "" msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" -#: ../IkiWiki/Wrapper.pm:16 +#: ../IkiWiki/Wrapper.pm:12 +msgid "generating wrappers.." +msgstr "đang tạo ra các bộ bao bọc.." + +#: ../IkiWiki/Wrapper.pm:36 #, perl-format msgid "%s doesn't seem to be executable" msgstr "có vẻ là %s không phải có khả năng thực hiện" -#: ../IkiWiki/Wrapper.pm:20 +#: ../IkiWiki/Wrapper.pm:40 msgid "cannot create a wrapper that uses a setup file" msgstr "không thể tạo bộ bao bọc sử dụng tập tin thiết lập" -#: ../IkiWiki/Wrapper.pm:24 +#: ../IkiWiki/Wrapper.pm:44 msgid "wrapper filename not specified" msgstr "chưa xác định tên tập tin bộ bao bọc" #. translators: The parameter is a C filename. -#: ../IkiWiki/Wrapper.pm:198 +#: ../IkiWiki/Wrapper.pm:218 #, perl-format msgid "failed to compile %s" msgstr "lỗi biên dịch %s" #. translators: The parameter is a filename. -#: ../IkiWiki/Wrapper.pm:218 +#: ../IkiWiki/Wrapper.pm:238 #, perl-format msgid "successfully generated %s" msgstr "%s đã được tạo ra" @@ -1192,15 +1201,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:166 -msgid "generating wrappers.." -msgstr "đang tạo ra các bộ bao bọc.." - -#: ../ikiwiki.in:234 +#: ../ikiwiki.in:218 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:237 +#: ../ikiwiki.in:221 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." @@ -1227,21 +1232,21 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:2047 +#: ../IkiWiki.pm:2053 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2124 +#: ../IkiWiki.pm:2130 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2145 +#: ../IkiWiki.pm:2151 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2281 +#: ../IkiWiki.pm:2287 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From 51d5e546974405741e08ed27d0bf89958fa7366b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Aug 2010 13:18:59 -0400 Subject: filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. --- IkiWiki/Plugin/filecheck.pm | 25 +++++++++++++++++++------ debian/changelog | 7 +++++++ doc/plugins/filecheck.mdwn | 3 ++- 3 files changed, 28 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm index d00b6dfd3..a78058ffe 100644 --- a/IkiWiki/Plugin/filecheck.pm +++ b/IkiWiki/Plugin/filecheck.pm @@ -132,15 +132,28 @@ sub match_mimetype ($$;@) { return IkiWiki::ErrorReason->new("file does not exist"); } - # Use ::magic to get the mime type, the idea is to only trust - # data obtained by examining the actual file contents. + # Get the mime type. + # + # First, try File::Mimeinfo. This is fast, but doesn't recognise + # all files. eval q{use File::MimeInfo::Magic}; - if ($@) { - return IkiWiki::ErrorReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type"); + my $mimeinfo_ok=! $@; + my $mimetype; + if ($mimeinfo_ok) { + my $mimetype=File::MimeInfo::Magic::magic($file); } - my $mimetype=File::MimeInfo::Magic::magic($file); + + # Fall back to using file, which has a more complete + # magic database. if (! defined $mimetype) { - $mimetype=File::MimeInfo::Magic::default($file); + open(my $file_h, "-|", "file", "-bi", $file); + $mimetype=<$file_h>; + close $file_h; + } + if (! defined $mimetype || $mimetype !~s /;.*//) { + # Fall back to default value. + $mimetype=File::MimeInfo::Magic::default($file) + if $mimeinfo_ok; if (! defined $mimetype) { $mimetype="unknown"; } diff --git a/debian/changelog b/debian/changelog index 8223074f3..440bee34f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20100805) UNRELEASED; urgency=low + + * filecheck: Fall back to using the file command if the freedesktop + magic file cannot identify a file. + + -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 + ikiwiki (3.20100804) unstable; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. diff --git a/doc/plugins/filecheck.mdwn b/doc/plugins/filecheck.mdwn index e5f68b29c..b038bc433 100644 --- a/doc/plugins/filecheck.mdwn +++ b/doc/plugins/filecheck.mdwn @@ -7,7 +7,8 @@ status. These tests are mostly useful for the [[attachment]] plugin, and are documented [[here|ikiwiki/pagespec/attachment]]. This plugin will use the [[!cpan File::MimeInfo::Magic]] perl module, if -available, for mimetype checking. +available, for mimetype checking. It falls back to using the `file` command +if necessary for hard to detect files. The `virusfree` [[PageSpec|ikiwiki/pagespec/attachment]] requires that ikiwiki be configured with a virus scanner program via the `virus_checker` -- cgit v1.2.3 From 80102c042d0f2fd194222cd233a7bfd0e8bd467f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 12 Aug 2010 16:53:52 -0400 Subject: flattr: New plugin. Thanks to jaywalk for the initial implementation at a flattr plugin! This one is less configurable, but simpler. --- IkiWiki/Plugin/flattr.pm | 97 +++++++++++++++++++++++++++++++++++++++ debian/changelog | 2 + doc/ikiwiki/directive/flattr.mdwn | 45 ++++++++++++++++++ doc/plugins/contrib/flattr.mdwn | 3 ++ doc/plugins/flattr.mdwn | 9 ++++ doc/style.css | 4 ++ 6 files changed, 160 insertions(+) create mode 100644 IkiWiki/Plugin/flattr.pm create mode 100644 doc/ikiwiki/directive/flattr.mdwn create mode 100644 doc/plugins/flattr.mdwn (limited to 'debian') diff --git a/IkiWiki/Plugin/flattr.pm b/IkiWiki/Plugin/flattr.pm new file mode 100644 index 000000000..3aee1eb93 --- /dev/null +++ b/IkiWiki/Plugin/flattr.pm @@ -0,0 +1,97 @@ +#!/usr/bin/perl +package IkiWiki::Plugin::flattr; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "flattr", call => \&getsetup); + hook(type => "preprocess", id => "flattr", call => \&preprocess); + hook(type => "format", id => "flattr", call => \&format); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, + flattr_userid => { + type => "string", + example => 'joeyh', + description => "userid or user name to use by default for Flattr buttons", + advanced => 0, + safe => 1, + rebuild => undef, + }, +} + +my %flattr_pages; + +sub preprocess (@) { + my %params=@_; + + $flattr_pages{$params{destpage}}=1; + + my $url=$params{url}; + if (! defined $url) { + $url=urlto($params{page}, "", 1); + } + + my @fields; + foreach my $field (qw{language uid button hidden category tags}) { + if (exists $params{$field}) { + push @fields, "$field:$params{$field}"; + } + } + + return ''. + (exists $params{description} ? $params{description} : ''). + ''; +} + +sub format (@) { + my %params=@_; + + # Add flattr's javascript to pages with flattr buttons. + if ($flattr_pages{$params{page}}) { + if (! ($params{content}=~s!^(]*>)!$1.flattrjs()!em)) { + # no tag, probably in preview mode + $params{content}=flattrjs().$params{content}; + } + } + return $params{content}; +} + +my $js_cached; +sub flattrjs { + return $js_cached if defined $js_cached; + + my $js_url='https://api.flattr.com/js/0.5.0/load.js?mode=auto'; + if (defined $config{flattr_userid}) { + my $userid=$config{flattr_userid}; + $userid=~s/[^-A-Za-z0-9_]//g; # sanitize for inclusion in javascript + $js_url.="&uid=$userid"; + } + + # This is Flattr's standard javascript snippet to include their + # external javascript file, asynchronously. + return $js_cached=<<"EOF"; + +EOF +} + +1 diff --git a/debian/changelog b/debian/changelog index 440bee34f..f90fd8855 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low * filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. + * flattr: New plugin. (Thanks to jaywalk for the initial implementation + at a flattr plugin! This one is less configurable, but simpler.) -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 diff --git a/doc/ikiwiki/directive/flattr.mdwn b/doc/ikiwiki/directive/flattr.mdwn new file mode 100644 index 000000000..5083005ce --- /dev/null +++ b/doc/ikiwiki/directive/flattr.mdwn @@ -0,0 +1,45 @@ +The `flattr` directive is supplied by the [[!iki plugins/flattr desc=flattr]] plugin. + +This directive allows easily inserting Flattr buttons onto wiki pages. + +Flattr supports both static buttons and javascript buttons. This directive +only creates dynamic javascript buttons. If you want to insert a static +Flattr button, you can simply copy the html code for it from Flattr, instead. +Note that this directive inserts javascript code into the page, that +loads more javascript code from Flattr.com. So only use it if you feel +comfortable with that. + +The directive can be used to display a button for a thing you have already +manually submitted to Flattr. In this mode, the only parameter you need to +include is the exact url to the thing that was submitted to Flattr. +(If the button is for the current page, you can leave that out.) For +example, this is the Flattr button for ikiwiki. Feel free to add it to all +your pages. ;) + + \[[!flattr url="http://ikiwiki.info/" button=compact]] + +The directive can also be used to create a button that automatically +submits a page to Flattr when a user clicks on it. In this mode you +need to include parameters to specify your uid, and a title, category, tags, +and description for the page. For example, this is a Flattr button for +a blog post: + + \[[!flattr uid=25634 title="my new blog post" category=text + tags="blog,example" description="This is a post on my blog."]] + +Here are all possible parameters you can pass to the Flattr directive. + +* `button` - Set to "compact" for a small button. +* `url` - The url to the thing to be Flattr'd. If omitted, defaults + to the url of the current page. +* `uid` - Your numeric Flattr userid. Not needed if the flattr plugin + has been configured with a global `flattr_userid`. +* `title` - A short title for the thing, to show on its Flattr page. +* `description` - A description of the thing, to show on its Flattr + page. +* `category` - One of: text, images, video, audio, software, rest. +* `tags` - A list of tags separated by a comma. +* `language` - A language code. +* `hidden` - Set to 1 to hide the button from listings on Flattr.com. + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/flattr.mdwn b/doc/plugins/contrib/flattr.mdwn index f8f005c31..e9b4bf857 100644 --- a/doc/plugins/contrib/flattr.mdwn +++ b/doc/plugins/contrib/flattr.mdwn @@ -10,6 +10,9 @@ I wrote some notes on [jonatan.walck.se](http://jonatan.walck.se/software/ikiwik This plugin is licensed under [CC0](http://creativecommons.org/publicdomain/zero/1.0/) (public domain). +Note that there is now a [[plugins/flattr]] plugin bundled with ikiwiki. It +is less configurable, not supporting static buttons, but simpler to use. + # Usage # # [[!flattr args]] where args are in the form of arg=value. diff --git a/doc/plugins/flattr.mdwn b/doc/plugins/flattr.mdwn new file mode 100644 index 000000000..5da279518 --- /dev/null +++ b/doc/plugins/flattr.mdwn @@ -0,0 +1,9 @@ +[[!template id=plugin name=flattr author="[[Joey]]"]] +[[!tag type/web]] + +[Flattr](http://flattr.com/) is a social micropayment platform. +This plugin allows easily adding Flattr buttons to pages, +using the [[ikiwiki/directive/flattr]] directive. + +This plugin has a configuration setting. `flattr_userid` can be set +to either your numeric flatter userid, or your flattr username. diff --git a/doc/style.css b/doc/style.css index 8dd3b1c15..66d962bd6 100644 --- a/doc/style.css +++ b/doc/style.css @@ -449,6 +449,10 @@ li.L8 { list-style: upper-alpha; } background: #ff9900; } +.FlattrButton { + display: none; +} + /* openid selector */ #openid_choice { display: none; -- cgit v1.2.3 From d03e691c506e18a2e93ca653e6821b2fa02caa9f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Aug 2010 17:59:36 -0400 Subject: changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f90fd8855..834dbd265 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low magic file cannot identify a file. * flattr: New plugin. (Thanks to jaywalk for the initial implementation at a flattr plugin! This one is less configurable, but simpler.) + * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 -- cgit v1.2.3 From 5664401fbcd0694539ec8274d2df11b3e5db1e48 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Aug 2010 11:38:39 -0400 Subject: Fix po test suite to not assume ikiwiki's underlay is already installed. Closes: #593047 --- debian/changelog | 2 ++ t/po.t | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 834dbd265..7f3ea7290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.20100805) UNRELEASED; urgency=low * flattr: New plugin. (Thanks to jaywalk for the initial implementation at a flattr plugin! This one is less configurable, but simpler.) * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) + * Fix po test suite to not assume ikiwiki's underlay is already installed. + Closes: #593047 -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 diff --git a/t/po.t b/t/po.t index 444743cac..1cd18c317 100755 --- a/t/po.t +++ b/t/po.t @@ -31,6 +31,9 @@ my $dir = tempdir("ikiwiki-test-po.XXXXXXXXXX", %config=IkiWiki::defaultconfig(); $config{srcdir} = "$dir/src"; $config{destdir} = "$dir/dst"; +$config{destdir} = "$dir/dst"; +$config{underlaydirbase} = "/dev/null"; +$config{underlaydir} = "/dev/null"; $config{discussion} = 0; $config{po_master_language} = { code => 'en', name => 'English' @@ -118,8 +121,8 @@ $config{po_link_to}='negotiated'; $msgprefix="links (po_link_to=negotiated)"; refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn'); is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index"); -is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.es"); -is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.fr"); +is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable'], "$msgprefix index.es"); +is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgprefix index.fr"); is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable"); is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es"); is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr"); @@ -129,8 +132,8 @@ $config{po_link_to}='current'; $msgprefix="links (po_link_to=current)"; refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn'); is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index"); -is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.es"); -is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.fr"); +is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable'))], "$msgprefix index.es"); +is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable'))], "$msgprefix index.fr"); is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable"); is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es"); is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr"); -- cgit v1.2.3 From b8fd31a2a3305aed41176f84377b108f679299fd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Aug 2010 11:43:21 -0400 Subject: Fix po test suite to not assume ikiwiki's underlay is already installed. Closes: #593047 (cherry picked from commit 5664401fbcd0694539ec8274d2df11b3e5db1e48) --- debian/changelog | 7 +++++++ t/po.t | 11 +++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8223074f3..98d13376d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20100815) unstable; urgency=medium + + * Fix po test suite to not assume ikiwiki's underlay is already installed. + Closes: #593047 + + -- Joey Hess Sun, 15 Aug 2010 11:42:55 -0400 + ikiwiki (3.20100804) unstable; urgency=low * template: Fix dependency tracking. Broken in version 3.20100427. diff --git a/t/po.t b/t/po.t index 444743cac..1cd18c317 100755 --- a/t/po.t +++ b/t/po.t @@ -31,6 +31,9 @@ my $dir = tempdir("ikiwiki-test-po.XXXXXXXXXX", %config=IkiWiki::defaultconfig(); $config{srcdir} = "$dir/src"; $config{destdir} = "$dir/dst"; +$config{destdir} = "$dir/dst"; +$config{underlaydirbase} = "/dev/null"; +$config{underlaydir} = "/dev/null"; $config{discussion} = 0; $config{po_master_language} = { code => 'en', name => 'English' @@ -118,8 +121,8 @@ $config{po_link_to}='negotiated'; $msgprefix="links (po_link_to=negotiated)"; refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn'); is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index"); -is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.es"); -is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable', 'SandBox', 'ikiwiki'], "$msgprefix index.fr"); +is_deeply(\@{$links{'index.es'}}, ['translatable.es', 'nontranslatable'], "$msgprefix index.es"); +is_deeply(\@{$links{'index.fr'}}, ['translatable.fr', 'nontranslatable'], "$msgprefix index.fr"); is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable"); is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es"); is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr"); @@ -129,8 +132,8 @@ $config{po_link_to}='current'; $msgprefix="links (po_link_to=current)"; refresh_n_scan('index.mdwn', 'translatable.mdwn', 'nontranslatable.mdwn'); is_deeply(\@{$links{'index'}}, ['translatable', 'nontranslatable'], "$msgprefix index"); -is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.es"); -is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable')), 'SandBox', 'ikiwiki'], "$msgprefix index.fr"); +is_deeply(\@{$links{'index.es'}}, [ (map bestlink('index.es', $_), ('translatable.es', 'nontranslatable'))], "$msgprefix index.es"); +is_deeply(\@{$links{'index.fr'}}, [ (map bestlink('index.fr', $_), ('translatable.fr', 'nontranslatable'))], "$msgprefix index.fr"); is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable"); is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es"); is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr"); -- cgit v1.2.3 From 67d0645e07b8bba3977a9a4edefacc54c652ca67 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Aug 2010 11:46:01 -0400 Subject: insert version that will be released from debian-testing branch --- debian/changelog | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7f3ea7290..121cf8381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,19 @@ -ikiwiki (3.20100805) UNRELEASED; urgency=low +ikiwiki (3.20100816) UNRELEASED; urgency=low * filecheck: Fall back to using the file command if the freedesktop magic file cannot identify a file. * flattr: New plugin. (Thanks to jaywalk for the initial implementation at a flattr plugin! This one is less configurable, but simpler.) * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) + + -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 + +ikiwiki (3.20100815) unstable; urgency=medium + * Fix po test suite to not assume ikiwiki's underlay is already installed. Closes: #593047 - -- Joey Hess Mon, 09 Aug 2010 13:18:28 -0400 + -- Joey Hess Sun, 15 Aug 2010 11:45:40 -0400 ikiwiki (3.20100804) unstable; urgency=low -- cgit v1.2.3 From 9744c11f806cc72436b1d7b813fc194136e60db0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Aug 2010 16:05:17 -0400 Subject: openid: Syntax tweak to the javascript code to make it work with MSIE 7 (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting the bug and providing access to debug it. --- debian/changelog | 3 +++ underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b9b08050b..cbd7e7254 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * flattr: New plugin. (Thanks to jaywalk for the initial implementation at a flattr plugin! This one is less configurable, but simpler.) * smiley: warn instead of error for missing smileys (Giuseppe Bilotta) + * openid: Syntax tweak to the javascript code to make it work with MSIE 7 + (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting + the bug and providing access to debug it. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js index f22f5776a..c59be1edc 100644 --- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js +++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js @@ -21,7 +21,7 @@ var providers_large = { icon: 'wikiicons/openidlogin-bg.gif', label: 'Enter your OpenID:', url: null - }, + } }; var providers_small = { livejournal: { @@ -65,7 +65,7 @@ var providers_small = { icon: 'http://verisign.com/favicon.ico', label: 'Enter your Verisign username:', url: 'http://{username}.pip.verisignlabs.com/' - }, + } }; var providers = $.extend({}, providers_large, providers_small); -- cgit v1.2.3 From 20ecef4d024f751481645db3aa68d098e1251b19 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 17 Aug 2010 16:37:48 -0400 Subject: style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. --- debian/changelog | 1 + doc/bugs/absolute_sizes_in_default_CSS.mdwn | 2 ++ doc/style.css | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cbd7e7254..8fee36b98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low * openid: Syntax tweak to the javascript code to make it work with MSIE 7 (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting the bug and providing access to debug it. + * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta. -- Joey Hess Sun, 15 Aug 2010 11:45:48 -0400 diff --git a/doc/bugs/absolute_sizes_in_default_CSS.mdwn b/doc/bugs/absolute_sizes_in_default_CSS.mdwn index 5cf70d6ee..bb3c0c7a0 100644 --- a/doc/bugs/absolute_sizes_in_default_CSS.mdwn +++ b/doc/bugs/absolute_sizes_in_default_CSS.mdwn @@ -1,5 +1,7 @@ While toying around with some font sizes on my persona ikiwiki I discovered that some font sizes in the default CSS are fixed rather than relative. Here's a git patch that replaces them with relative font sizes (assuming the default 12pt/16px base font size recommended by the W3C): +[[done]] --[[Joey]] +

     From 01c14db255bbb727d8dd1e72c3f6f2f25f07e757 Mon Sep 17 00:00:00 2001
     From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
    diff --git a/doc/style.css b/doc/style.css
    index 66d962bd6..fa4b2a38a 100644
    --- a/doc/style.css
    +++ b/doc/style.css
    @@ -14,7 +14,7 @@ nav {
     
     .header {
     	margin: 0;
    -	font-size: 22px;
    +	font-size: 140%;
     	font-weight: bold;
     	line-height: 1em;
     	display: block;
    @@ -22,7 +22,7 @@ nav {
     
     .inlineheader .author {
     	margin: 0;
    -	font-size: 18px;
    +	font-size: 112%;
     	font-weight: bold;
     	display: block;
     }
    -- 
    cgit v1.2.3
    
    
    From 9b9ecda62f893a2109ccdb6bcdb2358f217f7fef Mon Sep 17 00:00:00 2001
    From: Joey Hess 
    Date: Thu, 19 Aug 2010 13:59:31 -0400
    Subject: htmlscrubber: Do not scrub url anchors that contain colons.
    
    ---
     IkiWiki/Plugin/htmlscrubber.pm                            | 2 +-
     debian/changelog                                          | 1 +
     doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn | 5 +++++
     3 files changed, 7 insertions(+), 1 deletion(-)
    
    (limited to 'debian')
    
    diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
    index 847518178..927792f79 100644
    --- a/IkiWiki/Plugin/htmlscrubber.pm
    +++ b/IkiWiki/Plugin/htmlscrubber.pm
    @@ -32,7 +32,7 @@ sub import {
     	);
     	# data is a special case. Allow a few data:image/ types,
     	# but disallow data:text/javascript and everything else.
    -	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i;
    +	$safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?#]))|^#/i;
     }
     
     sub getsetup () {
    diff --git a/debian/changelog b/debian/changelog
    index 8fee36b98..fb445a3ff 100644
    --- a/debian/changelog
    +++ b/debian/changelog
    @@ -9,6 +9,7 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
         (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
         the bug and providing access to debug it.
       * style.css: Use relative, not absolute font sizes. Thanks, Giuseppe Bilotta.
    +  * htmlscrubber: Do not scrub url anchors that contain colons.
     
      -- Joey Hess   Sun, 15 Aug 2010 11:45:48 -0400
     
    diff --git a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
    index a00ced4c5..343037b45 100644
    --- a/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
    +++ b/doc/bugs/htmlscrubber_breaks_multimarkdown_footnotes.mdwn
    @@ -11,3 +11,8 @@ enabled, the links are created but their hrefs are empty (so they do not actuall
     Disabling the htmlscrubber plugin fixes this issue
     
     [[!tag multimarkdown htmlscrubber]]
    +
    +> href was of the form: #fnref:1 , scrubbed by overzealous protocol
    +> scrubbing.
    +
    +[[done]] --[[Joey]] 
    -- 
    cgit v1.2.3