From 9e2c8a96cd3f54644f38d43d7beb347edda0684c Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Thu, 13 Aug 2009 17:14:32 -0400 Subject: add me new repo, yarrr --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/git.mdwn b/doc/git.mdwn index 18fbd238b..1cd91e532 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -46,6 +46,7 @@ into [[Joey]]'s working tree. This is recommended. :-) * [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git` * [[chrysn]] `git://github.com/github076986099/ikiwiki.git` * [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git` +* [[schmonz]] `git://github.com/schmonz/ikiwiki.git` ## branches -- cgit v1.2.3 From d512d5802273faac184d133d64965336a68cd603 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2009 17:48:36 -0400 Subject: response --- doc/forum/google_openid_broken__63__.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn index 2ca339c3c..890bba4d9 100644 --- a/doc/forum/google_openid_broken__63__.mdwn +++ b/doc/forum/google_openid_broken__63__.mdwn @@ -3,3 +3,8 @@ when I login via to this wiki (or ours) via Google's OpenID, I get this error: Error: OpenID failure: no_identity_server: The provided URL doesn't declare its OpenID identity server. Any idea how to fix this?? + +> Google is [doing things with openid that are not in the spec](http://googledataapis.blogspot.com/2008/10/federated-login-for-google-account.html) +> and it's not clear to me that they intend regular openid to work at all. +> What is your google openid URL so I can take a look at the data they are +> providing? --[[Joey]] -- cgit v1.2.3 From 8ba32abaf27110d86a52720bcb738402bf90fadb Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2009 17:55:01 -0400 Subject: review: question --- doc/plugins/contrib/cvs/discussion | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/plugins/contrib/cvs/discussion (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion b/doc/plugins/contrib/cvs/discussion new file mode 100644 index 000000000..e2411af63 --- /dev/null +++ b/doc/plugins/contrib/cvs/discussion @@ -0,0 +1,5 @@ +I've started reviewing this, and the main thing I don't like is the +post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up. +That just seems unnecessarily complicated. Why can't ikiwiki itself detect +the "cvs add " call and avoid doing anything in that case? +--[[Joey]] -- cgit v1.2.3 From 3401dc6110ac785c1df3f447d2f1de017be92538 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2009 18:12:28 -0400 Subject: fix name --- doc/plugins/contrib/cvs/discussion | 5 ----- doc/plugins/contrib/cvs/discussion.mdwn | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 doc/plugins/contrib/cvs/discussion create mode 100644 doc/plugins/contrib/cvs/discussion.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion b/doc/plugins/contrib/cvs/discussion deleted file mode 100644 index e2411af63..000000000 --- a/doc/plugins/contrib/cvs/discussion +++ /dev/null @@ -1,5 +0,0 @@ -I've started reviewing this, and the main thing I don't like is the -post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up. -That just seems unnecessarily complicated. Why can't ikiwiki itself detect -the "cvs add " call and avoid doing anything in that case? ---[[Joey]] diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn new file mode 100644 index 000000000..e2411af63 --- /dev/null +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -0,0 +1,5 @@ +I've started reviewing this, and the main thing I don't like is the +post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up. +That just seems unnecessarily complicated. Why can't ikiwiki itself detect +the "cvs add " call and avoid doing anything in that case? +--[[Joey]] -- cgit v1.2.3 From 46c2d66fd37b12c2d02466118cb206000174f1b4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 13 Aug 2009 19:05:27 -0400 Subject: disable pagecount here, sorta of excessive since the bug has been done --- doc/bugs/pagecount_is_broken.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/pagecount_is_broken.mdwn b/doc/bugs/pagecount_is_broken.mdwn index 101230d94..57df6b75d 100644 --- a/doc/bugs/pagecount_is_broken.mdwn +++ b/doc/bugs/pagecount_is_broken.mdwn @@ -1,3 +1,4 @@ -The [[plugins/pagecount]] plugin seems to be broken, as it claims there are [[!pagecount ]] pages in this wiki. (if it's not 0, the bug is fixed) +The [[plugins/pagecount]] plugin seems to be broken, as it claims there are +\[[!pagecount ]] pages in this wiki. (if it's not 0, the bug is fixed) [[fixed|done]] --[[Joey]] -- cgit v1.2.3 From 2007005cd2497ff10defa3e3e9cc91890df1c5d8 Mon Sep 17 00:00:00 2001 From: dave Date: Thu, 13 Aug 2009 21:09:24 -0400 Subject: removed --- doc/ikiwiki/markdown/discussion.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/ikiwiki/markdown/discussion.mdwn (limited to 'doc') diff --git a/doc/ikiwiki/markdown/discussion.mdwn b/doc/ikiwiki/markdown/discussion.mdwn deleted file mode 100644 index d3affec34..000000000 --- a/doc/ikiwiki/markdown/discussion.mdwn +++ /dev/null @@ -1 +0,0 @@ -Is anyone else having trouble using the definition list feature of multimarkdown? If not, then I could use some help figuring out why it's not working on my text site. Version is 3.141~bpo50+1 (debian backports), multimarkdown and mdwn support enabled in preferences. Any pointers to the obvious thing I'm missing would be appreciated. - dave -- cgit v1.2.3 From 4bf7c24451f8a1c434851a98ca78a7d5dcba8461 Mon Sep 17 00:00:00 2001 From: "62.147.182.222" <62.147.182.222@web> Date: Fri, 14 Aug 2009 07:42:28 -0400 Subject: poll vote (Accept only password logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 7a6f84518..79eeaec01 100644 --- a/doc/news/openid.mdwn +++ b/doc/news/openid.mdwn @@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an OpenID, and see how OpenID works for you. And let me know your feelings about making such a switch. --[[Joey]] -[[!poll 63 "Accept only OpenID for logins" 19 "Accept only password logins" 36 "Accept both"]] +[[!poll 63 "Accept only OpenID for logins" 20 "Accept only password logins" 36 "Accept both"]] -- cgit v1.2.3 From 110d6e18b438809b53f5a2a12d81659247079464 Mon Sep 17 00:00:00 2001 From: lludwig Date: Fri, 14 Aug 2009 09:49:49 -0400 Subject: --- doc/forum/google_openid_broken__63__.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn index 890bba4d9..e0b24eab9 100644 --- a/doc/forum/google_openid_broken__63__.mdwn +++ b/doc/forum/google_openid_broken__63__.mdwn @@ -8,3 +8,7 @@ Any idea how to fix this?? > and it's not clear to me that they intend regular openid to work at all. > What is your google openid URL so I can take a look at the data they are > providing? --[[Joey]] + + +http://openid-provider.appspot.com/larrylud + -- cgit v1.2.3 From cfdabf348db8f8ba75aac39678b060b39824db08 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 14 Aug 2009 15:09:01 -0400 Subject: forwarded upstream with analysis --- doc/forum/google_openid_broken__63__.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn index e0b24eab9..0e0d8d118 100644 --- a/doc/forum/google_openid_broken__63__.mdwn +++ b/doc/forum/google_openid_broken__63__.mdwn @@ -12,3 +12,7 @@ Any idea how to fix this?? http://openid-provider.appspot.com/larrylud +> I've debugged this some and filed +> on the Openid perl +> module. It's a pretty easy fix, so I hope upstream will fix it quickly. +> --[[Joey]] -- cgit v1.2.3 From 3e086c84a2f826c77322a5dabdff1277eeb7152c Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Fri, 14 Aug 2009 19:10:57 -0400 Subject: Related comments on openid redirection. --- doc/forum/google_openid_broken__63__.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc') diff --git a/doc/forum/google_openid_broken__63__.mdwn b/doc/forum/google_openid_broken__63__.mdwn index 0e0d8d118..1be9d0487 100644 --- a/doc/forum/google_openid_broken__63__.mdwn +++ b/doc/forum/google_openid_broken__63__.mdwn @@ -16,3 +16,15 @@ http://openid-provider.appspot.com/larrylud > on the Openid perl > module. It's a pretty easy fix, so I hope upstream will fix it quickly. > --[[Joey]] + +>> A little more information here: I'm using that same openid provider at the moment. Note that +>> that provider isn't google - it is someone using the google API to authenticate. I normally have it +>> set up as a redirect from my home page (which means I can change providers easily). + + + + +>> In that mode it works (I used it to log in to make this edit). However, when I try the openid +>> URL directly, it doesn't work. I think there is something weird with re-direction. I hope this +>> isn't a more general security hole. +>> -- [[Will]] -- cgit v1.2.3 From 1f64181f90a10b28fce3f2166b763a3333375ac9 Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Fri, 14 Aug 2009 21:43:47 -0400 Subject: new dependency added --- doc/bugs/po_plugin_adds_new_dependency.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/bugs/po_plugin_adds_new_dependency.mdwn (limited to 'doc') diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn new file mode 100644 index 000000000..880b491cf --- /dev/null +++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn @@ -0,0 +1,10 @@ +Was it intended that the po plugin add a new dependency? + + 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. + Compilation failed in require at (eval 27) line 2. + BEGIN failed--compilation aborted at (eval 27) line 2. + + make[1]: *** [po2wiki_stamp] Error 2 + make: *** [extra_build] Error 2 -- cgit v1.2.3 From fdf30251334bfff4b03ed1bbdd85a8fd016e75a8 Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Fri, 14 Aug 2009 22:21:04 -0400 Subject: --- doc/bugs/po_plugin_adds_new_dependency.mdwn | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'doc') diff --git a/doc/bugs/po_plugin_adds_new_dependency.mdwn b/doc/bugs/po_plugin_adds_new_dependency.mdwn index 880b491cf..3da326f48 100644 --- a/doc/bugs/po_plugin_adds_new_dependency.mdwn +++ b/doc/bugs/po_plugin_adds_new_dependency.mdwn @@ -8,3 +8,28 @@ Was it intended that the po plugin add a new dependency? make[1]: *** [po2wiki_stamp] Error 2 make: *** [extra_build] Error 2 + +And it looks like this dependency is not easy to work around. The issue is that the newly translated base wiki means that the po plugin is being used by the build system. It is no longer optional. I've turned it off in my workspace like this: (heavy handed, but it lets me keep going until a proper fix is available) + + diff --git a/Makefile.PL b/Makefile.PL + index 602d8fb..68728b7 100755 + --- a/Makefile.PL + +++ b/Makefile.PL + @@ -42,7 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki + ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man + ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man + ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man + - $(MAKE) -C po + + # $(MAKE) -C po + + docwiki: ikiwiki.out + $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh + @@ -114,7 +114,7 @@ extra_install: underlay_install + install ikiwiki.out $(DESTDIR)$(PREFIX)/bin/ikiwiki + install ikiwiki-makerepo ikiwiki-transition ikiwiki-update-wikilist $(DESTDIR)$(PREFIX)/bin/ + + - $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) + + # $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) + + # These might fail if a regular user is installing into a home + # directory. -- 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 'doc') 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 'doc') 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 bd34fcd87464708afc81dd3a4d3e07e3531e7f71 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 14:26:07 -0400 Subject: reorg and cleanup --- doc/todo/l10n.mdwn | 61 ++++++++++++++---------------------------------------- 1 file changed, 16 insertions(+), 45 deletions(-) (limited to 'doc') diff --git a/doc/todo/l10n.mdwn b/doc/todo/l10n.mdwn index bba103494..fed3f63b6 100644 --- a/doc/todo/l10n.mdwn +++ b/doc/todo/l10n.mdwn @@ -1,3 +1,19 @@ +ikiwiki should be fully internationalized. + +---- + +As to the hardcoded strings in ikiwiki, I've internationalized the program, +and there is a po/ikiwiki.pot in the source that can be translated. +--[[Joey]] + +---- + +> The now merged po plugin handles l10n of wiki pages. The only missing +> piece now is l10n of the templates. +> --[[Joey]] + +---- + From [[Recai]]: > Here is my initial work on ikiwiki l10n infrastructure (I'm sending it > before finalizing, there may be errors). @@ -54,48 +70,3 @@ kullanıcının ait IP adresi: [2] This could be easily worked around in tmpl_process3, but I wouldn't like to maintain a separate utility. ----- - -As to the hardcoded strings in ikiwiki, I've internationalized the program, -and there is a po/ikiwiki.pot in the source that can be translated. ---[[Joey]] - ----- - -Danish l10n of templates and basewiki is available with the following commands: - - git clone http://source.jones.dk/ikiwiki.git newsite - cd newsite - make - -Updates are retrieved with this single command: - - make - -l10n is maintained using po4a for basewiki, smiley and templates - please send me PO files if you -translate to other languagess than the few I know about myself: - -As upstream ikiwiki is now maintained in GIT too, keeping the master mirror in sync with upstream -could probably be automated even more - but an obstacle seems to be that content is not maintained -separately but as an integral part of upstream source (GIT seems to not support subscribing to -only parts of a repository). - -For example use, here's how to roll out a clone of the [Redpill support site](http://support.redpill.dk/): - - mkdir -p ~/public_cgi/support.redpill.dk - git clone git://source.jones.dk/bin - bin/localikiwikicreatesite -o git://source.redpill.dk/support rpdemo - -(Redpill support is inspired by but needs to be reusable for several similarly configured networks) - ---[[JonasSmedegaard]] - -> I don't understand at all why you're using git the way you are. -> -> I think that this needs to be reworked into a patch against the regular -> ikiwiki tree, that adds the po4a stuff needed to generate the pot files for the -> basewiki and template content, as well as the stuff that generates the -> translated versions of those from the po files. -> -> The now merged po plugin also handles some of this. -> --[[Joey]] -- cgit v1.2.3 From d13c07dec1a5516b7fa595004e16021f2a182bb6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 15:20:46 -0400 Subject: noticed a problem --- doc/plugins/po.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2fbf67016..4e1bf20bb 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -277,6 +277,15 @@ That used to be so, but the bug was fixed. Does this mean that po might be replacing the only link on a page, in error? --[[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". + + + Documentation ------------- -- cgit v1.2.3 From e9bc2e96acd5977a35f338ddd392733aaca761f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 15:49:07 -0400 Subject: resolve conflict --- doc/sandbox.mdwn | 5 ----- 1 file changed, 5 deletions(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9b0a53c68..c84d52ef2 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -4,15 +4,10 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v 2009/7/13 Monday Blue...\\ While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site. -<<<<<<< HEAD:doc/sandbox.mdwn * I thought that creole markup is used by ikiwiki... * Thought about using //SVN/CVS// server, however with different idea * Kinda curious why **Tcl** does not show her face in this Wiki arena -======= -* Thought about using //SVN/CVS// server, however with different idea -* Kinda curious why **Tcl** does not show her face in this Wiki arena * It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup. ->>>>>>> 55c1a37cce91d4fd01bf80fcaeeaf56535218a5c:doc/sandbox.mdwn --- -- cgit v1.2.3 From 1b63a0e4fae5396014ed222647ae9c3c88a35de5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 16:15:36 -0400 Subject: another problem --- doc/plugins/po.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 4e1bf20bb..5016f1037 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -282,9 +282,17 @@ 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". +like "index.da". --[[Joey]] +Pagespecs +--------- +I was suprised that, when using the map directive, a pagespec of "*" +listed all the translated pages as well as regular pages. That can +make a big difference to an existing wiki when po is turned on, +and seems generally not wanted. +(OTOH, you do want to match translated pages by +default when locking pages.) --[[Joey]] Documentation ------------- -- 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 'doc') 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 e9d20231a0fa99fe614a43cf60c53af7a84fc795 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 17:00:16 -0400 Subject: further otherlanguages list styling --- doc/style.css | 13 ++++++++----- templates/page.tmpl | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) (limited to 'doc') diff --git a/doc/style.css b/doc/style.css index 4fa48b140..4770fc942 100644 --- a/doc/style.css +++ b/doc/style.css @@ -24,6 +24,10 @@ padding: 6px; list-style-type: none; } +.actions li { + display: inline; + padding: .2em .4em; +} .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -37,6 +41,10 @@ padding: 6px; list-style-type: none; } +#otherlanguages li { + display: inline; + padding: .2em .4em; +} .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -45,11 +53,6 @@ div.inlinecontent { margin-top: .4em; } -.actions li { - display: inline; - padding: .2em .4em; -} - .pagefooter { clear: both; } diff --git a/templates/page.tmpl b/templates/page.tmpl index 653179e5d..e71ba316d 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -29,7 +29,7 @@ -( %) + (%) @@ -76,7 +76,7 @@ (master) -( %) + (%) -- cgit v1.2.3 From 1e30be656f38b3a42a4ddd28a50d5721ad3849d5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 17:07:25 -0400 Subject: link to l10n.ikiwiki.info website --- doc/translation.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/translation.mdwn b/doc/translation.mdwn index 459f47eb5..d869a6821 100644 --- a/doc/translation.mdwn +++ b/doc/translation.mdwn @@ -26,6 +26,10 @@ essentially three pieces needed for a complete translation: [[plugins/contrib/po]] ikiwiki plugin will allow translating wikis using po files and can be used for this. + There is now a website, [l10n.ikiwiki.info](http://l10n.ikiwiki.info) + that both demos the translated basewiki, and allows easy translation of + it. + To generate the po and pot files for translating the basewiki, get ikiwiki's source, edit the `po/underlay.setup` file, adding your language. Then run 'make -C po underlays`. -- cgit v1.2.3 From 43e895ec78a00a53aca31a5b38c18e8ef4ab6842 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 17:29:05 -0400 Subject: another problem --- doc/plugins/po.mdwn | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 5016f1037..f738d61de 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -248,7 +248,7 @@ ea753782b222bf4ba2fb4683b6363afdd9055b64, which should be reverted once [[intrigeri]]'s `meta` branch is merged. An integration branch, called `meta-po`, merges [[intrigeri]]'s `po` -and `meta` branches, and thus has thise additional features. +and `meta` branches, and thus has this additional features. Self links ---------- @@ -294,6 +294,18 @@ and seems generally not wanted. (OTOH, you do want to match translated pages by default when locking pages.) --[[Joey]] +Edit links on untranslated pages +-------------------------------- + +If a page is not translated yet, the "translated" version of it +displays wikilinks to other, existing (but not yet translated?) +pages as edit links, as if those pages do not exist. + +That's really confusing, especially as clicking such a link +brings up an edit form to create a new, english page. + +This is with po_link_to=current. With default, it doesn't happen.. + Documentation ------------- -- cgit v1.2.3 From 7d901b9a5412e94ab127fcc447536e391eba0399 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 19:16:22 -0400 Subject: another problem.. --- doc/plugins/po.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index f738d61de..f6409aae5 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -306,6 +306,20 @@ brings up an edit form to create a new, english page. This is with po_link_to=current. With default, it doesn't happen.. +Double commits of po files +-------------------------- + +When adding a new english page, the po files are created, committed, +and then committed again. The second commit makes this change: + + -"Content-Type: text/plain; charset=utf-8\n" + -"Content-Transfer-Encoding: ENCODING" + +"Content-Type: text/plain; charset=UTF-8\n" + +"Content-Transfer-Encoding: ENCODING\n" + +Same thing happens when a change to an existing page triggers a po file +update. + Documentation ------------- -- cgit v1.2.3 From 7ea1f9692687310fb434a7cc6e6f84b57b9f4ef8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 19:39:51 -0400 Subject: apache config details --- doc/plugins/po.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index f6409aae5..30f2e158e 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -114,7 +114,8 @@ Apache Using Apache `mod_negotiation` makes it really easy to have Apache serve any page in the client's preferred language, if available. -This is the default Debian Apache configuration. + +Add 'Options MultiViews' to the wiki directory's configuration in Apache. When `usedirs` is enabled, one has to set `DirectoryIndex index` for the wiki context. @@ -123,6 +124,8 @@ Setting `DefaultLanguage LL` (replace `LL` with your default MIME language code) for the wiki context can help to ensure `bla/page/index.en.html` is served as `Content-Language: LL`. +For details, see [Apache's documentation](http://httpd.apache.org/docs/2.2/content-negotiation.html). + lighttpd -------- -- cgit v1.2.3 From 0e4f67842a449d4f25b79836078a352007ea27b9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 21:00:27 -0400 Subject: update --- doc/plugins/po.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 30f2e158e..684593bf3 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -307,7 +307,7 @@ pages as edit links, as if those pages do not exist. That's really confusing, especially as clicking such a link brings up an edit form to create a new, english page. -This is with po_link_to=current. With default, it doesn't happen.. +This is with po_link_to=current or negotiated. With default, it doesn't happen.. Double commits of po files -------------------------- -- cgit v1.2.3 From 4ff3e2a540d154d49dfc70fb89dcc8422f2047e3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 15 Aug 2009 22:18:05 -0400 Subject: po: Better fix for missing underlay translation problem. If a page is taken from the underlay, and one of the specified languages does not have po files in the underlay, it would create a broken link to the translated version of the page for that language. With this change, there's no broken link. --- IkiWiki/Plugin/po.pm | 4 ++-- doc/plugins/po.mdwn | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index ce32aab05..aa3d72b90 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -891,7 +891,7 @@ sub percenttranslated ($) { my $page=shift; $page=~s/^\///; - return gettext("0") unless istranslation($page); + return gettext("N/A") unless istranslation($page); my $file=srcfile($pagesources{$page}); my $masterfile = srcfile($pagesources{masterpage($page)}); my %options = ( @@ -934,7 +934,7 @@ sub otherlanguagesloop ($) { master => 1, }; } - else { + elsif (istranslation($otherpage)) { push @ret, { url => urlto_with_orig_beautiful_urlpath($otherpage, $page), code => $lang, diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 684593bf3..3766ad295 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -307,7 +307,8 @@ pages as edit links, as if those pages do not exist. That's really confusing, especially as clicking such a link brings up an edit form to create a new, english page. -This is with po_link_to=current or negotiated. With default, it doesn't happen.. +This is with po_link_to=current or negotiated. With default, it doesn't +happen.. --[[Joey]] Double commits of po files -------------------------- @@ -321,7 +322,7 @@ and then committed again. The second commit makes this change: +"Content-Transfer-Encoding: ENCODING\n" Same thing happens when a change to an existing page triggers a po file -update. +update. --[[Joey]] Documentation ------------- -- cgit v1.2.3 From 294aa199694a602325751420650da2b533c80fbf Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Sun, 16 Aug 2009 07:01:39 -0400 Subject: Fix (hopefully) grammar. --- doc/ikiwiki/directive/inline.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn index 9c55e07c2..99f795972 100644 --- a/doc/ikiwiki/directive/inline.mdwn +++ b/doc/ikiwiki/directive/inline.mdwn @@ -56,7 +56,7 @@ directive. These are the commonly used ones: * `postform` - Set to "yes" to enable a form to post new pages to a blog. * `postformtext` - Set to specify text that is displayed in a postform. -* `rootpage` - Enable the postform, and allows controling where +* `rootpage` - Enables the postform, and allows controling where newly posted pages should go, by specifiying the page that they should be a [[SubPage]] of. -- cgit v1.2.3 From 216f5b5b203ca3ea9ddb3f6d8c2e03dae35aeb7e Mon Sep 17 00:00:00 2001 From: PaulePanter Date: Sun, 16 Aug 2009 08:34:57 -0400 Subject: Add sentence to clarify how to get feeds for the RecentChanges page. --- doc/plugins/recentchanges.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/recentchanges.mdwn b/doc/plugins/recentchanges.mdwn index 4ab2cd078..9375296a4 100644 --- a/doc/plugins/recentchanges.mdwn +++ b/doc/plugins/recentchanges.mdwn @@ -24,3 +24,6 @@ Here's an example of how to show only changes that Joey didn't make. \[[!inline pages="internal(recentchanges/change_*) and !author(joey) and !author(http://joey.kitenet.net*)" template=recentchanges show=0]] + +If you want to generate feeds for the RecentChanges page, you have to use +[[`rss`_or_`atom`_in_the_setup_file|/todo/minor adjustment to setup documentation for recentchanges feeds]]. -- cgit v1.2.3 From d3ec1a3af2f9a2265336ba376f3ee7b75bb6e534 Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Sun, 16 Aug 2009 09:01:12 -0400 Subject: comment on part of Joey's comment --- doc/todo/should_optimise_pagespecs.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 1919e3584..9d2611249 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -120,6 +120,14 @@ 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.. +> I was also thinking about this (I've been playing with some stuff based on the +> `remove-pagespec-merge` branch). A hash, by itself, is not optimal because +> the dependency list holds two things: page names and page specs. The hash would +> work well for the page names, but you'll still need to iterate through the page specs. +> I was thinking of keeping a list and a hash. You use the list for pagespecs +> and the hash for individual page names. To make this work you need to adjust the +> API so it knows which you're adding. -- [[Will]] + 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 -- cgit v1.2.3 From 56bd1735967daef3610357801232a41de7ee2cbb Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 16 Aug 2009 11:56:16 -0400 Subject: switched my DreamHost install to pkgsrc, happily --- doc/tips/DreamHost/discussion.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc') diff --git a/doc/tips/DreamHost/discussion.mdwn b/doc/tips/DreamHost/discussion.mdwn index 74f48938e..258d385ae 100644 --- a/doc/tips/DreamHost/discussion.mdwn +++ b/doc/tips/DreamHost/discussion.mdwn @@ -3,3 +3,16 @@ I managed to install ikiwiki on eggplant farms, with most basic features except I think ikiwiki is more suitable for VPS/dedicated server. Shared hosting doesn't fit. I just (2009/04/27) installed ikiwiki on DreamHost and the CPAN instructions here are unnecessarily complicated. I used "cpan" instead of "perl -MCPAN -e shell" and had no trouble with that portion of the install. --[[schmonz]] + +After tiring of managing things by hand, I've switched to using +pkgsrc as an unprivileged user. This uses a bit more disk for my +own copies of perl, python, etc., but in exchange I can `cd +.../pkgsrc/www/ikiwiki && make install` and everything just works. +Plus I get all the benefits of a package system, like easy uninstalling +and being notified of outdated or insecure software. + +The only catch: sometimes the package dependency tree gets too deep +for DreamHost's user process limit, resulting in build death. I +work around this by resuming the build partway down the tree, then +trying again from whatever I was actually trying to install. +--[[schmonz]] -- cgit v1.2.3 From b5576b556027e8f9b9ad52e02b383b8644adfb33 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 16 Aug 2009 11:58:28 -0400 Subject: Life is simpler on a git branch. --- doc/plugins/contrib/cvs.mdwn | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn index f466b9399..23e00201f 100644 --- a/doc/plugins/contrib/cvs.mdwn +++ b/doc/plugins/contrib/cvs.mdwn @@ -1,14 +1,11 @@ [[!template id=plugin name=cvs core=0 author="[[schmonz]]"]] +[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]] + This plugin allows ikiwiki to use [[!wikipedia desc="CVS" Concurrent Versions System]] as an [[rcs]]. -### Installation and usage -7. Apply patches to [`IkiWiki.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-IkiWiki.pm.diff) -and [`ikiwiki-makerepo`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-ikiwiki-makerepo.diff). -7. Rebuild and install ikiwiki. +### Usage 7. Install [cvsps](http://www.cobite.com/cvsps/), [[!cpan IPC::Cmd]], [[!cpan String::ShellQuote]], and [cvsweb](http://www.freebsd.org/projects/cvsweb.html) or the like. -7. Download [`cvs.pm`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs.pm) into a suitable `$libdir/IkiWiki/Plugin`. -7. While setting up a wiki [[by hand|setup/byhand]], also specify `--libdir` until you get to the point where you have a setup file. (This ensures the CVS plugin is found and its settings stanza included.) 7. Adjust CVS-related parameters in your setup file. Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn't need it, but you yourself might. Here's a good general-purpose one: @@ -20,7 +17,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn rdiff -u ### Implementation details -* Diffs are against [[3.14159|news/version_3.14159]]. `cvs.pm` started life as a copy of `svn.pm`. +* `cvs.pm` started life as a copy of [[3.14159|news/version_3.14159]]'s `svn.pm`. * `IkiWiki.pm:wiki_file_prune_regexps` avoids copying CVS metadata into `$DESTDIR`. * [[ikiwiki-makerepo]]: * creates a repository, @@ -30,7 +27,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below). ### To do -* Add automated tests. ([Blindly adding svn-like tests to `t/file_pruned.t`](http://www.netbsd.org/~schmonz/ikiwiki-cvs/cvs-t-file_pruned.t.diff) doesn't do the trick.) +* Add automated tests. (Blindly adding svn-like tests to `t/file_pruned.t` doesn't do the trick.) * If the argument to `cvs add` smells like a binary file, `cvs add -kb` it (for [[plugins/attachment]] support). * Don't slurp the entire `cvsps` output into memory (!). * Instead of resource-intensively scraping changesets with `cvsps`, have `ikiwiki-makerepo` set up NetBSD-like `log_accum` and `commit_prep` scripts that coalesce and keep records of commits. `cvsps` can be used as a fallback for repositories without such records. -- cgit v1.2.3 From db041b8854d2d3f7137367e11e960ac4f6cdb6c5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 13:53:44 -0400 Subject: minor problem --- doc/plugins/po.mdwn | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 3766ad295..3f91775f1 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -308,7 +308,19 @@ That's really confusing, especially as clicking such a link brings up an edit form to create a new, english page. This is with po_link_to=current or negotiated. With default, it doesn't -happen.. --[[Joey]] +happen.. + +Also, this may only happen if the page being linked to is coming from an +underlay, and the underlays lack translation to a given language. +--[[Joey]] + +recentchanges links to po files +------------------------------- + +When a po file is changed, the recentchanges page shows a link such as +"sandbox.es". But, clicking on it goes to the English (or negotiated +language) version of the page. It would be better in this one case if +the link went direct to the translated version of the page. --[[Joey]] Double commits of po files -------------------------- -- cgit v1.2.3 From 9ca8de2e75bc9a11b1b8547b375a887a8b1ef60b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 14:40:40 -0400 Subject: add l10n branch --- doc/git.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/git.mdwn b/doc/git.mdwn index 1cd91e532..06bccc7a3 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -33,6 +33,8 @@ into [[Joey]]'s working tree. This is recommended. :-) * github `git://github.com/joeyh/ikiwiki.git` ([browse](http://github.com/joeyh/ikiwiki/tree/master)) A mirror of the main repo, automatically updated. +* l10n `git://l10n.ikiwiki.info/` + Open push localization branch used for * [[smcv]] `git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git` * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git` * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git` -- cgit v1.2.3 From 611256ba1c6f9b5cfdaabed634a1be00eb32e7a7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 16 Aug 2009 16:32:35 -0400 Subject: clarification --- doc/todo/should_optimise_pagespecs.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 9d2611249..33bca677a 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -128,6 +128,9 @@ to avoid.. > and the hash for individual page names. To make this work you need to adjust the > API so it knows which you're adding. -- [[Will]] +> I wasn't thinking about a lookup hash, just a dedup hash, FWIW. +> --[[Joey]] + 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 -- cgit v1.2.3 From 89b5e2b8224a6e05e8f2a7d2d0affe7ae700fa97 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 17 Aug 2009 16:15:41 -0400 Subject: responses to code review (I'll try to get them implemented later this week) --- doc/todo/should_optimise_pagespecs.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 33bca677a..0a3720b3c 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -113,6 +113,13 @@ 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. +> If it's acceptable to declare that downgrading IkiWiki requires a complete +> rebuild, I'm happy with that. I'd prefer to keep the (simple form of the) +> transition done automatically during a load/save cycle, rather than +> requiring ikiwiki-transition to be run; we should probably say in NEWS +> that the performance increase won't fully apply until the next +> rebuild. --[[smcv]] + 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 @@ -131,17 +138,31 @@ to avoid.. > I wasn't thinking about a lookup hash, just a dedup hash, FWIW. > --[[Joey]] +>> I was under the impression from previous code review that you preferred +>> to represent unordered sets as lists, rather than hashes with dummy +>> values. If I was wrong, great, I'll fix that and it'll probably go +>> a bit faster. --[[smcv]] + 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. +> That'd be an API change; perhaps marginally faster, but I don't +> see how it would allow better optimisation if we're de-duplicating +> anyway? --[[smcv]] + 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. +> I don't think the complexity is any greater than it was: I've just +> moved one level of "loop" out of the generated Perl, to be +> in visible code. I'll see whether some of it can be hoisted, though. +> --[[smcv]] + Very good catch on img/meta using the wrong dependency; verified in the wild! (I've cherry-picked those bug fixes.) -- cgit v1.2.3 From 46adbbd1c377b6c4a55c466e27de0bdce2fcb52c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 17 Aug 2009 16:30:21 -0400 Subject: respond --- doc/todo/should_optimise_pagespecs.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 0a3720b3c..1594dcee7 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -120,6 +120,11 @@ uses it still), and otherwise just bloats the index. > that the performance increase won't fully apply until the next > rebuild. --[[smcv]] +>> It is acceptable not to support downgrades. +>> I don't think we need a NEWS file update since any sort of refresh, +>> not just a full rebuild, will cause the indexdb to be loaded and saved, +>> enabling the optimisation. --[[Joey]] + 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 @@ -143,6 +148,9 @@ to avoid.. >> values. If I was wrong, great, I'll fix that and it'll probably go >> a bit faster. --[[smcv]] +>>> It depends, really. And it'd certianly make sense to benchmark such a +>>> change. --[[Joey]] + 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 @@ -152,6 +160,11 @@ when adding a lot of depends at once. > see how it would allow better optimisation if we're de-duplicating > anyway? --[[smcv]] +>> Well, I was thinking that it might be sufficient to build a `%seen` +>> hash of dependencies inside `add_depends`, if the places that call +>> it lots were changed to just call it once. Of course the only way to +>> tell is benchmarking. --[[Joey]] + 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`, @@ -163,6 +176,10 @@ out. > in visible code. I'll see whether some of it can be hoisted, though. > --[[smcv]] +>> The call to `pagename` is the only part I can see that's clearly +>> run more often than before. That function is pretty inexpensive, but.. +>> --[[Joey]] + Very good catch on img/meta using the wrong dependency; verified in the wild! (I've cherry-picked those bug fixes.) -- cgit v1.2.3 From 9552f35b5153cf324141430e415c077d8387a810 Mon Sep 17 00:00:00 2001 From: Jimmy Tang Date: Tue, 18 Aug 2009 15:17:58 +0100 Subject: added my homepage link --- doc/users/Jimmy_Tang.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/Jimmy_Tang.mdwn (limited to 'doc') diff --git a/doc/users/Jimmy_Tang.mdwn b/doc/users/Jimmy_Tang.mdwn new file mode 100644 index 000000000..a1402bcae --- /dev/null +++ b/doc/users/Jimmy_Tang.mdwn @@ -0,0 +1 @@ + -- cgit v1.2.3 From 8315913a252f9a036f139a1d9541ae1693ef33eb Mon Sep 17 00:00:00 2001 From: Jimmy Tang Date: Tue, 18 Aug 2009 15:22:02 +0100 Subject: added myself as a user --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 58dd51600..e1e25a045 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -124,6 +124,7 @@ Personal sites and blogs * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au) * [tumashu's page](http://tumashu.github.com) This is my personal site in github created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master) * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage +* [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang) Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From eedd1687f821a649ff2d30da8beb67012cdab50d Mon Sep 17 00:00:00 2001 From: "http://emptty.myopenid.com/" Date: Wed, 19 Aug 2009 05:08:49 -0400 Subject: --- doc/ikiwiki/directive/brokenlinks/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/ikiwiki/directive/brokenlinks/discussion.mdwn (limited to 'doc') diff --git a/doc/ikiwiki/directive/brokenlinks/discussion.mdwn b/doc/ikiwiki/directive/brokenlinks/discussion.mdwn new file mode 100644 index 000000000..65e97cff6 --- /dev/null +++ b/doc/ikiwiki/directive/brokenlinks/discussion.mdwn @@ -0,0 +1 @@ +Would it be possible to have such a thing also checking for external links? -- [[user/emptty]] -- cgit v1.2.3 From 036f4f367d092b5017e1deb4cd95480ac1171da7 Mon Sep 17 00:00:00 2001 From: AlexandreDupas Date: Wed, 19 Aug 2009 12:33:09 -0400 Subject: bugs with po and git plugins --- doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn (limited to 'doc') 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 new file mode 100644 index 000000000..f87457080 --- /dev/null +++ b/doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn @@ -0,0 +1,7 @@ +po files are not added to git (error: /path/to/po/file not in repository tree) in my setup. + +I have set absolute path for srcdir = '/path/to/repo/doc/'. The root of my git repository is '/path/to/repo/'. When I enable the po plugin, it creates all po files and produces an error when it try to add the file saying that the /path/to/repo/doc/index.fr.po is not in the repository tree. + +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). -- 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 'doc') 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 f712ffa66df2edc119d34a09a76b0c4d82563543 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 19 Aug 2009 14:12:37 -0400 Subject: another issue --- doc/plugins/po.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 3f91775f1..dca2f5d66 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -336,6 +336,11 @@ and then committed again. The second commit makes this change: Same thing happens when a change to an existing page triggers a po file update. --[[Joey]] +Ugly messages with empty files +------------------------------ + +If there are empty .mdwn files, the po plugin displays some ugly messages. + Documentation ------------- -- cgit v1.2.3 From e6ed1aabfd06884b655deaf5af0c25263aa5c1a0 Mon Sep 17 00:00:00 2001 From: AlexandreDupas Date: Wed, 19 Aug 2009 14:42:35 -0400 Subject: Add some details --- doc/bugs/po_plugin_cannot_add_po_files_into_git.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'doc') 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 6fadff07e..c794f82d7 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 @@ -12,3 +12,23 @@ I have an other issue with the po plugin when I set the srcdir to './doc/' (prov > 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]] + +>> Yeah, I figured for the relative path +>> Git version 1.6.3.3 (on both my dev and server machines) +>> +>> Here is an example of what I get when I update the po file on my laptop and I push to the master repository: +>> +>> From /srv/git/sb +>> 5eb4619..ecac4d7 master -> origin/master +>> scanning doc.fr.po +>> building doc.fr.po +>> building doc.mdwn, which depends on doc.fr +>> building recentchanges.mdwn, which depends on recentchanges/change_ecac4d7311b15a3a3ed03102b9250487315740bc +>> fatal: '/srv/www/sb.l.n/new/doc/doc.fr.po' is outside repository +>> 'git add /srv/www/sb.l.n/new/doc/doc.fr.po' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 161. +>> done +>> To ssh://git.lohrun.net/var/cache/git/songbook.git +>> 5eb4619..ecac4d7 master -> master +>> +>> The root repository used to run ikiwiki is `/srv/www/sb.l.n/new/` +>> -- [[AlexandreDupas]] -- cgit v1.2.3 From 69874215d4c8ca5fcf877f020352ec17f4a43c14 Mon Sep 17 00:00:00 2001 From: AlexandreDupas Date: Wed, 19 Aug 2009 14:45:29 -0400 Subject: formatting --- .../po_plugin_cannot_add_po_files_into_git.mdwn | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'doc') 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 c794f82d7..8e3399611 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 @@ -17,18 +17,18 @@ I have an other issue with the po plugin when I set the srcdir to './doc/' (prov >> Git version 1.6.3.3 (on both my dev and server machines) >> >> Here is an example of what I get when I update the po file on my laptop and I push to the master repository: ->> ->> From /srv/git/sb ->> 5eb4619..ecac4d7 master -> origin/master ->> scanning doc.fr.po ->> building doc.fr.po ->> building doc.mdwn, which depends on doc.fr ->> building recentchanges.mdwn, which depends on recentchanges/change_ecac4d7311b15a3a3ed03102b9250487315740bc ->> fatal: '/srv/www/sb.l.n/new/doc/doc.fr.po' is outside repository ->> 'git add /srv/www/sb.l.n/new/doc/doc.fr.po' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 161. ->> done ->> To ssh://git.lohrun.net/var/cache/git/songbook.git ->> 5eb4619..ecac4d7 master -> master ->> + + From /srv/git/sb + 5eb4619..ecac4d7 master -> origin/master + scanning doc.fr.po + building doc.fr.po + building doc.mdwn, which depends on doc.fr + building recentchanges.mdwn, which depends on recentchanges/change_ecac4d7311b15a3a3ed03102b9250487315740bc + fatal: '/srv/www/sb.l.n/new/doc/doc.fr.po' is outside repository + 'git add /srv/www/sb.l.n/new/doc/doc.fr.po' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 161. + done + To ssh://git.lohrun.net/var/cache/git/songbook.git + 5eb4619..ecac4d7 master -> master + >> The root repository used to run ikiwiki is `/srv/www/sb.l.n/new/` >> -- [[AlexandreDupas]] -- cgit v1.2.3 From 24d43bea075354ecd8546131529a064140b9039c Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Thu, 20 Aug 2009 16:10:56 -0400 Subject: response --- doc/plugins/contrib/cvs/discussion.mdwn | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn index e2411af63..847d0f92a 100644 --- a/doc/plugins/contrib/cvs/discussion.mdwn +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -3,3 +3,33 @@ post-commit wrapper wrapper that ikiwiki-makerepo is patched to set up. That just seems unnecessarily complicated. Why can't ikiwiki itself detect the "cvs add " call and avoid doing anything in that case? --[[Joey]] + +> The wrapper wrapper does three things: +> +> 7. It ignores `cvs add `, since this is a weird CVS +> behavior that ikiwiki gets confused by and doesn't need to act on. +> 7. It prevents `cvs` locking against itself: `cvs commit` takes a +> write lock and runs the post-commit hook, which runs `cvs update`, +> which wants a read lock and sleeps forever -- unless the post-commit +> hook runs in the background so the commit can "finish". +> 7. It fails silently if the ikiwiki post-commit hook is missing. +> CVS doesn't have any magic post-commit filenames, so hooks have to +> be configured explicitly. I don't think a commit will actually fail +> if a configured post-commit hook is missing (though I can't test +> this at the moment). +> +> Thing 1 can probably be handled within ikiwiki, if that seems less +> gross to you. +> +> Thing 2 I'm less sure of. (I'd like to see the web UI return +> immediately on save anyway, to a temporary "rebuilding, please wait +> if you feel like knowing when it's done" page, but this problem +> with CVS happens with any kind of commit, and could conceivably +> happen with some other VCS.) +> +> Thing 3 I think I did in order to squelch the error messages that +> were bollixing up the CGI. It was easy to do this in the wrapper +> wrapper, but if that's going away, it can be done just as easily +> with output redirection in `CVSROOT/loginfo`. +> +> --[[schmonz]] -- cgit v1.2.3 From 73e562edc865c6357cc1b4c8436e0a44957800e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Aug 2009 16:09:26 -0400 Subject: response --- doc/plugins/contrib/cvs/discussion.mdwn | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn index 847d0f92a..ed6cf506e 100644 --- a/doc/plugins/contrib/cvs/discussion.mdwn +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -20,16 +20,34 @@ the "cvs add " call and avoid doing anything in that case? > > Thing 1 can probably be handled within ikiwiki, if that seems less > gross to you. -> + +>> It seems like it might be. You can use a `getopt` hook to check +>> `@ARGV` to see how it was called. --[[Joey]] + > Thing 2 I'm less sure of. (I'd like to see the web UI return > immediately on save anyway, to a temporary "rebuilding, please wait > if you feel like knowing when it's done" page, but this problem > with CVS happens with any kind of commit, and could conceivably > happen with some other VCS.) -> + +>> None of the other VCSes let a write lock block a read lock, apparently. +>> +>> Anyway, re the backgrounding, when committing via the web, the +>> post-commit hook doesn't run anyway; the rendering is done via the +>> ikiwiki CGI. It would certianly be nice if it popped up a quick "working" +>> page and replaced it with the updated page when done, but that's +>> unrelated; the post-commit +>> hook only does rendering when committing using the VCS directly. The +>> backgrounding you do actually seems safe enough -- but tacking +>> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script, +>> does it? --[[Joey]] + > Thing 3 I think I did in order to squelch the error messages that > were bollixing up the CGI. It was easy to do this in the wrapper > wrapper, but if that's going away, it can be done just as easily > with output redirection in `CVSROOT/loginfo`. > > --[[schmonz]] + +>> If the error messages screw up the CGI they must go to stdout. +>> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] -- cgit v1.2.3 From 7849d675a3cf3792a271a2fa9fc9172b394b3f25 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 22 Aug 2009 02:02:34 -0400 Subject: response --- doc/plugins/contrib/cvs/discussion.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn index ed6cf506e..65b6befd1 100644 --- a/doc/plugins/contrib/cvs/discussion.mdwn +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -24,6 +24,13 @@ the "cvs add " call and avoid doing anything in that case? >> It seems like it might be. You can use a `getopt` hook to check >> `@ARGV` to see how it was called. --[[Joey]] +>>> This does the trick iff the post-commit wrapper passes its args +>>> along. Committed on my branch. This seems potentially dangerous, +>>> since the args passed to ikiwiki are influenced by web commits. +>>> I don't see an exploit, but for paranoia's sake, maybe the wrapper +>>> should only be built with execv() if the cvs plugin is loaded? +>>> --[[schmonz]] + > Thing 2 I'm less sure of. (I'd like to see the web UI return > immediately on save anyway, to a temporary "rebuilding, please wait > if you feel like knowing when it's done" page, but this problem @@ -42,6 +49,9 @@ the "cvs add " call and avoid doing anything in that case? >> on a " &" to the ikiwiki wrapper call doesn't need a wrapper script, >> does it? --[[Joey]] +>>> Nope, it works fine to append it to the `CVSROOT/loginfo` line. +>>> Fixed on my branch. --[[schmonz]] + > Thing 3 I think I did in order to squelch the error messages that > were bollixing up the CGI. It was easy to do this in the wrapper > wrapper, but if that's going away, it can be done just as easily @@ -51,3 +61,10 @@ the "cvs add " call and avoid doing anything in that case? >> If the error messages screw up the CGI they must go to stdout. >> I thought we had stderr even in the the CVS dark ages. ;-) --[[Joey]] + +>>> Some messages go to stderr, but definitely not all. That's why +>>> I wound up reaching for IPC::Cmd, to execute the command line +>>> safely while shutting CVS up. Anyway, I've tested what happens +>>> if a configured post-commit hook is missing, and it seems fine, +>>> probably also thanks to IPC::Cmd. +>>> --[[schmonz]] -- cgit v1.2.3 From 2acc71849d78d1dde7ac237e8ebc54d33548e9e7 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 22 Aug 2009 03:52:45 -0400 Subject: no more wrapper wrapper --- doc/plugins/contrib/cvs.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs.mdwn b/doc/plugins/contrib/cvs.mdwn index 23e00201f..6b600eef7 100644 --- a/doc/plugins/contrib/cvs.mdwn +++ b/doc/plugins/contrib/cvs.mdwn @@ -22,8 +22,7 @@ Consider creating `$HOME/.cvsrc` if you don't have one already; the plugin doesn * [[ikiwiki-makerepo]]: * creates a repository, * imports `$SRCDIR` into top-level module `ikiwiki` (vendor tag IKIWIKI, release tag PRE_CVS), - * creates a small post-commit wrapper to prevent `cvs add ` from being seen by ikiwiki's [[post-commit]] hook (and avoid `cvs` locking against itself), - * configures the wrapper itself as a post-commit hook in `CVSROOT/loginfo`. + * configures the post-commit hook in `CVSROOT/loginfo`. * CVS multi-directory commits happen separately; the post-commit hook sees only the first directory's changes in time for [[recentchanges|plugins/recentchanges]]. The next run of `ikiwiki --setup` will correctly re-render such a recentchanges entry. It should be possible to solve this problem with NetBSD's `commit_prep` and `log_accum` scripts (see below). ### To do -- cgit v1.2.3 From 78213cf83837132e4dd392a0c98d199a05103d2d Mon Sep 17 00:00:00 2001 From: "http://xn--andreaskrger-llb.myopenid.com/" Date: Sat, 22 Aug 2009 06:07:38 -0400 Subject: --- doc/sandbox.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index c84d52ef2..b8790d8ca 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -9,6 +9,15 @@ While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] * Kinda curious why **Tcl** does not show her face in this Wiki arena * It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup. +--- + +Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist falsch, aber dafür hat er einen). Die sind heutzutage kein Ärgernis mehr. + +&#x263a; becomes ☺ + + --- I try to have a discussion page !!! -- cgit v1.2.3 From e51f099ed1e73d9b84ad7e26758c1e60f42205b8 Mon Sep 17 00:00:00 2001 From: "http://xn--andreaskrger-llb.myopenid.com/" Date: Sat, 22 Aug 2009 06:25:12 -0400 Subject: --- doc/sandbox.mdwn | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index b8790d8ca..6ea8cc607 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -15,9 +15,7 @@ Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist fa &#x263a; becomes ☺ - + --- I try to have a discussion page !!! -- cgit v1.2.3 From 59527de76708616bc8966d0ced3577573c3062b6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 22 Aug 2009 14:29:18 -0400 Subject: uh oh --- doc/plugins/contrib/cvs/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn index 65b6befd1..b063a53c2 100644 --- a/doc/plugins/contrib/cvs/discussion.mdwn +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -31,6 +31,11 @@ the "cvs add " call and avoid doing anything in that case? >>> should only be built with execv() if the cvs plugin is loaded? >>> --[[schmonz]] +>>>> Hadn't considered that. While in wrapper mode the normal getopt is not +>>>> done, plugin getopt still runs, and so any unsafe options that +>>>> other plugins support could be a problem if another user runs +>>>> the setuid wrapper and passes those options through. --[[Joey]] + > Thing 2 I'm less sure of. (I'd like to see the web UI return > immediately on save anyway, to a temporary "rebuilding, please wait > if you feel like knowing when it's done" page, but this problem -- cgit v1.2.3 From 16b0e475487911790fae1b78a89ce94477eb970a Mon Sep 17 00:00:00 2001 From: "http://rtfb.myopenid.com/" Date: Sun, 23 Aug 2009 11:40:44 -0400 Subject: Added closing parenthesis --- doc/setup/byhand.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn index 0184d3d2a..53f8d18bb 100644 --- a/doc/setup/byhand.mdwn +++ b/doc/setup/byhand.mdwn @@ -83,7 +83,7 @@ the rest of the files. A good place to put it is in a ~/.ikiwiki/ subdirectory. Most of the options, like `wikiname` in the setup file are the same as -ikiwiki's command line options (documented in [[usage]]. `srcdir` and +ikiwiki's command line options (documented in [[usage]]). `srcdir` and `destdir` are the two directories you specify when running ikiwiki by hand. Make sure that these are pointing to the right directories, and read through and configure the rest of the file to your liking. -- cgit v1.2.3 From 0d5a8bc3f060a26069df4c20880888303ff41d55 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 23 Aug 2009 15:41:29 -0400 Subject: new rsync plugin --- doc/plugins/contrib/rsync.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/plugins/contrib/rsync.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/rsync.mdwn b/doc/plugins/contrib/rsync.mdwn new file mode 100644 index 000000000..71cd63947 --- /dev/null +++ b/doc/plugins/contrib/rsync.mdwn @@ -0,0 +1,21 @@ +[[!template id=plugin name=rsync core=0 author="[[schmonz]]"]] + +[[!template id=gitbranch branch=schmonz author="[[schmonz]]"]] + +This plugin allows ikiwiki to push generated pages to another host +by running a command such as `rsync`. + +### Usage +7. Enable automated SSH key exchange between ikiwiki and the remote + host. [keychain](http://www.gentoo.org/proj/en/keychain/) makes + it easy to use a passphrase-protected key for this purpose. It's + also a good idea to specify the exact command line to be permitted + in the remote host's `$HOME/.ssh/authorized_keys`. +7. Set `rsync_command` in your setup file. If you're using a + passphrase-protected key, then set `rsync_command` to a shell + script which reads `keychain`'s current state before calling + `rsync`. + +### Implementation details +* The plugin relies on a new "postrefresh" hook called at the very end of + `IkiWiki/Render.pm:refresh()`. -- cgit v1.2.3 From 156625ebac9fdd6d7193c5d997e6fd0141d4d84b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 23 Aug 2009 16:27:18 -0400 Subject: update config file snippet to use current git_wrapper name --- doc/tips/laptop_wiki_with_git_extended.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/tips/laptop_wiki_with_git_extended.mdwn b/doc/tips/laptop_wiki_with_git_extended.mdwn index 620370218..0666da450 100644 --- a/doc/tips/laptop_wiki_with_git_extended.mdwn +++ b/doc/tips/laptop_wiki_with_git_extended.mdwn @@ -10,7 +10,7 @@ a bare repo on `gitserver`, and clone that to a workingdir on gitserver. Next create a setup file for the laptop with gitorigin_branch=> "", - wrapper => "/working/dir/.git/hooks/post-commit", + git_wrapper => "/working/dir/.git/hooks/post-commit", At this point, assuming you followed page above, and not my hasty summary, @@ -21,7 +21,7 @@ a bare repo on `gitserver`, and clone that to a workingdir on gitserver. 2. Now create a setup file for the server (I call it server.setup). gitorigin_branch=> "origin", - wrapper => "/repo/wiki.git/hooks/post-update.ikiwiki" + git_wrapper => "/repo/wiki.git/hooks/post-update.ikiwiki" Note the non-standard and bizzare name of the hook. -- cgit v1.2.3 From b43c25001453674feb1ca862325222da67bc758c Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Sun, 23 Aug 2009 17:54:38 -0400 Subject: use a map instead --- doc/users/schmonz.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn index 752880561..8273bdbb6 100644 --- a/doc/users/schmonz.mdwn +++ b/doc/users/schmonz.mdwn @@ -1,4 +1,3 @@ [Amitai Schlair](http://www.columbia.edu/~ays2105/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing: -* [[plugins/contrib/unixauth]] -* [[plugins/contrib/cvs]] +[[!map pages="link(users/schmonz) and plugins/* and !*/Discussion"]] -- cgit v1.2.3 From 18a7b65094ca761fea0785a81f3c0923ea66b018 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 23 Aug 2009 18:15:56 -0400 Subject: response --- doc/plugins/contrib/cvs/discussion.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn index b063a53c2..2de938fb7 100644 --- a/doc/plugins/contrib/cvs/discussion.mdwn +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -36,6 +36,19 @@ the "cvs add " call and avoid doing anything in that case? >>>> other plugins support could be a problem if another user runs >>>> the setuid wrapper and passes those options through. --[[Joey]] +>>>>> I've tried compiling the argument check into the wrapper as +>>>>> the first thing main() does, and was surprised to find that +>>>>> this doesn't prevent the `cvs add ` deadlock in a web +>>>>> commit. I was convinced this'd be a reasonable solution, +>>>>> especially if conditionalized on the cvs plugin being loaded, +>>>>> but it doesn't work. And I stuck debug printfs at the beginning +>>>>> of all the rcs_foo() subs, and whatever `cvs add ` is +>>>>> doing to ikiwiki isn't visible to my plugin, because none of +>>>>> those subs are getting called. Nuts. Can you think of anything +>>>>> else that might solve the problem, or should I go back to +>>>>> generating a minimal wrapper wrapper that checks for just +>>>>> this one thing? --[[schmonz]] + > Thing 2 I'm less sure of. (I'd like to see the web UI return > immediately on save anyway, to a temporary "rebuilding, please wait > if you feel like knowing when it's done" page, but this problem -- cgit v1.2.3 From 80ca685385cd827f19718eaea5fb772782f68d3b Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 23 Aug 2009 23:27:53 -0400 Subject: why I needed this, in case it's useful to someone else --- doc/plugins/contrib/rsync/discussion.mdwn | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 doc/plugins/contrib/rsync/discussion.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn new file mode 100644 index 000000000..a2c2eb725 --- /dev/null +++ b/doc/plugins/contrib/rsync/discussion.mdwn @@ -0,0 +1,27 @@ +## A use case + +Why I needed this plugin: I have two web servers available to me +for a project. Neither does everything I need, but together they +do. (This is a bit like the [Amazon S3 +scenario](http://kitenet.net/~joey/blog/entry/running_a_wiki_on_Amazon_S3/).) + +Server (1) is a university web server. It provides plentiful space +and bandwidth, easy authentication for people editing the wiki, and +a well-known stable URL. The wiki really wants to live here and +very easily could except that the server doesn't allow arbitrary +CGIs. + +Server (2) is provided by a generous alumnus's paid [[tips/DreamHost]] +account. Disk and particularly network usage need to be minimized +because over some threshold it costs him. CGI, etc. are available. + +My plan was to host the wiki on server (1) by taking advantage of +server (2) to store the repository, source checkout, and generated +pages, to host the repository browser, and to handle ikiwiki's CGI +operations. In order for this to work, web edits on (2) would need +to automatically push any changed pages to (1). + +As a proof of concept, I added an rsync post-commit hook after +ikiwiki's usual. It worked, just not for web edits, which is how +the wiki will be used. So I wrote this plugin to finish the job. +The wiki now lives on (1), and clicking "edit" just works. -- cgit v1.2.3 From a27861c512bcf5808c59d9bc2b38c80b559d6d69 Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Mon, 24 Aug 2009 03:13:25 -0400 Subject: Comment on another possible solution to the use case. --- doc/plugins/contrib/rsync/discussion.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn index a2c2eb725..b2d21e6d5 100644 --- a/doc/plugins/contrib/rsync/discussion.mdwn +++ b/doc/plugins/contrib/rsync/discussion.mdwn @@ -25,3 +25,14 @@ As a proof of concept, I added an rsync post-commit hook after ikiwiki's usual. It worked, just not for web edits, which is how the wiki will be used. So I wrote this plugin to finish the job. The wiki now lives on (1), and clicking "edit" just works. + +> Just out of interest, why use `rsync` and not `git push`. i.e. a +> different setup to solve the same problem would be to run a +> normal ikiwiki setup on the universities server with its git +> repository available over ssh (same security setup your using +> for rsync should work for git over ssh). On the cgi-capable server, +> when it would rsync, make it git push. It would seem that git +> has enough information that it should be able to be more +> network efficient. It also means that corruption at one end +> wouldn't be propagated to the other end. -- [[Will]] + -- cgit v1.2.3 From 8d504e6b3dcacd333c0b07387e7acd3bf8a65d9c Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Mon, 24 Aug 2009 04:20:31 -0400 Subject: response --- doc/plugins/contrib/rsync/discussion.mdwn | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/rsync/discussion.mdwn b/doc/plugins/contrib/rsync/discussion.mdwn index b2d21e6d5..20c04af0f 100644 --- a/doc/plugins/contrib/rsync/discussion.mdwn +++ b/doc/plugins/contrib/rsync/discussion.mdwn @@ -24,7 +24,7 @@ to automatically push any changed pages to (1). As a proof of concept, I added an rsync post-commit hook after ikiwiki's usual. It worked, just not for web edits, which is how the wiki will be used. So I wrote this plugin to finish the job. -The wiki now lives on (1), and clicking "edit" just works. +The wiki now lives on (1), and clicking "edit" just works. --[[schmonz]] > Just out of interest, why use `rsync` and not `git push`. i.e. a > different setup to solve the same problem would be to run a @@ -36,3 +36,13 @@ The wiki now lives on (1), and clicking "edit" just works. > network efficient. It also means that corruption at one end > wouldn't be propagated to the other end. -- [[Will]] +>> Hey, that's a nice solution. (The site was in svn to begin with, +>> but it's in git now.) One advantage of my approach in this particular +>> case: server (1) doesn't have `git` installed, but does have `rsync`, +>> so (1)'s environment can remain completely untweaked other than the +>> SSH arrangement. I kind of like that all the sysadmin effort is +>> contained on one host. +>> +>> This plugin is definitely still useful for projects not able to use +>> a DVCS (of which I've got at least one other), and possibly for +>> other uses not yet imagined. ;-) --[[schmonz]] -- cgit v1.2.3 From f5187ed0b50d363ad16c6273b986f7e4fccc6c5d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 14:08:20 -0400 Subject: clarify and add link --- doc/shortcuts.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index 14cd5ff2b..d9c2e1937 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -62,9 +62,9 @@ This page controls what shortcut links the wiki supports. 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. +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. Remember that the `name` you give the shortcut will become a new [[ikiwiki/directive]]. Avoid using a `name` that conflicts @@ -73,5 +73,5 @@ parameter that will override the one provided at definition time. 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 +wiki](http://ikiwiki.info/shortcuts/), so that future versions of ikiwiki will include your shortcut in the standard underlay. -- cgit v1.2.3 From 004d460d9cc1fc6a691bc6eaa0d5cd2a9206c224 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 14:09:58 -0400 Subject: fix link --- doc/shortcuts.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index d9c2e1937..500146a31 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -62,7 +62,7 @@ This page controls what shortcut links the wiki supports. 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]] +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. -- cgit v1.2.3 From 43db8269a002daf00ac6195d4bd70018b4b68b75 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 15:47:24 -0400 Subject: response --- doc/plugins/contrib/cvs/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/cvs/discussion.mdwn b/doc/plugins/contrib/cvs/discussion.mdwn index 2de938fb7..e1fa6e428 100644 --- a/doc/plugins/contrib/cvs/discussion.mdwn +++ b/doc/plugins/contrib/cvs/discussion.mdwn @@ -49,6 +49,9 @@ the "cvs add " call and avoid doing anything in that case? >>>>> generating a minimal wrapper wrapper that checks for just >>>>> this one thing? --[[schmonz]] +>>>>>> I don't see how there could possibly be a difference between +>>>>>> ikiwiki's C wrapper and your shell wrapper wrapper here. --[[Joey]] + > Thing 2 I'm less sure of. (I'd like to see the web UI return > immediately on save anyway, to a temporary "rebuilding, please wait > if you feel like knowing when it's done" page, but this problem -- cgit v1.2.3 From 68b6926420172f69a05bccbdbe7776755cd92a27 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 15:51:05 -0400 Subject: fixed via getsource plugin --- doc/todo/Raw_view_link.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/Raw_view_link.mdwn b/doc/todo/Raw_view_link.mdwn index fd64074c2..b62a9022b 100644 --- a/doc/todo/Raw_view_link.mdwn +++ b/doc/todo/Raw_view_link.mdwn @@ -4,7 +4,7 @@ The configuration setting for Mercurial could be something like this: rawurl => "http://localhost:8000//raw-file/tip/\[[file]]", -> What I want to do when I want to see if the raw source is either +> What I do when I want to see if the raw source is either > click on the edit link, or click on history and navigate to it in the > history browser (easier to do in viewvc than in gitweb, IIRC). > Not that I'm opposed to the idea of a plugin that adds a Raw link @@ -14,4 +14,6 @@ The configuration setting for Mercurial could be something like this: >> to gitweb/etc. I think Will's patch is a good approach, and have improved >> on it a bit in a git branch. +>>> Since that is merged in now, I'm marking this [[done]] --[[Joey]] + [[!tag wishlist]] -- cgit v1.2.3 From 6b97e8f0ee74bb2f3189f669deefe0a227b0fc6f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 15:52:56 -0400 Subject: close as wontfix --- doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn index 0fb14bafe..4489dd5d2 100644 --- a/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn +++ b/doc/todo/Suggested_location_should_be_subpage_if_siblings_exist.mdwn @@ -23,4 +23,4 @@ that we're at the root of a (sub-)hierarchy. >> This sounds like WONTFIX to me? --[[smcv]] -[[!tag wishlist]] +[[!tag wishlist done]] -- cgit v1.2.3 From cc665380e3c9998ef04f1e42320cecd152ffd23c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 15:57:10 -0400 Subject: move undownloadable item to discussion page --- doc/css_market.mdwn | 11 ----------- doc/css_market/discussion.mdwn | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 11 deletions(-) (limited to 'doc') diff --git a/doc/css_market.mdwn b/doc/css_market.mdwn index 61254c4b8..c0e349552 100644 --- a/doc/css_market.mdwn +++ b/doc/css_market.mdwn @@ -23,17 +23,6 @@ gnomes will convert them to css files..) Debian lighttpd index.html page. [[!meta stylesheet="embeddedmoose"]] -* **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template - designed by [styleshout](http://www.styleshout.com). - You can see it [here](http://fred.ccheznous.org). You can download the local.css file and - the modified templates [here](http://fred.ccheznous.org/refresh_20060602.tgz). - - * This link (above) seems to deliver an empty tarball. - - * You'll find a updated version of these templates [here](http://www.der-winnie.de/~winnie/configs/ikiwiki-templates.tar.gz). - These templates are known to work with ikiwiki 2.31, and since I'll install always the newest one on my server I'll will update them on a regular basis. - * (This link appears to be broken?) - * **[[02_Template.css]]**, contributed and adapted by [maxx](http://martin.wuertele.net/), [original](http://www.openwebdesign.org/viewdesign.phtml?id=3057) designed by [jarico](http://www.openwebdesign.org/userinfo.phtml?user=jcarico) (License: public domain). You'll need a modified page.tmpl diff --git a/doc/css_market/discussion.mdwn b/doc/css_market/discussion.mdwn index 86d16de9a..3dc47b55a 100644 --- a/doc/css_market/discussion.mdwn +++ b/doc/css_market/discussion.mdwn @@ -18,3 +18,20 @@ The most recent version is always available at: . It removes annoying borders around the header and footer. -- [[TimBosse]] + +----- + +I removed this from the list since both places to download it are broken. +--[[Joey]] + +* **Refresh**, contributed by [[FredericLespez]]. Adapted from a free template + designed by [styleshout](http://www.styleshout.com). + You can see it [here](http://fred.ccheznous.org). You can download the local.css file and + the modified templates [here](http://fred.ccheznous.org/refresh_20060602.tgz). + + * This link (above) seems to deliver an empty tarball. + + * You'll find a updated version of these templates [here](http://www.der-winnie.de/~winnie/configs/ikiwiki-templates.tar.gz). + These templates are known to work with ikiwiki 2.31, and since I'll install always the newest one on my server I'll will update them on a regular basis. + * (This link appears to be broken?) + -- cgit v1.2.3 From bc6e50a075b164100d3144a13633647613a3dc8e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 1 Aug 2009 12:43:04 +0100 Subject: Mark "should optimise pagespecs" as done --- doc/todo/should_optimise_pagespecs.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 1594dcee7..5ed24d333 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -90,6 +90,8 @@ I can think about reducung the size of my wiki source and making it available on >> rather than a single pagespec. This does turn out to be faster, although >> not as much as I'd like. --[[smcv]] +>>> [[Merged|done]] --[[smcv]] + >>> I just wanted to note that there is a whole long discussion of dependencies and pagespecs on the [[todo/tracking_bugs_with_dependencies]] page. -- [[Will]] >>>> Yeah, I had a look at that (as the only other mention of `pagespec_merge`). -- cgit v1.2.3 From 848bb66c37b94b633a378e186e561aebb7bab43a Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 1 Aug 2009 12:43:37 +0100 Subject: Indicate that pagespec_merge() is no longer needed (much rejoicing?) --- doc/todo/tracking_bugs_with_dependencies.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/todo/tracking_bugs_with_dependencies.mdwn b/doc/todo/tracking_bugs_with_dependencies.mdwn index a198530fc..bfdbf0875 100644 --- a/doc/todo/tracking_bugs_with_dependencies.mdwn +++ b/doc/todo/tracking_bugs_with_dependencies.mdwn @@ -410,8 +410,8 @@ account all comments above (which doesn't mean it is above reproach :) ). --[[W >>>>> then the last definition (baz) takes precedence. >>>>> In the process of writing this I think I've come up with a way to change this back the way it was, still using closures. -- [[Will]] ->>> Alternatively, my [[remove-pagespec-merge|should_optimise_pagespecs]] ->>> branch solves this, in a Gordian knot sort of way :-) --[[smcv]] +>>> My [[remove-pagespec-merge|should_optimise_pagespecs]] branch has now +>>> solved all this by deleting the offending function :-) --[[smcv]] >> Secondly, it seems that there are two types of dependency, and ikiwiki >> currently only handles one of them. The first type is "Rebuild this -- cgit v1.2.3 From 68fd245addb9b96b473949349440b86796955cce Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Aug 2009 00:45:28 +0100 Subject: Respond with benchmarks and an updated branch --- doc/todo/should_optimise_pagespecs.mdwn | 79 +++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 1594dcee7..3dfa8e1f2 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -123,7 +123,12 @@ uses it still), and otherwise just bloats the index. >> It is acceptable not to support downgrades. >> I don't think we need a NEWS file update since any sort of refresh, >> not just a full rebuild, will cause the indexdb to be loaded and saved, ->> enabling the optimisation. --[[Joey]] +>> enabling the optimisation. --[[Joey]] + +>>> A refresh will load the current dependencies from `{depends}` and save +>>> them as-is as a one-element `{dependslist}`; only a rebuild will replace +>>> the single complex pagespec with a long list of simpler pagespecs. +>>> --[[smcv]] 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 @@ -149,7 +154,9 @@ to avoid.. >> a bit faster. --[[smcv]] >>> It depends, really. And it'd certianly make sense to benchmark such a ->>> change. --[[Joey]] +>>> change. --[[Joey]] + +>>>> Benchmarked, below. --[[smcv]] 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 @@ -163,7 +170,10 @@ when adding a lot of depends at once. >> Well, I was thinking that it might be sufficient to build a `%seen` >> hash of dependencies inside `add_depends`, if the places that call >> it lots were changed to just call it once. Of course the only way to ->> tell is benchmarking. --[[Joey]] +>> tell is benchmarking. --[[Joey]] + +>>> It doesn't seem that it significantly affects performance either way. +>>> --[[smcv]] 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 @@ -180,7 +190,70 @@ out. >> run more often than before. That function is pretty inexpensive, but.. >> --[[Joey]] +>>> I don't see anything that can be hoisted without significant refactoring, +>>> actually. Beware that there are two pagename calls in the loop: one for +>>> `$f` (which is the page we might want to rebuild), and one for `$file` +>>> (which is the changed page that it might depend on). Note that I didn't +>>> choose those names! +>>> +>>> The three loops are over source files, their lists of dependency pagespecs, +>>> and files that might have changed. I see the following things we might be +>>> doing redundantly: +>>> +>>> * If `$file` is considered as a potential dependency for more than +>>> one `$f`, we evaluate `pagename($file)` more than once. Potential fix: +>>> cache them (this turns out to save about half a second on the docwiki, +>>> see below). +>>> * If several pages depend on the same pagespec, we evaluate whether each +>>> changed page matches that pagespec more than once: however, we do so +>>> with a different location parameter every time, so repeated calls are, +>>> in the general case, the only correct thing to do. Potential fix: +>>> perhaps special-case "page x depends on page y and nothing else" +>>> (i.e. globs that have no wildcards) into a separate hash? I haven't +>>> done anything in this direction. +>>> * Any preparatory work done by pagespec_match (converting the pagespec +>>> into Perl, mostly?) is done in the inner loop; switching to +>>> pagespec_match_list (significant refactoring) saves more than half a +>>> second on the docwiki. +>>> +>>> --[[smcv]] + Very good catch on img/meta using the wrong dependency; verified in the wild! (I've cherry-picked those bug fixes.) +---- + +Benchmarking results: I benchmarked by altering docwiki.setup to switch off +verbose, running "make clean && ./Makefile.PL && make", and timing one rebuild +of the docwiki followed by three refreshes. Before each refresh I used +`touch plugins/*.mdwn` to have something significant to refresh. + +I'm assuming that "user" CPU time is the important thing here (system time was +relatively small in all cases, up to 0.35 seconds per run). + +master at the time of rebasing: 14.20s to rebuild, 10.04/12.07/14.01s to +refresh. I think you can see the bug clearly here - the pagespecs are getting +more complicated every time! + +After the initial optimization: 14.27s to rebuild, 8.26/8.33/8.26 to refresh. +Success! + +Not pre-joining dependencies actually took about ~0.2s more; I don't know why. +I'm worried that duplicates will just build up (again) in less simple cases, +though, so 0.2s is probably a small price to pay for that not happening (it +might well be experimental error, for that matter). + +Not saving {depends} to the index, using a hash instead of a list to +de-duplicate, and allowing add_depends to take an arrayref instead of a single +pagespec had no noticable positive or negative effect on this test. + +Memoizing the results of pagename brought the rebuild time down to 14.06s +and the refresh time down to 7.96/7.92/7.92, a significant win. + +Refactoring to use pagespec_match_list looks more risky from a code churn +point of view; rebuild now takes 14.35s, but refresh is only 7.30/7.29/7.28, +another significant win. + +--[[smcv]] + [[!tag wishlist patch patch/core]] -- cgit v1.2.3 From 96936899da3037fa28f8be73003a14aa829878ee Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 21:54:22 -0400 Subject: at this point I'm down to deciding which specific commits to merge and which were dead ends --- doc/todo/should_optimise_pagespecs.mdwn | 42 +++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 3dfa8e1f2..f3048f328 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -235,6 +235,21 @@ master at the time of rebasing: 14.20s to rebuild, 10.04/12.07/14.01s to refresh. I think you can see the bug clearly here - the pagespecs are getting more complicated every time! +> I can totally see a bug here, and it's one I didn't think existed. Ie, +> I thought that after the first refresh, the pagespec should stabalize, +> and what it stabalized to was probably unnecessarily long, but not +> growing w/o bounds! +> +> a) Explains why ikiwiki.info has been so slow lately. Well that and some +> other things that overloaded the system. +> b) Suggests to me we will probably want to force a rebuild on upgrade +> when fixing this (via the mechanism in the postinst). +> +> BTW, the underlying bug here is really horribly simple: +> When refreshing, `loadindex` preserves the previous depends list, +> and `add_depends` adds stuff to it. So it doubles every time a page is +> re-rendered during refresh. --[[Joey]] + After the initial optimization: 14.27s to rebuild, 8.26/8.33/8.26 to refresh. Success! @@ -243,17 +258,44 @@ I'm worried that duplicates will just build up (again) in less simple cases, though, so 0.2s is probably a small price to pay for that not happening (it might well be experimental error, for that matter). +> It's weird that the suggested optimisations to +> `add_depends` had no effect. So, the commit message to +> b6fcb1cb0ef27e5a63184440675d465fad652acf is actually wrong.. ? --[[Joey]] + Not saving {depends} to the index, using a hash instead of a list to de-duplicate, and allowing add_depends to take an arrayref instead of a single pagespec had no noticable positive or negative effect on this test. +> I see e4cd168ebedd95585290c97ff42234344bfed46c is still in your branch +> though. I don't like using an arrayref, it could just take `($page, @depends)`. +> and I don't see the need to keep it if it doesn't currently help. +> +> Is there any reason to keep 7227c2debfeef94b35f7d81f42900aa01820caa3 +> if it doesn't improve speed? +> --[[Joey]] + Memoizing the results of pagename brought the rebuild time down to 14.06s and the refresh time down to 7.96/7.92/7.92, a significant win. +> Ok, that seems safe to memoize. (It's a real function and it isn't +> called with a great many inputs.) Why did you chose to memoize it +> explicitly rather than adding it to the memoize list at the top? + Refactoring to use pagespec_match_list looks more risky from a code churn point of view; rebuild now takes 14.35s, but refresh is only 7.30/7.29/7.28, another significant win. --[[smcv]] +> I had mostly convinced myself that +> `pagespec_match_list` would not lead to a speed gain here. My reasoning +> was that you want to stop after finding one match, while `pagespec_match_list` +> checks all pages for matches. So what we're seeing is that +> on a rebuild, `@changed` is all pages, and not short-circuiting leads +> to unnecessary work. OTOH, on refresh, `@changed` is small and I suppose +> `pagespec_match_list`'s other slight efficiencies win out somehow. +> +> Welcome to the "I made ikiwiki twice as fast +> and all I got was this lousy git sha1sum" club BTW :-) --[[Joey]] + [[!tag wishlist patch patch/core]] -- cgit v1.2.3 From 134a25d1633513afd9506318aeb4349381dc061e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 24 Aug 2009 22:10:12 -0400 Subject: better analysis of why the depends keep growing --- doc/todo/should_optimise_pagespecs.mdwn | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index f3048f328..2dd1f7b9e 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -244,11 +244,13 @@ more complicated every time! > other things that overloaded the system. > b) Suggests to me we will probably want to force a rebuild on upgrade > when fixing this (via the mechanism in the postinst). -> -> BTW, the underlying bug here is really horribly simple: -> When refreshing, `loadindex` preserves the previous depends list, -> and `add_depends` adds stuff to it. So it doubles every time a page is -> re-rendered during refresh. --[[Joey]] +> +> I've investigated why the pagespecs keep growing: When page A changes, +> its old depends are cleared. Then +> page B that inlines A gets rebuilt, and its old depends are also cleared. +> But page B also inlines page C; which means C gets re-rendered. And this +> happens w/o its old depends being cleared, so C's depends are doubled. +> --[[Joey]] After the initial optimization: 14.27s to rebuild, 8.26/8.33/8.26 to refresh. Success! -- 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 'doc') 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 aeea77e5c434bf432ea574c62e685cf655af15bd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 25 Aug 2009 22:18:52 +0100 Subject: reply --- doc/todo/should_optimise_pagespecs.mdwn | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/should_optimise_pagespecs.mdwn b/doc/todo/should_optimise_pagespecs.mdwn index 2dd1f7b9e..5dd3b1e34 100644 --- a/doc/todo/should_optimise_pagespecs.mdwn +++ b/doc/todo/should_optimise_pagespecs.mdwn @@ -264,6 +264,9 @@ might well be experimental error, for that matter). > `add_depends` had no effect. So, the commit message to > b6fcb1cb0ef27e5a63184440675d465fad652acf is actually wrong.. ? --[[Joey]] +>> I'll try benchmarking again on the non-public wiki where I had the 4% +>> speedup. The docwiki is so small that 4% is hard to measure... --[[smcv]] + Not saving {depends} to the index, using a hash instead of a list to de-duplicate, and allowing add_depends to take an arrayref instead of a single pagespec had no noticable positive or negative effect on this test. @@ -271,11 +274,17 @@ pagespec had no noticable positive or negative effect on this test. > I see e4cd168ebedd95585290c97ff42234344bfed46c is still in your branch > though. I don't like using an arrayref, it could just take `($page, @depends)`. > and I don't see the need to keep it if it doesn't currently help. -> + +>> I'll drop it. --[[smcv]] + > Is there any reason to keep 7227c2debfeef94b35f7d81f42900aa01820caa3 > if it doesn't improve speed? > --[[Joey]] +>> I'll try benchmarking on a more complex wiki and see whether it has a +>> positive or negative effect. It does avoid being O(n**2) in number of +>> dependencies. --[[smcv]] + Memoizing the results of pagename brought the rebuild time down to 14.06s and the refresh time down to 7.96/7.92/7.92, a significant win. @@ -283,6 +292,9 @@ and the refresh time down to 7.96/7.92/7.92, a significant win. > called with a great many inputs.) Why did you chose to memoize it > explicitly rather than adding it to the memoize list at the top? +>> It does depend on global variables, so using Memoize seemed like asking for +>> trouble. I suppose what I did is equivalent to Memoize though... --[[smcv]] + Refactoring to use pagespec_match_list looks more risky from a code churn point of view; rebuild now takes 14.35s, but refresh is only 7.30/7.29/7.28, another significant win. -- cgit v1.2.3 From 145d89a6fc03936cc36d70946a8471da9bfe468a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 01:05:07 -0400 Subject: po: maybe fixed self links --- doc/plugins/po.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index dca2f5d66..b4c8b135e 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -260,7 +260,9 @@ 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]] +good reason for that to be done? --[[Joey]] + +> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]] Language display order ---------------------- -- cgit v1.2.3 From 7bd7e78e4a7d31c460909776057687e0e29dba12 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 01:41:55 -0400 Subject: po: commenting some TODO items --- doc/plugins/po.mdwn | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index b4c8b135e..45630d763 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -282,12 +282,23 @@ That used to be so, but the bug was fixed. Does this mean that po might be replacing the only link on a page, in error? --[[Joey]] +> It would replace it. The only problematic case is when another +> plugin has its own reasons, in its `scan` hook, to add a page +> that is already there to `$links{$page}`. This other plugin's +> effect might then be changed by po's `scan` hook... which could +> be either good (better overall l10n) or bad (break the other +> plugin's goal). --[[intrigeri]] + 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]] +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]] Pagespecs --------- -- cgit v1.2.3 From d5a04b2de9ce027c0e4cd47c9342bcd3db7f9f27 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 02:00:48 -0400 Subject: po: more TODO items comments and patches --- doc/plugins/po.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 45630d763..079a36633 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -335,6 +335,10 @@ When a po file is changed, the recentchanges page shows a link such as language) version of the page. It would be better in this one case if the link went direct to the translated version of the page. --[[Joey]] +> The (untested) commit 496e8523c670 in my po branch might fix this... +> or at least, I believe, put someone on the right track. +> --[[intrigeri]] + Double commits of po files -------------------------- -- cgit v1.2.3 From cc76cd64024ed09eff2a3e2da1282497e8c4e21b Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 26 Aug 2009 09:59:39 -0400 Subject: suggestion --- doc/todo/tmplvars_plugin/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/todo/tmplvars_plugin/discussion.mdwn (limited to 'doc') diff --git a/doc/todo/tmplvars_plugin/discussion.mdwn b/doc/todo/tmplvars_plugin/discussion.mdwn new file mode 100644 index 000000000..93cb9b414 --- /dev/null +++ b/doc/todo/tmplvars_plugin/discussion.mdwn @@ -0,0 +1 @@ +I find this plugin quite usefull. But one thing, I would like to be able to do is set a tmplvar e.g. in a sidebar so that it affects all Pages this sidebar is used in. --martin -- cgit v1.2.3 From 155347837a6757bd85f9b15778133622daa006c0 Mon Sep 17 00:00:00 2001 From: "https://infosoph.myopenid.com/" Date: Wed, 26 Aug 2009 10:25:48 -0400 Subject: initial report --- .../defintion_lists_appear_to_be_disabled.mdwn | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 doc/bugs/defintion_lists_appear_to_be_disabled.mdwn (limited to 'doc') diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn new file mode 100644 index 000000000..c9756617d --- /dev/null +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -0,0 +1,38 @@ +Adding text of the format + + Apple + : Pomaceous fruit of plants of the genus Malus in + the family Rosaceae. + : An american computer company. + + Orange + : The fruit of an evergreen tree of the genus Citrus. + +Does not result in expected HTML as described in the [MultiMarkdown Syntax Guide](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/): + +Should be + +
+
Apple
+
+

Pomaceous fruit of plants of the genus Malus in + the family Rosaceae.

+
+
+

An american computer company.

+
+
Orange
+
+

The fruit of an evergreen tree of the genus Citrus.

+
+
+ +But instead it gives: + +

Apple + : Pomaceous fruit of plants of the genus Malus in + the family Rosaceae. + : An american computer company.

+ +

Orange + : The fruit of an evergreen tree of the genus Citrus.

-- cgit v1.2.3 From 2996f0b5ee0b3a06d6476eff57b40cb2d8fc587a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:04:09 -0400 Subject: fix emphasis examples to actually work --- doc/ikiwiki/formatting.mdwn | 2 +- po/fr.po | 34 ++++---- po/ikiwiki.pot | 22 ++--- po/it.po | 195 +++++++++++++++++++++++++------------------- 4 files changed, 144 insertions(+), 109 deletions(-) (limited to 'doc') diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index 2ed5cc26f..befbce9aa 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this: Leave blank lines between paragraphs. -You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it +You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it in single or double asterisks. To create a list, start each line with an asterisk: diff --git a/po/fr.po b/po/fr.po index 08ca06d0b..df3b23891 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-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-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:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Erreur" @@ -184,7 +184,9 @@ msgstr "Génération de l'index automatique" msgid "" "Sorry, but that looks like spam to blogspam: " -msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " +msgstr "" +"Désolé, mais cela ressemble à un « spam » selon les critères de blogspam : " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -444,16 +446,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:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../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:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -531,7 +533,9 @@ 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 "Aucune adresse indiqué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" @@ -1061,22 +1065,22 @@ msgstr "Examen de %s" msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, 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 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1106,7 +1110,9 @@ 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, l'installation a échoué avec le message suivant :" +msgstr "" +"** Désactivation du greffon %s, l'installation a échoué avec le message " +"suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1176,12 +1182,12 @@ 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:1243 +#: ../IkiWiki.pm:1251 #, 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:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "oui" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index a9c0fbb99..29a2d508c 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-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-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:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "" @@ -437,16 +437,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -1028,22 +1028,22 @@ msgstr "" msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1139,12 +1139,12 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "" diff --git a/po/it.po b/po/it.po index 53fb3e3f4..c740fb0cb 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-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -18,15 +18,18 @@ 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" +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 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 msgid "Your login session has expired." msgstr "La sessione è scaduta." @@ -50,9 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../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 "Errore" @@ -62,7 +63,8 @@ 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." +msgstr "" +"Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." #: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format @@ -133,8 +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:210 msgid "done" msgstr "fatto" @@ -177,8 +178,12 @@ 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: " +msgid "" +"Sorry, but that looks like spam to blogspam: " +msgstr "" +"È stato riconosciuto come spam da blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -189,8 +194,7 @@ 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:124 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" @@ -203,8 +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:97 msgid "bad page name" msgstr "nome pagina non valido" @@ -240,8 +243,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:525 -#: ../IkiWiki/Plugin/websetup.pm:236 +#: ../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" @@ -257,10 +259,8 @@ 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: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" @@ -290,10 +290,8 @@ msgstr "%s non è una pagina modificabile" 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: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" @@ -324,13 +322,11 @@ 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:62 ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:64 -#: ../IkiWiki/Plugin/goto.pm:57 +#: ../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." @@ -344,8 +340,7 @@ 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/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" @@ -360,8 +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:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -369,7 +363,9 @@ 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" +msgstr "" +"Errore nell'interpretazione dell'URL, impossibile determinare il nome del " +"dominio" #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" @@ -390,8 +386,10 @@ 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" +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" @@ -402,8 +400,7 @@ msgstr "Image::Magick non è installato" 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:83 ../IkiWiki/Plugin/img.pm:87 #: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" @@ -421,7 +418,8 @@ 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" +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" @@ -445,16 +443,16 @@ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -469,12 +467,14 @@ 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" +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)" +msgstr "" +"impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" #: ../IkiWiki/Plugin/meta.pm:158 msgid "stylesheet not found" @@ -530,7 +530,9 @@ 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." +msgstr "" +"Nessun indirizzo email, impossibile inviare per email le istruzioni per " +"reimpostare la password." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -538,7 +540,8 @@ 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." +msgstr "" +"Il messaggio con le istruzioni per reimpostare la password è stato inviato." #: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" @@ -572,7 +575,9 @@ 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." +msgstr "" +"attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " +"alla versione 0.35." #: ../IkiWiki/Plugin/po.pm:136 #, perl-format @@ -581,20 +586,25 @@ 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" +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" +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 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "compilazione di %s" @@ -604,12 +614,20 @@ 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." +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." +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 @@ -644,8 +662,7 @@ msgstr "impossibile tradurre %s" msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1046 -#: ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 #: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" @@ -662,7 +679,9 @@ 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" +msgstr "" +"dati gettext non validi, tornare alle pagina precedente per continuare le " +"modifiche" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -759,14 +778,15 @@ 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\"" +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 +#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 #, perl-format msgid "%s does not exist" msgstr "%s non esiste" @@ -776,8 +796,7 @@ msgstr "%s non esiste" 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:41 ../IkiWiki/Plugin/rename.pm:45 #, perl-format msgid "%s is not a file" msgstr "%s non è un file" @@ -976,12 +995,19 @@ 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." +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." +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 @@ -1000,11 +1026,14 @@ 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" +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 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" @@ -1029,22 +1058,22 @@ msgstr "scansione %s" msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1072,7 +1101,8 @@ 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:" +msgstr "" +"** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1140,12 +1170,12 @@ 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:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "sì" @@ -1173,4 +1203,3 @@ 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 27c6f56fcfac8a60b55751a7eda90bf78fab8c1f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:05:46 -0400 Subject: typo --- doc/ikiwiki/searching.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwiki/searching.mdwn b/doc/ikiwiki/searching.mdwn index 539e7193d..4c1287933 100644 --- a/doc/ikiwiki/searching.mdwn +++ b/doc/ikiwiki/searching.mdwn @@ -5,7 +5,7 @@ then="This wiki has searching **enabled**." else="This wiki has searching **disabled**."]] 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 constuct +as you'd expect. There are a few special things you can do to construct more powerful searches. * To match a phrase, enclose it in double quotes. -- cgit v1.2.3 From 4ce93af516360a223016681961481f51a3ce81f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:09:43 -0400 Subject: translation of directives --- doc/plugins/po.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 079a36633..9273da399 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -358,6 +358,15 @@ Ugly messages with empty files If there are empty .mdwn files, the po plugin displays some ugly messages. +Translation of directives +------------------------- + +If a translated page contains a directive, it may expand to some english +text, or text in whatever single language ikiwiki is configured to "speak". + +Maybe there could be a way to switch ikiwiki to speaking another language +when building a non-english page? Then the directives would get translated. + Documentation ------------- -- cgit v1.2.3 From 2736fc5ba975a92311649b5951c677223732d531 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2009 13:11:55 -0400 Subject: close; multimarkdown not enabled by default --- doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn index c9756617d..d6136ed4e 100644 --- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -36,3 +36,7 @@ But instead it gives:

Orange : The fruit of an evergreen tree of the genus Citrus.

+ +> ikiwiki's markdown support does not include support for multimarkdown by +> default. If you want to enable that, you can turn on the `multimarkdown` +> option in the setup file. --[[Joey]] [[done]] -- cgit v1.2.3 From 70c601990b345b03ddf2406c46017da232bef8b9 Mon Sep 17 00:00:00 2001 From: "https://infosoph.myopenid.com/" Date: Wed, 26 Aug 2009 14:39:25 -0400 Subject: Forgot to mention I have multimarkdown enabled --- doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn index d6136ed4e..97538ed87 100644 --- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -39,4 +39,13 @@ But instead it gives: > ikiwiki's markdown support does not include support for multimarkdown by > default. If you want to enable that, you can turn on the `multimarkdown` -> option in the setup file. --[[Joey]] [[done]] +> option in the setup file. --[[Joey]] + +>> Sorry, I should have indicated, I have multimarkdown enabled: + + # mdwn plugin + # enable multimarkdown features? + multimarkdown => 1, + +>>Other features appear to be working, tables and footnotes for instance. See current install: + -- cgit v1.2.3 From dc1399fa809dc38e070a3c160b26926c27a04ddd Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 26 Aug 2009 21:19:55 -0400 Subject: initial patch proposal --- ...irrorlist_with_per-mirror_usedirs_settings.mdwn | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn (limited to 'doc') diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn new file mode 100644 index 000000000..6ca9962ba --- /dev/null +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -0,0 +1,24 @@ +I've got a wiki that is built at two places: + +* a static copy, aimed at being viewed without any web server, using + a web browser's `file:///` urls => usedirs is disabled to get nice + and working links +* an online copy, with usedirs enabled in order to benefit from the + language negotiation using the po plugin + +I need to use mirrorlist on the static copy, so that one can easily +reach the online, possibly updated, pages. But as documented, "pages are +assumed to exist in the same location under the specified url on each +mirror", so the generated urls are wrong. + +My `mirrorlist` branch contains a patch that allows one to configure usedirs +per-mirror. Note: the old configuration format is still supported, so this should +not break existing wikis. + +OT: as a bonus, this branch contains a patch to support {hashes,arrays} of +{hashes,arrays} in `$config`, which I missed a bit when writing the po plugin, +and decided this time it was really needed to implement this feature. + +--[[intrigeri]] + +[[!tag patch]] -- cgit v1.2.3 From 6ba35a7cb41f18e79a0257d40df0ec1d56035101 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 12:41:25 -0400 Subject: forwarded --- doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn index 97538ed87..6dac9c8b8 100644 --- a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -49,3 +49,6 @@ But instead it gives: >>Other features appear to be working, tables and footnotes for instance. See current install: +>>> Ok, in that case it's a bug in the perl module. Forwarded to +>>> --[[Joey]] +>>> [[!tag done]] -- cgit v1.2.3 From 18fc71f033cf0ff9ccd6ef16212ce3b4e34ac725 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 12:56:24 -0400 Subject: unsure if this patch is enough --- doc/plugins/po.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 9273da399..b77c545d9 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -264,6 +264,11 @@ 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? (Also, if `mybestlink` is going to always +>> just return `bestlink` in this case, there seems no reason to inject +>> it.) --[[Joey]] + Language display order ---------------------- -- cgit v1.2.3 From e1acb707db3f204708f88648ed80762689a15425 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 12:57:04 -0400 Subject: cherry-picked fix for recentchanges links --- doc/plugins/po.mdwn | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index b77c545d9..2e32d78fd 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -332,18 +332,6 @@ Also, this may only happen if the page being linked to is coming from an underlay, and the underlays lack translation to a given language. --[[Joey]] -recentchanges links to po files -------------------------------- - -When a po file is changed, the recentchanges page shows a link such as -"sandbox.es". But, clicking on it goes to the English (or negotiated -language) version of the page. It would be better in this one case if -the link went direct to the translated version of the page. --[[Joey]] - -> The (untested) commit 496e8523c670 in my po branch might fix this... -> or at least, I believe, put someone on the right track. -> --[[intrigeri]] - Double commits of po files -------------------------- -- cgit v1.2.3 From 5e515b493c00c70095aeb8bad1e0b7757ed943db Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 13:10:31 -0400 Subject: followups --- doc/plugins/po.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2e32d78fd..65573b877 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -294,6 +294,12 @@ that po might be replacing the only link on a page, in error? > be either good (better overall l10n) or bad (break the other > plugin's goal). --[[intrigeri]] +>> Right.. well, the cases where links are added is very small. +>> Grepping for `add_link`, it's just done by link, camelcase, meta, and +>> tag. All of these are supposed to work just link regular links +>> so I'd think that is ok. We could probably remove the currently scary +>> comment about only wanting to change the first link. --[[Joey]] + Name of toplevel index page --------------------------- @@ -305,6 +311,14 @@ like "index.da". --[[Joey]] > 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]] + Pagespecs --------- -- cgit v1.2.3 From 7d35d17f956740a310465d5162b9313e120694a3 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 27 Aug 2009 20:01:24 +0200 Subject: doc/po: follow-up Signed-off-by: intrigeri --- doc/plugins/po.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 65573b877..2c230d409 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -300,6 +300,8 @@ that po might be replacing the only link on a page, in error? >> so I'd think that is ok. We could probably remove the currently scary >> comment about only wanting to change the first link. --[[Joey]] +>>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]] + Name of toplevel index page --------------------------- -- cgit v1.2.3 From 6bc3206af16f4910e49478319a8e81d74c7de342 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 27 Aug 2009 20:21:16 +0200 Subject: doc/po: follow-up --- doc/plugins/po.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 2c230d409..1d343e0f8 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -321,6 +321,8 @@ like "index.da". --[[Joey]] >> 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 eaa782a1856cff50df68f1135955d58dc97bb833 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 27 Aug 2009 20:38:36 +0200 Subject: doc/po(self-links): follow-ups Signed-off-by: intrigeri --- doc/plugins/po.mdwn | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 1d343e0f8..673bbf406 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -265,9 +265,20 @@ 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? (Also, if `mybestlink` is going to always ->> just return `bestlink` in this case, there seems no reason to inject ->> it.) --[[Joey]] +>> `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 ffcd97ce52edd73f092d15aae89bbacad99b38b6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 15:49:12 -0400 Subject: change cherry-picked; move to discussion --- doc/plugins/po.mdwn | 24 ------------------------ doc/plugins/po/discussion.mdwn | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 24 deletions(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 673bbf406..9c4d8ffbd 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -289,30 +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]] -Duplicate %links ? ------------------- - -I notice code in the scan hook that seems to assume -that %links will accumulate duplicate links for a page. -That used to be so, but the bug was fixed. Does this mean -that po might be replacing the only link on a page, in error? ---[[Joey]] - -> It would replace it. The only problematic case is when another -> plugin has its own reasons, in its `scan` hook, to add a page -> that is already there to `$links{$page}`. This other plugin's -> effect might then be changed by po's `scan` hook... which could -> be either good (better overall l10n) or bad (break the other -> plugin's goal). --[[intrigeri]] - ->> Right.. well, the cases where links are added is very small. ->> Grepping for `add_link`, it's just done by link, camelcase, meta, and ->> tag. All of these are supposed to work just link regular links ->> so I'd think that is ok. We could probably remove the currently scary ->> comment about only wanting to change the first link. --[[Joey]] - ->>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]] - Name of toplevel index page --------------------------- diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn index 1c3f0e752..ab822e76c 100644 --- a/doc/plugins/po/discussion.mdwn +++ b/doc/plugins/po/discussion.mdwn @@ -699,3 +699,28 @@ and via CGI, have been tested. * general test with `indexpages` enabled: **not OK** * general test with `po_link_to=default` with `userdirs` enabled: **OK** * general test with `po_link_to=default` with `userdirs` disabled: **OK** + +Duplicate %links ? +------------------ + +I notice code in the scan hook that seems to assume +that %links will accumulate duplicate links for a page. +That used to be so, but the bug was fixed. Does this mean +that po might be replacing the only link on a page, in error? +--[[Joey]] + +> It would replace it. The only problematic case is when another +> plugin has its own reasons, in its `scan` hook, to add a page +> that is already there to `$links{$page}`. This other plugin's +> effect might then be changed by po's `scan` hook... which could +> be either good (better overall l10n) or bad (break the other +> plugin's goal). --[[intrigeri]] + +>> Right.. well, the cases where links are added is very small. +>> Grepping for `add_link`, it's just done by link, camelcase, meta, and +>> tag. All of these are supposed to work just link regular links +>> so I'd think that is ok. We could probably remove the currently scary +>> comment about only wanting to change the first link. --[[Joey]] + +>>> Commit 3c2bffe21b91684 in my po branch does this. --[[intrigeri]] +>>>> Cherry-picked --[[Joey]] -- 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 'doc') 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 'doc') 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 545029fe4bc11e828da193745c7555c1e8322768 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 28 Aug 2009 01:13:43 +0100 Subject: Explain my depends-exact branch --- doc/todo/optimize_simple_dependencies.mdwn | 48 ++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 doc/todo/optimize_simple_dependencies.mdwn (limited to 'doc') diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn new file mode 100644 index 000000000..c3ccd5ad0 --- /dev/null +++ b/doc/todo/optimize_simple_dependencies.mdwn @@ -0,0 +1,48 @@ +[[!template id=gitbranch branch=smcv/ready/depends-exact author="[[smcv]]"]] + +I'm still trying to optimize ikiwiki for a site using +[[plugins/contrib/album]], and checking which pages depend on which pages +is still taking too long. Here's another go at fixing that, using [[Will]]'s +suggestion from [[todo/should_optimise_pagespecs]]: + +> A hash, by itself, is not optimal because +> the dependency list holds two things: page names and page specs. The hash would +> work well for the page names, but you'll still need to iterate through the page specs. +> I was thinking of keeping a list and a hash. You use the list for pagespecs +> and the hash for individual page names. To make this work you need to adjust the +> API so it knows which you're adding. -- [[Will]] + +If you have P pages and refresh after changing C of them, where an average +page has E dependencies on exact page names and D other dependencies, this +branch should drop the complexity of checking dependencies from +O(P * (D+E) * C) to O(C + P*E + P*D*C). Pages that use inline or map have +a large value for E (e.g. one per inlined page) and a small value for D (e.g. +one per inline). + +Benchmarking: + +Test 1: a wiki with about 3500 pages and 3500 photos, and a change that +touches about 350 pages and 350 photos + +Test 2: the docwiki (about 700 objects not excluded by docwiki.setup, mostly +pages), docwiki.setup modified to turn off verbose, and a change that touches +the 98 pages of plugins/*.mdwn + +In both tests I rebuilt the wiki with the target ikiwiki version, then touched +the appropriate pages and refreshed. + +Results of test 1: without this branch it took around 5:45 to rebuild and +around 5:45 again to refresh (so rebuilding 10% of the pages, then deciding +that most of the remaining 90% didn't need to change, took about as long as +rebuilding everything). With this branch it took 5:47 to rebuild and 1:16 +to refresh. + +Results of test 2: rebuilding took 14.11s without, 13.96s with; refreshing +three times took 7.29/7.40/7.37s without, 6.62/6.56/6.63s with. + +(This benchmarking was actually done with my [[plugins/contrib/album]] branch, +since that's what the huge wiki needs; that branch doesn't alter core code +beyond the ready/depends-exact branch point, so the results should be +equally valid.) + +--[[smcv]] -- cgit v1.2.3 From 04a8da4f0176d153fed7d9a1c483f19b70f32900 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 21:00:39 -0400 Subject: mention ignore branch --- doc/git.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/git.mdwn b/doc/git.mdwn index 06bccc7a3..f6971e84b 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -64,6 +64,8 @@ Some of the branches included in the main repository include: * `debian-stable` is used for updates to the old version included in Debian's stable release, and `debian-testing` is used for updates to Debian's testing release. +* `ignore` gets various branches merged to it that Joey wishes to ignore + when looking at everyone's unmerged changes. * `pristine-tar` contains deltas that [pristine-tar](http://kitenet.net/~joey/code/pristine-tar) can use to recreate released tarballs of ikiwiki -- cgit v1.2.3 From b7a3fbec78a7584f24b8dcc38e5e9537ad95c7f5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 27 Aug 2009 21:36:55 -0400 Subject: response --- doc/todo/optimize_simple_dependencies.mdwn | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'doc') diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn index c3ccd5ad0..44163311b 100644 --- a/doc/todo/optimize_simple_dependencies.mdwn +++ b/doc/todo/optimize_simple_dependencies.mdwn @@ -46,3 +46,23 @@ beyond the ready/depends-exact branch point, so the results should be equally valid.) --[[smcv]] + +> We discussed this on irc; I had some worries that things may have been +> switched to `add_depends_exact` that were not pure page names. My current +> feeling is it's all safe, but who knows. It's easy to miss something. +> Which makes me think this is not a good interface. +> +> Why not, instead, make `add_depends` smart. If it's passed something +> that is clearly a raw page name, it can add it to the exact depends hash. +> Else, add it to the pagespec hash. You can tell if it's a pure page name +> by matching on `$config{wiki_file_regexp}`. +> +> Also I think there may be little optimisation value left in +> 7227c2debfeef94b35f7d81f42900aa01820caa3, since the "regular" dependency +> lists will be much shorter. +> +> Sounds like inline pagenames has an already exstant bug WRT +> pages moving, which this should not make worse. Would be good to verify. +> +> Re coding, it would be nice if `refresh()` could avoid duplicating +> the debug message, etc in the two cases. --[[Joey]] -- cgit v1.2.3 From 8064acf87fb7e708a03e47dd82457dec237e886e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 28 Aug 2009 13:19:48 +0200 Subject: doc/po: reported bug + patches wrt. created page type Signed-off-by: intrigeri --- doc/plugins/po.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 57459c1ef..3b152586e 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -317,6 +317,19 @@ text, or text in whatever single language ikiwiki is configured to "speak". Maybe there could be a way to switch ikiwiki to speaking another language when building a non-english page? Then the directives would get translated. +Created page type +----------------- + +The interdiction to create pages of type po was broken by the new +`page_types` code. This is fixed in my po branch by +commit 1914ae2fd24e1e802. + +While I was there, I also added some code to set a new default value +to the type select field in case it was previously set to "po". +This code favors the type of the linking page's masterpage on page +creation (when `from=page.LL`). This is commit c9301d2c296f682. +--[[intrigeri]] + Documentation ------------- -- 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 'doc') 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 e3b5d7013717af732b36efd9e4abe1f14d0f3175 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 28 Aug 2009 14:41:32 +0200 Subject: doc/po: bug report + patch proposal wrt. inline's post form's rootpage Signed-off-by: intrigeri --- doc/plugins/po.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index fdef41e45..39b237c73 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -332,6 +332,17 @@ creation (when `from=page.LL`). This is commit c9301d2c296f682. > Both cherry picked. --[[Joey]] +inline's post form's rootpage +----------------------------- + +When a translatable page (say it is called "bugs") contains an +[[inline directive|ikiwiki/directive/inline]] with `postform` enabled, +the rootpage is l10n'd on translations pages (e.g. "bugs.fr" gets +a `rootpage` value of `bugs.fr`). This is usually not what's expected, +as translation pages are not supposed to have subpages. My po branch +has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes +this. --[[intrigeri]] + Documentation ------------- -- cgit v1.2.3 From 3f303cc853426a1ddb8e36b8fb544a69bced3721 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 28 Aug 2009 15:25:05 +0200 Subject: follow-up Signed-off-by: intrigeri --- .../language_definition_for_the_meta_plugin.mdwn | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/todo/language_definition_for_the_meta_plugin.mdwn b/doc/todo/language_definition_for_the_meta_plugin.mdwn index 90bfbef3b..44fcf32bb 100644 --- a/doc/todo/language_definition_for_the_meta_plugin.mdwn +++ b/doc/todo/language_definition_for_the_meta_plugin.mdwn @@ -95,7 +95,24 @@ This may be useful for sites with a few pages in different languages, but no ful >>> Now that po has been merged, this patch should probably also be adapted >>> so that the po plugin forces the meta::lang of every page to what po ->>> thinks it should be. Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]] ->>> should also work with meta-assigned languages? --[[smcv]] +>>> thinks it should be. --[[smcv]] + +>>>> Agreed, users of the po plugin would greatly benefit from it. +>>>> Seems doable. --[[intrigeri]] + +>>> Perhaps [[the_special_po_pagespecs|ikiwiki/pagespec/po]] should +>>> also work with meta-assigned languages? --[[smcv]] + +>>>> Yes. But then, these special pagespecs should be moved outside of +>>>> [[plugins/po]], as they could be useful to anyone using the +>>>> currently discussed patch even when not using the po plugin. +>>>> +>>>> We could add these pagespecs to the core and make them use +>>>> a simple language-guessing system based on a new hook. Any plugin +>>>> that implements such a hook could decide whether it should +>>>> overrides the language guessed by another one, and optionally use +>>>> the `first`/`last` options (e.g. the po plugin will want to be +>>>> authoritative on the pages of type po, and will then use +>>>> `last`). --[[intrigeri]] [[!tag wishlist patch plugins/meta translation]] -- cgit v1.2.3 From 6be874612539d3148d288fc6a4c47743a7c0c8fc Mon Sep 17 00:00:00 2001 From: intrigeri Date: Fri, 28 Aug 2009 16:38:13 +0200 Subject: doc/po: report problem with link() + propose patch Signed-off-by: intrigeri --- doc/plugins/po.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 39b237c73..031188a67 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -343,6 +343,15 @@ as translation pages are not supposed to have subpages. My po branch has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes this. --[[intrigeri]] +link() pagespec on translation pages +------------------------------------ + +The `link()` pagespec, on translation pages, currently tests whether +a given page links to the *current translation page*, rather than +whether it links to its master page. I believe the later is generally +expected. Commit 646c9a4c95a480 in my po branch fixes this. +--[[intrigeri]] + Documentation ------------- -- cgit v1.2.3 From de4dc8befe7ede3cd34daf3f2bce5dd6305599f0 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 28 Aug 2009 15:48:51 +0100 Subject: Updated branch, thanks for the feedback --- doc/todo/optimize_simple_dependencies.mdwn | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'doc') diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn index 44163311b..10c6c7272 100644 --- a/doc/todo/optimize_simple_dependencies.mdwn +++ b/doc/todo/optimize_simple_dependencies.mdwn @@ -56,13 +56,33 @@ equally valid.) > that is clearly a raw page name, it can add it to the exact depends hash. > Else, add it to the pagespec hash. You can tell if it's a pure page name > by matching on `$config{wiki_file_regexp}`. -> + +>> Good thinking. Done in commit 68ce514a 'Auto-detect "simple dependencies"', +>> with a related bugfix in e8b43825 "Force %depends_exact to lower case". +>> +>> Performance impact: Test 2 above takes 0.2s longer to rebuild (probably +>> from all the calls to lc, which are, however, necessary for correctness) +>> and has indistinguishable performance for a refresh. --[[smcv]] + > Also I think there may be little optimisation value left in > 7227c2debfeef94b35f7d81f42900aa01820caa3, since the "regular" dependency > lists will be much shorter. -> + +>> You're probably right, but IMO it's not worth reverting it - a set (hash with +>> dummy values) is still the right data structure. --[[smcv]] + > Sounds like inline pagenames has an already exstant bug WRT > pages moving, which this should not make worse. Would be good to verify. -> + +>> If you mean the standard "add a better match for a link-like construct" bug +>> that also affects sidebar, then yes, it does have the bug, but I'm pretty +>> sure this branch doesn't make it any worse. I could solve this at the cost +>> of making pagenames less useful for interactive use, by making it not +>> respect [[ikiwiki/subpage/LinkingRules]], but instead always interpret +>> its paths as relative to the top of the wiki - that's actually all that +>> [[plugins/contrib/album]] needs. --[[smcv]] + > Re coding, it would be nice if `refresh()` could avoid duplicating -> the debug message, etc in the two cases. --[[Joey]] +> the debug message, etc in the two cases. --[[Joey]] + +>> Fixed in commit f805d566 "Avoid duplicating debug message..." --[[smcv]] -- cgit v1.2.3 From 54b3d55aadf9c6ee2b4b3aa68b3a1794a9394fd4 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 28 Aug 2009 15:50:02 +0100 Subject: Mark as done --- doc/todo/optimize_simple_dependencies.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn index 44163311b..50ecafa05 100644 --- a/doc/todo/optimize_simple_dependencies.mdwn +++ b/doc/todo/optimize_simple_dependencies.mdwn @@ -47,6 +47,10 @@ equally valid.) --[[smcv]] +> Now [[merged|done]] --[[smcv]] + +---- + > We discussed this on irc; I had some worries that things may have been > switched to `add_depends_exact` that were not pure page names. My current > feeling is it's all safe, but who knows. It's easy to miss something. -- cgit v1.2.3 From 54f94e6bc88415990db5b5095b6a52890797f6f7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 28 Aug 2009 16:11:52 +0100 Subject: Some crude benchmarking on a larger wiki --- doc/todo/optimize_simple_dependencies.mdwn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/todo/optimize_simple_dependencies.mdwn b/doc/todo/optimize_simple_dependencies.mdwn index 10c6c7272..da75ff177 100644 --- a/doc/todo/optimize_simple_dependencies.mdwn +++ b/doc/todo/optimize_simple_dependencies.mdwn @@ -62,7 +62,12 @@ equally valid.) >> >> Performance impact: Test 2 above takes 0.2s longer to rebuild (probably >> from all the calls to lc, which are, however, necessary for correctness) ->> and has indistinguishable performance for a refresh. --[[smcv]] +>> and has indistinguishable performance for a refresh. +>> +>> Test 1 took about 6 minutes to rebuild and 1:25 to refresh; those are +>> pessimistic figures, since I've added 90 more photos and 90 more pages +>> (both to the wiki as a whole, and the number touched before refreshing) +>> since testing the previous version of this branch. --[[smcv]] > Also I think there may be little optimisation value left in > 7227c2debfeef94b35f7d81f42900aa01820caa3, since the "regular" dependency -- cgit v1.2.3 From 79d3bb16ea54520cffbb4e120b1a87a3b2967cb4 Mon Sep 17 00:00:00 2001 From: "http://emptty.myopenid.com/" Date: Fri, 28 Aug 2009 12:18:30 -0400 Subject: my first edit to this site, please forgive mistakes --- doc/todo/Restrict_page_viewing.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/todo/Restrict_page_viewing.mdwn (limited to 'doc') diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn new file mode 100644 index 000000000..b25b7de0a --- /dev/null +++ b/doc/todo/Restrict_page_viewing.mdwn @@ -0,0 +1,11 @@ +I'd like to have some pages of my wiki to be only viewable by some users. + +I could use htaccess for that, but it would force the users to have 2 authentication mecanisms, so I'd prefer to use openID for that too. + +* I'm thinking of adding a "show" parameter to the cgi script, thanks to a plugin similar to goto. +* When called, it would check the credential using the session stuff (that I don't understand yet). If not enough, it would serve a 403 error of course. +* If enough, it would read the file locally on the server side and return this as a content. + +Then, I'd have to generate the private page the regular way with ikiwiki, and prevent apache from serving them with an appropriate and much more maintainable htaccess file. + +-- [[users/emptty]] -- cgit v1.2.3 From b6e589c9a484a60b804b9208b41209ca05101682 Mon Sep 17 00:00:00 2001 From: "http://emptty.myopenid.com/" Date: Fri, 28 Aug 2009 12:22:38 -0400 Subject: Introduce myself --- doc/users/emptty.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/users/emptty.mdwn (limited to 'doc') diff --git a/doc/users/emptty.mdwn b/doc/users/emptty.mdwn new file mode 100644 index 000000000..08ef7d0f3 --- /dev/null +++ b/doc/users/emptty.mdwn @@ -0,0 +1,2 @@ +My professional homepage is [here](http://www.loria.fr/~quinson/). I'm currently (09/09) trying to move it from WML to ikiwiki. +I'm sure I'll have a bunch of ideas, requests and maybe even patches in the process. -- cgit v1.2.3 From 4236eb5f688944d70c19427e1150285238ce61ce Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 15:00:58 -0400 Subject: response --- doc/todo/Restrict_page_viewing.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn index b25b7de0a..ec7b05a51 100644 --- a/doc/todo/Restrict_page_viewing.mdwn +++ b/doc/todo/Restrict_page_viewing.mdwn @@ -9,3 +9,7 @@ I could use htaccess for that, but it would force the users to have 2 authentica Then, I'd have to generate the private page the regular way with ikiwiki, and prevent apache from serving them with an appropriate and much more maintainable htaccess file. -- [[users/emptty]] + +> While I'm sure a plugin could do this, it adds so much scalability cost +> and is so counter to ikiwiki's design.. Have you considered using the +> [[plugins/httpauth]] plugin to unify around htaccess auth? --[[Joey]] -- cgit v1.2.3 From 54a3928508d4421388e1b0876f963aa648da695c Mon Sep 17 00:00:00 2001 From: furby Date: Fri, 28 Aug 2009 18:03:28 -0400 Subject: --- doc/sandbox.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 6ea8cc607..b986176ae 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -171,3 +171,10 @@ testing [[!toc levels=2]] [[Mamma Mia]] +---- + +[[!format c """ +void main () { + printf("hello, world!"); +} +"""]] -- cgit v1.2.3 From 25bf32431fd59afcc808eb74d5cefc96efab1182 Mon Sep 17 00:00:00 2001 From: furby Date: Fri, 28 Aug 2009 18:08:16 -0400 Subject: --- doc/sandbox.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index b986176ae..96b880b34 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -171,6 +171,7 @@ testing [[!toc levels=2]] [[Mamma Mia]] + ---- [[!format c """ @@ -178,3 +179,5 @@ void main () { printf("hello, world!"); } """]] + + -- cgit v1.2.3 From 2ba54735ce78a80d9577bef068f674559dddf57b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 18:22:11 -0400 Subject: po test suite failure --- doc/plugins/po.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 031188a67..4fecaeb53 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -352,6 +352,12 @@ whether it links to its master page. I believe the later is generally expected. Commit 646c9a4c95a480 in my po branch fixes this. --[[intrigeri]] +2 test suite failures +-------------------- + +t/po is currently failing tests 57 and 59 (and I would like to release +soon..) --[[Joey]] + Documentation ------------- -- cgit v1.2.3 From 94727e7fcfff204030bec64509ecedacb0abd6dc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 28 Aug 2009 19:49:22 -0400 Subject: merged --- doc/plugins/po.mdwn | 35 ----------------------------------- 1 file changed, 35 deletions(-) (limited to 'doc') diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index 4fecaeb53..04420c115 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -317,41 +317,6 @@ text, or text in whatever single language ikiwiki is configured to "speak". Maybe there could be a way to switch ikiwiki to speaking another language when building a non-english page? Then the directives would get translated. -Created page type ------------------ - -The interdiction to create pages of type po was broken by the new -`page_types` code. This is fixed in my po branch by -commit 1914ae2fd24e1e802. - -While I was there, I also added some code to set a new default value -to the type select field in case it was previously set to "po". -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]] - -inline's post form's rootpage ------------------------------ - -When a translatable page (say it is called "bugs") contains an -[[inline directive|ikiwiki/directive/inline]] with `postform` enabled, -the rootpage is l10n'd on translations pages (e.g. "bugs.fr" gets -a `rootpage` value of `bugs.fr`). This is usually not what's expected, -as translation pages are not supposed to have subpages. My po branch -has code (e671e72053e81fa, which depends on 72ac9821e56637) that fixes -this. --[[intrigeri]] - -link() pagespec on translation pages ------------------------------------- - -The `link()` pagespec, on translation pages, currently tests whether -a given page links to the *current translation page*, rather than -whether it links to its master page. I believe the later is generally -expected. Commit 646c9a4c95a480 in my po branch fixes this. ---[[intrigeri]] - 2 test suite failures -------------------- -- cgit v1.2.3 From a4c9a8461cc85377f8c88a62f2f980a0c7e2a042 Mon Sep 17 00:00:00 2001 From: "http://emptty.myopenid.com/" Date: Sat, 29 Aug 2009 04:28:01 -0400 Subject: Answer to Joey, and justify my text (in the source) --- doc/todo/Restrict_page_viewing.mdwn | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn index ec7b05a51..0b2a65a66 100644 --- a/doc/todo/Restrict_page_viewing.mdwn +++ b/doc/todo/Restrict_page_viewing.mdwn @@ -1,15 +1,27 @@ I'd like to have some pages of my wiki to be only viewable by some users. -I could use htaccess for that, but it would force the users to have 2 authentication mecanisms, so I'd prefer to use openID for that too. +I could use htaccess for that, but it would force the users to have +2 authentication mecanisms, so I'd prefer to use openID for that too. -* I'm thinking of adding a "show" parameter to the cgi script, thanks to a plugin similar to goto. -* When called, it would check the credential using the session stuff (that I don't understand yet). If not enough, it would serve a 403 error of course. -* If enough, it would read the file locally on the server side and return this as a content. +* I'm thinking of adding a "show" parameter to the cgi script, thanks + to a plugin similar to goto. +* When called, it would check the credential using the session stuff + (that I don't understand yet). +* If not enough, it would serve a 403 error of course. +* If enough, it would read the file locally on the server side and + return this as a content. -Then, I'd have to generate the private page the regular way with ikiwiki, and prevent apache from serving them with an appropriate and much more maintainable htaccess file. +Then, I'd have to generate the private page the regular way with ikiwiki, +and prevent apache from serving them with an appropriate and +much more maintainable htaccess file. -- [[users/emptty]] > While I'm sure a plugin could do this, it adds so much scalability cost > and is so counter to ikiwiki's design.. Have you considered using the > [[plugins/httpauth]] plugin to unify around htaccess auth? --[[Joey]] + +>> I'm not speaking of rendering the pages on demand, but to serve them on demand. +>> They would still be compiled the regular way; +>> I'll have another look at [[plugins/httpauth]] but I really like the openID whole idea. +>> --[[emptty]] -- cgit v1.2.3 From a0de415ae0bdfef3aa12bc4201f72c6dedbe021d Mon Sep 17 00:00:00 2001 From: bremner Date: Sat, 29 Aug 2009 07:16:57 -0400 Subject: build failure on nearlyfreespeech.net --- doc/tips/nearlyfreespeech/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/tips/nearlyfreespeech/discussion.mdwn (limited to 'doc') diff --git a/doc/tips/nearlyfreespeech/discussion.mdwn b/doc/tips/nearlyfreespeech/discussion.mdwn new file mode 100644 index 000000000..3d4dc732d --- /dev/null +++ b/doc/tips/nearlyfreespeech/discussion.mdwn @@ -0,0 +1,9 @@ +with version 3.141592 I get +
+HOME=/home/me /usr/bin/perl -Iblib/lib   ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
+Failed to load plugin IkiWiki::Plugin::inline: Can't use global $_ in "my" at IkiWiki/Plugin/inline.pm line 198, near "my $_"
+Compilation failed in require at (eval 19) line 2.
+BEGIN failed--compilation aborted at (eval 19) line 2.
+
+ +perl is 5.8.9 -- cgit v1.2.3 From 517432273b96fc9e6bad9b7667ef6d1b04c699ee Mon Sep 17 00:00:00 2001 From: "http://schmonz.livejournal.com/" Date: Sat, 29 Aug 2009 10:47:45 -0400 Subject: mod_auth_openid --- doc/todo/Restrict_page_viewing.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'doc') diff --git a/doc/todo/Restrict_page_viewing.mdwn b/doc/todo/Restrict_page_viewing.mdwn index 0b2a65a66..089d27fff 100644 --- a/doc/todo/Restrict_page_viewing.mdwn +++ b/doc/todo/Restrict_page_viewing.mdwn @@ -25,3 +25,12 @@ much more maintainable htaccess file. >> They would still be compiled the regular way; >> I'll have another look at [[plugins/httpauth]] but I really like the openID whole idea. >> --[[emptty]] + +>>> How about +>>> [mod_auth_openid](http://trac.butterfat.net/public/mod_auth_openid), then? +>>> A plugin for ikiwiki to serve its own pages is far afield from ikiwiki's roots, +>>> as Joey pointed out, but might be a neat option to have anyway -- for unifying +>>> authentication across views and edits, for systems not otherwise running +>>> web servers, for systems with web servers you don't have access to, and +>>> doubtless for other purposes. Such a plugin would add quite a bit of flexibility, +>>> and in that sense (IMO, of course) it'd be in the spirit of ikiwiki. --[[schmonz]] -- cgit v1.2.3