From 7aa50b3b2cf11efb09e811b8ffc4d3b8e1b0cc0e Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 11:43:03 +0000 Subject: [PATCH 01/16] Corrected a fuzzy. Changed some error message translation to use ": %s" same as in the English, since the %s error message probably won't be translated. --- po/es.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/es.po b/po/es.po index bd002291d..a384e566f 100644 --- a/po/es.po +++ b/po/es.po @@ -76,9 +76,9 @@ msgid "expiring %s" msgstr "%s caducada" #: ../IkiWiki/Plugin/aggregate.pm:236 -#, fuzzy, perl-format +#, perl-format msgid "checking feed %s ..." -msgstr "comprobando entrada %s\t..." +msgstr "comprobando entrada %s ..." #: ../IkiWiki/Plugin/aggregate.pm:241 #, perl-format @@ -299,7 +299,7 @@ msgstr "ikwiki: no puedo convertir la página %s" #: ../IkiWiki/Setup.pm:13 #, perl-format msgid "cannot read %s: %s" -msgstr "no puedo leer el archivo %s debido a %s" +msgstr "no puedo leer el archivo %s: %s" #: ../IkiWiki/Setup/Standard.pm:32 msgid "generating wrappers.." @@ -339,7 +339,7 @@ msgstr "el programa envoltorio no ha sido especificado" #: ../IkiWiki/Wrapper.pm:62 #, perl-format msgid "failed to write %s: %s" -msgstr "no puedo escribir en %s debido a %s" +msgstr "no puedo escribir en %s: %s" #: ../IkiWiki/Wrapper.pm:97 #, perl-format -- 2.39.5 From 8daaa11baa70e07f6405ccb4474e97cac9627961 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 12:00:23 +0000 Subject: [PATCH 02/16] added some comments for translators --- IkiWiki.pm | 4 +++ IkiWiki/CGI.pm | 2 ++ IkiWiki/Plugin/shortcut.pm | 3 ++ IkiWiki/Setup.pm | 2 ++ IkiWiki/UserInfo.pm | 4 +++ IkiWiki/Wrapper.pm | 4 +++ doc/translation/discussion.mdwn | 18 ++++++++++++ po/Makefile | 2 +- po/es.po | 49 +++++++++++++++++++++++---------- 9 files changed, 72 insertions(+), 16 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 8f7d8d20b..5b78014d1 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -517,6 +517,10 @@ sub preprocess ($$$;$) { #{{{ if ($preprocessing{$page}++ > 3) { # Avoid loops of preprocessed pages preprocessing # other pages that preprocess them, etc. + #translators: The first parameter is a + #translators: preprocessor directive name, + #translators: the second a page name, the + #translators: third a number. return "[[".sprintf(gettext("%s preprocessing loop detected on %s at depth %i"), $command, $page, $preprocessing{$page}). "]]"; diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 5d21d0674..85fc1a386 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -46,6 +46,8 @@ sub page_locked ($$;$) { #{{{ if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) { return 1 if $nonfatal; + #translators: The first parameter is a page name, + #translators: second is the user who locked it. error(sprintf(gettext("%s is locked by %s and cannot be edited"), htmllink("", "", $page, 1), userlink($admin))); diff --git a/IkiWiki/Plugin/shortcut.pm b/IkiWiki/Plugin/shortcut.pm index 9479306a8..2a4a36a41 100644 --- a/IkiWiki/Plugin/shortcut.pm +++ b/IkiWiki/Plugin/shortcut.pm @@ -27,6 +27,9 @@ sub preprocess_shortcut (@) { #{{{ hook(type => "preprocess", no_override => 1, id => $params{name}, call => sub { shortcut_expand($params{url}, $params{desc}, @_) }); + #translators: This is used to display what shortcuts are defined. + #translators: First parameter is the name of the shortcut, the second + #translators: is an URL. return sprintf(gettext("shortcut %s points to %s"), $params{name}, $params{url}); } # }}} diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index 560bc798b..2d6e1d1cf 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -10,6 +10,8 @@ package IkiWiki; sub setup () { # {{{ my $setup=possibly_foolish_untaint($config{setup}); delete $config{setup}; + #translators: The first parameter is a filename, and the second + #translators: is a (probably not translated) error message. open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!)); my $code; { diff --git a/IkiWiki/UserInfo.pm b/IkiWiki/UserInfo.pm index 03d63cc23..267f5d9cd 100644 --- a/IkiWiki/UserInfo.pm +++ b/IkiWiki/UserInfo.pm @@ -132,6 +132,10 @@ sub send_commit_mails ($$$@) { #{{{ else { $pagelist.=join(" ", @changed_pages); } + #translators: The three variables are the name of the wiki, + #translators: A list of one or more pages that were changed, + #translators: And the name of the user making the change. + #translators: This is used as the subject of a commit email. my $subject=sprintf(gettext("update of %s's %s by %s"), $config{wikiname}, $pagelist, $user); diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm index e761085fb..beabc5649 100644 --- a/IkiWiki/Wrapper.pm +++ b/IkiWiki/Wrapper.pm @@ -59,6 +59,8 @@ EOF $configstring=~s/"/\\"/g; $configstring=~s/\n/\\\n/g; + #translators: The first parameter is a filename, and the second is + #translators: a (probably not translated) error message. open(OUT, ">$wrapper.c") || error(sprintf(gettext("failed to write %s: %s"), "$wrapper.c", $!));; print OUT <<"EOF"; /* A wrapper for ikiwiki, can be safely made suid. */ @@ -94,6 +96,7 @@ $envsave EOF close OUT; if (system("gcc", "$wrapper.c", "-o", $wrapper) != 0) { + #translators: The parameter is a C filename. error(sprintf(gettext("failed to compile %s"), "$wrapper.c")); } unlink("$wrapper.c"); @@ -101,6 +104,7 @@ EOF ! chmod(oct($config{wrappermode}), $wrapper)) { error("chmod $wrapper: $!"); } + #translators: The parameter is a filename. printf(gettext("successfully generated %s\n"), $wrapper); } #}}} diff --git a/doc/translation/discussion.mdwn b/doc/translation/discussion.mdwn index 32cc3f5e9..1ee89d57d 100644 --- a/doc/translation/discussion.mdwn +++ b/doc/translation/discussion.mdwn @@ -72,3 +72,21 @@ So I have a request to Joey and the rest of ikiwiki coders: please write more verbose gettext messages and don't fear using subject there. It will be huge help for me and other ikiwiki translators. Thank you! :) --Pawel + +> Well, those messages are mostly laconic because they're output by +> ikiwiki running in unix program mode and other tight situations, and +> it should be clear from context when you see the expanded message what +> the various bits are. +> +> For example, "update of foowiki's MooBar by joey" seems to say enough to +> be clear (and fit in mutt's subject line display), while the corresponding +> "actualizado el wiki foowiki y la página MooBar por el usuario joey" feels +> a bit verbose. (And should it say "updated foowiki *and* the MooBar page" +> like that? My Spanish sucks though..) In my crappy Spanish I might instead +> say something like "actualizado MooBar de foowiki por joey". Or maybe +> "actualizado página Moobar por joey"? +> +> Anyway, to get back to your point, it's true that translators often +> need additonal context about things like what variables expand to, and +> size limits. This is generally done by adding comments in the pot file, +> and I've turned that on, and added a few. --[[Joey]] diff --git a/po/Makefile b/po/Makefile index 910114e67..2d34c6fe8 100644 --- a/po/Makefile +++ b/po/Makefile @@ -16,7 +16,7 @@ install: all ikiwiki.pot: $(POTFILES) @echo "Rebuilding the pot file" - xgettext $(POTFILES) -o ikiwiki.pot -Lperl + xgettext $(POTFILES) -o ikiwiki.pot -Lperl --add-comments=translators clean: rm -f ikiwiki.pot $(MOFILES) messages messages.mo diff --git a/po/es.po b/po/es.po index a384e566f..619171f8c 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-03 14:11-0500\n" +"POT-Creation-Date: 2007-01-04 06:58-0500\n" "PO-Revision-Date: 2007-01-03 09:37+0100\n" "Last-Translator: Víctor Moral \n" "Language-Team: spanish \n" @@ -16,35 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../IkiWiki/CGI.pm:49 +#. translators: The first parameter is a page name, +#. translators: second is the user who locked it. +#: ../IkiWiki/CGI.pm:51 #, perl-format msgid "%s is locked by %s and cannot be edited" msgstr "La página %s está bloqueada por %s y no puede modificarse" -#: ../IkiWiki/CGI.pm:139 +#: ../IkiWiki/CGI.pm:141 msgid "You need to log in first." msgstr "Antes es necesario identificarse" -#: ../IkiWiki/CGI.pm:257 +#: ../IkiWiki/CGI.pm:259 msgid "Preferences saved." msgstr "Las preferencias se han guardado." -#: ../IkiWiki/CGI.pm:408 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 msgid "discussion" msgstr "comentarios" -#: ../IkiWiki/CGI.pm:447 +#: ../IkiWiki/CGI.pm:449 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:507 +#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509 #, perl-format msgid "editing %s" msgstr "modificando página %s" -#: ../IkiWiki/CGI.pm:624 +#: ../IkiWiki/CGI.pm:626 msgid "You are banned." msgstr "Ha sido expulsado." @@ -211,7 +213,10 @@ msgstr "actualizando el índice de búsquedas de hyperstraier" msgid "shortcut missing name or url parameter" msgstr "shortcut necesita el párametro name ó el parámetro url" -#: ../IkiWiki/Plugin/shortcut.pm:30 +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:33 #, perl-format msgid "shortcut %s points to %s" msgstr "El atajo %s lleva a %s" @@ -296,7 +301,9 @@ msgstr "eliminando la página %s puesto que ya no se deriva de %s" msgid "ikiwiki: cannot render %s" msgstr "ikwiki: no puedo convertir la página %s" -#: ../IkiWiki/Setup.pm:13 +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:15 #, perl-format msgid "cannot read %s: %s" msgstr "no puedo leer el archivo %s: %s" @@ -317,7 +324,11 @@ msgstr "actualizando el wiki.." msgid "done" msgstr "completado" -#: ../IkiWiki/UserInfo.pm:135 +#. translators: The three variables are the name of the wiki, +#. translators: A list of one or more pages that were changed, +#. translators: And the name of the user making the change. +#. translators: This is used as the subject of a commit email. +#: ../IkiWiki/UserInfo.pm:139 #, perl-format msgid "update of %s's %s by %s" msgstr "actualizado el wiki %s y la página %s por el usuario %s" @@ -336,17 +347,21 @@ msgstr "" msgid "wrapper filename not specified" msgstr "el programa envoltorio no ha sido especificado" -#: ../IkiWiki/Wrapper.pm:62 +#. translators: The first parameter is a filename, and the second is +#. translators: a (probably not translated) error message. +#: ../IkiWiki/Wrapper.pm:64 #, perl-format msgid "failed to write %s: %s" msgstr "no puedo escribir en %s: %s" -#: ../IkiWiki/Wrapper.pm:97 +#. translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:100 #, perl-format msgid "failed to compile %s" msgstr "ha fallado la compilación del programa envoltorio %s" -#: ../IkiWiki/Wrapper.pm:104 +#. translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:108 #, perl-format msgid "successfully generated %s\n" msgstr "creado con éxito el programa envoltorio %s\n" @@ -365,7 +380,11 @@ msgstr "" msgid "Error" msgstr "Error" -#: ../IkiWiki.pm:520 +#. translators: The first parameter is a +#. translators: preprocessor directive name, +#. translators: the second a page name, the +#. translators: third a number. +#: ../IkiWiki.pm:524 #, perl-format msgid "%s preprocessing loop detected on %s at depth %i" msgstr "" -- 2.39.5 From 34d56721f100420264880aa3b91b5d7417bf6dea Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 12:05:33 +0000 Subject: [PATCH 03/16] response --- doc/todo/Print_link.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/Print_link.mdwn b/doc/todo/Print_link.mdwn index 7927c2708..7c7996812 100644 --- a/doc/todo/Print_link.mdwn +++ b/doc/todo/Print_link.mdwn @@ -37,3 +37,9 @@ for all ikiwiki pages. --Pawel >> Maybe you could add print.css file for printable version? We just have >> local.css file for a local styling. --Pawel + +>>> Sure, very doable, but the UI to switch to it when printing, I don't +>>> know.. +>>> +>>> BTW, I'm sure that the Print link as originally requested could be +>>> written as a plugin fairly simply. --[[Joey]] -- 2.39.5 From dd8483a50e2f94c8a1ff5253e66bc1561a061cd6 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 12:32:05 +0000 Subject: [PATCH 04/16] web commit by http://getopenid.com/ptecza: Response --- doc/banned_users/discussion.mdwn | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/doc/banned_users/discussion.mdwn b/doc/banned_users/discussion.mdwn index af945e953..e25b2074e 100644 --- a/doc/banned_users/discussion.mdwn +++ b/doc/banned_users/discussion.mdwn @@ -12,8 +12,16 @@ whether OpenID users are stored in .ikiwiki/userdb file. --Pawel >> After all I store my OpenID password on OpenID server and I don't >> want to do it on ikiwiki home page site. --Pawel -> This wiki is currently configured to use both passwordauth and openid, so -> it's possible to create an account by signing in with an openid, then -> enter a password for that account, and then log in using the openid and -> the password. Though I can't imagine why you'd waint to do that.. The -> password stuff goes away if passwordauth is disabled. +>> This wiki is currently configured to use both passwordauth and openid, so +>> it's possible to create an account by signing in with an openid, then +>> enter a password for that account, and then log in using the openid and +>> the password. Though I can't imagine why you'd waint to do that.. The +>> password stuff goes away if passwordauth is disabled. + +>>> OK, I see it now :) The reason I can't do it (if I don't need it) +>>> is very simple: why to put my password in two places if I can to +>>> do it in one? ;) + +>>> BTW, have you had a sleep this night? ;) Here, in Poland, the time is +>>> 1:30 PM (in your timezone is 7:30 AM), but we're just discussing for +>>> about 3 hours... --Pawel \ No newline at end of file -- 2.39.5 From 9658b6019b369d41fc39877904c6b6831bec9982 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 12:35:06 +0000 Subject: [PATCH 05/16] web commit by http://getopenid.com/ptecza: Fix indentation --- doc/banned_users/discussion.mdwn | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/banned_users/discussion.mdwn b/doc/banned_users/discussion.mdwn index e25b2074e..7c2e5c2da 100644 --- a/doc/banned_users/discussion.mdwn +++ b/doc/banned_users/discussion.mdwn @@ -12,16 +12,16 @@ whether OpenID users are stored in .ikiwiki/userdb file. --Pawel >> After all I store my OpenID password on OpenID server and I don't >> want to do it on ikiwiki home page site. --Pawel ->> This wiki is currently configured to use both passwordauth and openid, so ->> it's possible to create an account by signing in with an openid, then ->> enter a password for that account, and then log in using the openid and ->> the password. Though I can't imagine why you'd waint to do that.. The ->> password stuff goes away if passwordauth is disabled. +>>> This wiki is currently configured to use both passwordauth and openid, so +>>> it's possible to create an account by signing in with an openid, then +>>> enter a password for that account, and then log in using the openid and +>>> the password. Though I can't imagine why you'd waint to do that.. The +>>> password stuff goes away if passwordauth is disabled. ->>> OK, I see it now :) The reason I can't do it (if I don't need it) ->>> is very simple: why to put my password in two places if I can to ->>> do it in one? ;) +>>>> OK, I see it now :) The reason I can't do it (if I don't need it) +>>>> is very simple: why to put my password in two places if I can to +>>>> do it in one? ;) ->>> BTW, have you had a sleep this night? ;) Here, in Poland, the time is ->>> 1:30 PM (in your timezone is 7:30 AM), but we're just discussing for ->>> about 3 hours... --Pawel \ No newline at end of file +>>>> BTW, have you had a sleep this night? ;) Here, in Poland, the time is +>>>> 1:30 PM (in your timezone is 7:30 AM), but we're just discussing for +>>>> about 3 hours... --Pawel \ No newline at end of file -- 2.39.5 From 3576317c1b6c2532d8c490c96e9139a43428462e Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 12:45:28 +0000 Subject: [PATCH 06/16] web commit by http://getopenid.com/ptecza: Response --- doc/translation/discussion.mdwn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/translation/discussion.mdwn b/doc/translation/discussion.mdwn index 1ee89d57d..ed034910f 100644 --- a/doc/translation/discussion.mdwn +++ b/doc/translation/discussion.mdwn @@ -85,8 +85,13 @@ translators. Thank you! :) --Pawel > like that? My Spanish sucks though..) In my crappy Spanish I might instead > say something like "actualizado MooBar de foowiki por joey". Or maybe > "actualizado página Moobar por joey"? -> + +>> But you know that "update of %s's %s by %s" string can be "update of +>> foowiki's MooBar by joey", but I can only guess it :) + > Anyway, to get back to your point, it's true that translators often > need additonal context about things like what variables expand to, and > size limits. This is generally done by adding comments in the pot file, > and I've turned that on, and added a few. --[[Joey]] + +>> Thank you very much! It also will be a big help for me. --Pawel \ No newline at end of file -- 2.39.5 From 76738fda2c0889cfc792374375c434ba0aa6f49c Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 12:59:21 +0000 Subject: [PATCH 07/16] web commit by http://getopenid.com/ptecza: Response --- doc/todo/Print_link.mdwn | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/todo/Print_link.mdwn b/doc/todo/Print_link.mdwn index 7c7996812..ee5765ced 100644 --- a/doc/todo/Print_link.mdwn +++ b/doc/todo/Print_link.mdwn @@ -35,11 +35,22 @@ for all ikiwiki pages. --Pawel > > --[[Joey]] ->> Maybe you could add print.css file for printable version? We just have ->> local.css file for a local styling. --Pawel +>> Maybe you could add `print.css` file for printable version? We just have +>> `local.css` file for a local styling. --Pawel >>> Sure, very doable, but the UI to switch to it when printing, I don't >>> know.. ->>> + +>>>> Is the IU to switch is really necessary? Why don't use only +>>>> `style.css` and `print.css` files in header of printable version +>>>> of page? The second file can be equivalent of `local.css` file +>>>> and it can overwrite default CSS styles. + >>> BTW, I'm sure that the Print link as originally requested could be >>> written as a plugin fairly simply. --[[Joey]] + +>>>> I'm not a Perl expert, but I can take a look at code of other +>>>> ikiwiki plugins. + +>>>> BTW, I also was thinkig about plugin to CVS support, +>>>> but unfortunately I don't have too much free time. --Pawel \ No newline at end of file -- 2.39.5 From 8a942a93e2172bb0f86fd3cc7df94de43a558145 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 13:37:04 +0000 Subject: [PATCH 08/16] web commit from 66.249.66.147: poll vote (Accept only OpenID for logins) --- doc/news/openid.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn index 8e0fb4681..0334307ea 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 13 "Accept only OpenID for logins" 8 "Accept only password logins" 11 "Accept both"]] +[[poll 14 "Accept only OpenID for logins" 8 "Accept only password logins" 11 "Accept both"]] -- 2.39.5 From ba680031880bfbc0148d21a62e1bf06f8cd602d7 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 14:08:12 +0000 Subject: [PATCH 09/16] web commit by http://getopenid.com/ptecza: How to ban an IP address? --- doc/news/openid/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 4b754ab71..9ee936c92 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -14,3 +14,12 @@ as well. Also have I just created an account on this wiki as well? > By signing in with openid, you have created an account on the wiki; you > can configure it to eg, subscribe your email address to changes to pages. > --[[Joey]] + +---- + +# How to ban an IP address? + +There is a way to ban ikiwiki users, but how to ban an IP address? +For example if a bitchy anonymous is bombing our poll. I can use +only Apache/iptables rules for this? Maybe it's related to +[[ACL|todo/ACL]] request? --Pawel -- 2.39.5 From 74a52fa326e40384c87a68b58a5c52e81c5c794b Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 14:33:13 +0000 Subject: [PATCH 10/16] response --- doc/news/openid/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 9ee936c92..625f54bb7 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -23,3 +23,7 @@ There is a way to ban ikiwiki users, but how to ban an IP address? For example if a bitchy anonymous is bombing our poll. I can use only Apache/iptables rules for this? Maybe it's related to [[ACL|todo/ACL]] request? --Pawel + +> Well, the polls are not something I would worry about much. I do plan to +> [[add_IP_range_banning|spam_fighting]], although I expect to wait until +> there's a demonstrated need. --[[Joey]] -- 2.39.5 From 8cf71946652e48ae27012543ab6c07df86e7d621 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 15:03:58 +0000 Subject: [PATCH 11/16] web commit by http://getopenid.com/ptecza: Response --- doc/news/openid/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 625f54bb7..05394d9b2 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -27,3 +27,5 @@ only Apache/iptables rules for this? Maybe it's related to > Well, the polls are not something I would worry about much. I do plan to > [[add_IP_range_banning|spam_fighting]], although I expect to wait until > there's a demonstrated need. --[[Joey]] + +>> Heh, do you really want a lot of spam of me? ;) --Pawel \ No newline at end of file -- 2.39.5 From e1ee303596eec3240f264ebbfe93332306537886 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 17:45:47 +0000 Subject: [PATCH 12/16] web commit by JeremyReed: recent changes and show full path --- doc/index/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index e86d08ffb..7100b1259 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -256,3 +256,12 @@ and that links to [[pagespec]]. Can you please provide a [[page_locking]] doc about locking pages linked from the [[features]] page and elsewhere? And have that link to [[pagespec]]? (I don't do this myself as I am unsure about this and still reading the code about locking pages.) + +---- + +# RecentChanges should show path to wiki sub-pages? + +The RecentChanges only shows the final file name for the recently changes file, +for example "discussion". It would be more useful to see "index/discussion" +or the path to the sub-page. I think this is handled by the htmllink() routine. + -- 2.39.5 From 339fd2837acb41eaac84cf26764e640679118ff6 Mon Sep 17 00:00:00 2001 From: joey Date: Thu, 4 Jan 2007 17:46:55 +0000 Subject: [PATCH 13/16] web commit by JeremyReed: fix my two wikilinks to reference from top --- doc/index/discussion.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index 7100b1259..8cc9ec881 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -243,7 +243,7 @@ The [[todo]] page says admins can ban users. Where is this documented? I search set\_banned\_users() which led me to the CGI "preferences" form for the admin. Now logged in as an admin (as defined in my setup configuration), I see the field for this. But no details on how to use it. From the source it appears to be a space-delimited list of usernames. (I didn't test yet.) -Can you please provide a [[banned_users]] documentation about "banning" users function linked from the [[Features]] page and maybe [[security]] page and linked from the "preferences" for the admin? +Can you please provide a [[/banned_users]] documentation about "banning" users function linked from the [[Features]] page and maybe [[security]] page and linked from the "preferences" for the admin? (I don't do this myself as I am unsure about this and still reading the code about banning users.) ---- @@ -254,7 +254,7 @@ The [[features]] page, the [[todo]] page and the [[usage]] manual page say pages Where is locking pages documented? ... A moment later, from searching source I found this is configured via the preferences for the admin and that links to [[pagespec]]. -Can you please provide a [[page_locking]] doc about locking pages linked from the [[features]] page and elsewhere? And have that link to [[pagespec]]? +Can you please provide a [[/page_locking]] doc about locking pages linked from the [[features]] page and elsewhere? And have that link to [[pagespec]]? (I don't do this myself as I am unsure about this and still reading the code about locking pages.) ---- -- 2.39.5 From 37b5b0541f0446d792aa8607f273cea41ea04303 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 5 Jan 2007 09:23:37 +0000 Subject: [PATCH 14/16] web commit by http://getopenid.com/ptecza: Comment to RecentChanges --- doc/index/discussion.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index 8cc9ec881..6b233882e 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -265,3 +265,12 @@ The RecentChanges only shows the final file name for the recently changes file, for example "discussion". It would be more useful to see "index/discussion" or the path to the sub-page. I think this is handled by the htmllink() routine. +>> IMHO it's a good idea and I like it. Often I can see changes in +>> any discussion page, but I don't know without clicking the link +>> what discussion was changed. + +>> However, I can see one problem here. You can commit via command line +>> changes in many pages. It will be displayed ugly then, because probably +>> a width of the RecentChanges page will be greater then a width of +>> user's browser. I hate these pages. So I propose to display a list of +>> changed pages in a column, not in a row. --Pawel \ No newline at end of file -- 2.39.5 From 16e21fd18b050976a5370a85dbfcdf3b7d4fbdc7 Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 5 Jan 2007 09:47:10 +0000 Subject: [PATCH 15/16] web commit by http://getopenid.com/ptecza: Comment to banning IPs --- doc/news/openid/discussion.mdwn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/news/openid/discussion.mdwn b/doc/news/openid/discussion.mdwn index 05394d9b2..a12e951bd 100644 --- a/doc/news/openid/discussion.mdwn +++ b/doc/news/openid/discussion.mdwn @@ -28,4 +28,10 @@ only Apache/iptables rules for this? Maybe it's related to > [[add_IP_range_banning|spam_fighting]], although I expect to wait until > there's a demonstrated need. --[[Joey]] ->> Heh, do you really want a lot of spam of me? ;) --Pawel \ No newline at end of file +>> Heh, do you really want a lot of spam of me? ;) + +>> It was only an example of banning reason. Recently I've read about +>> problems of Wikipedia with the vandals from Qatar. They demolished +>> Qatar Wikipedia pages and the admins of Wikipedia had to ban all +>> IP addresses of that country (fortunately Qatar has only one ISP). +>> --Pawel \ No newline at end of file -- 2.39.5 From 7bc7eb106ec21784a2a03aed5eab172f7bf83a0f Mon Sep 17 00:00:00 2001 From: joey Date: Fri, 5 Jan 2007 18:15:11 +0000 Subject: [PATCH 16/16] =?utf8?q?*=20Added=20a=20Polish=20translation=20by?= =?utf8?q?=20Pawe=C5=82=20T=C4=99cza.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- debian/changelog | 1 + po/pl.po | 391 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 392 insertions(+) create mode 100644 po/pl.po diff --git a/debian/changelog b/debian/changelog index 6e8fffe0b..0d6138105 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (1.38) UNRELEASED; urgency=low * Corrected a bum regexp in openid munging. * Added a Spanish translation by Victor Moral. * A few translation infrastructure fixes. + * Added a Polish translation by Paweł Tęcza. -- Joey Hess Wed, 3 Jan 2007 13:53:55 -0500 diff --git a/po/pl.po b/po/pl.po new file mode 100644 index 000000000..13fdc61b5 --- /dev/null +++ b/po/pl.po @@ -0,0 +1,391 @@ +# Polish translation of ikiwiki.pot +# Copyright (C) 2007 +# This file is distributed under the same license as the ikiwiki package. +# Paweł Tęcza , 2007. +# +# +msgid "" +msgstr "" +"Project-Id-Version: ikiwiki 1.37\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2007-01-05 13:13-0500\n" +"PO-Revision-Date: 2007-01-05 16:33+100\n" +"Last-Translator: Paweł Tęcza \n" +"Language-Team: Debian L10n Polish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. translators: The first parameter is a page name, +#. translators: second is the user who locked it. +#: ../IkiWiki/CGI.pm:51 +#, perl-format +msgid "%s is locked by %s and cannot be edited" +msgstr "" +"strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być " +"teraz edytowana" + +#: ../IkiWiki/CGI.pm:141 +msgid "You need to log in first." +msgstr "Konieczne jest zalogowanie się." + +#: ../IkiWiki/CGI.pm:259 +msgid "Preferences saved." +msgstr "Ustawienia zostały zapisane." + +#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162 +#: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161 +msgid "discussion" +msgstr "dyskusja" + +#: ../IkiWiki/CGI.pm:449 +#, perl-format +msgid "creating %s" +msgstr "tworzenie strony %s" + +#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509 +#, perl-format +msgid "editing %s" +msgstr "edycja strony %s" + +#: ../IkiWiki/CGI.pm:626 +msgid "You are banned." +msgstr "Dostęp został zabroniony przez administratora." + +#: ../IkiWiki/Plugin/aggregate.pm:61 +#, perl-format +msgid "aggregate plugin missing %s parameter" +msgstr "brakujący argument %s dla wtyczki aggregate" + +#: ../IkiWiki/Plugin/aggregate.pm:89 +msgid "new feed" +msgstr "nowy kanał RSS" + +#: ../IkiWiki/Plugin/aggregate.pm:103 +msgid "posts" +msgstr "wpisy" + +#: ../IkiWiki/Plugin/aggregate.pm:105 +msgid "new" +msgstr "nowy wpis" + +#: ../IkiWiki/Plugin/aggregate.pm:206 +#, perl-format +msgid "expiring %s (%s days old)" +msgstr "wygasający wpis %s (ma już %s dni)" + +#: ../IkiWiki/Plugin/aggregate.pm:213 +#, perl-format +msgid "expiring %s" +msgstr "wygasający wpis %s" + +#: ../IkiWiki/Plugin/aggregate.pm:236 +#, perl-format +msgid "checking feed %s ..." +msgstr "sprawdzanie kanału RSS %s\t..." + +#: ../IkiWiki/Plugin/aggregate.pm:241 +#, perl-format +msgid "could not find feed at %s" +msgstr "nie znaleziono kanału RSS pod adresem %s" + +#: ../IkiWiki/Plugin/aggregate.pm:250 +msgid "feed crashed XML::Feed!" +msgstr "awaria kanału RSS w module XML::Feed!" + +#: ../IkiWiki/Plugin/aggregate.pm:273 +#, perl-format +msgid "processed ok at " +msgstr "przetworzony kanał RSS w dniu " + +#: ../IkiWiki/Plugin/aggregate.pm:314 +#, perl-format +msgid "creating new page %s" +msgstr "tworzenie nowej strony %s" + +#: ../IkiWiki/Plugin/brokenlinks.pm:36 +msgid "There are no broken links!" +msgstr "odnośniki są aktualne!" + +#: ../IkiWiki/Plugin/fortune.pm:18 +msgid "fortune failed" +msgstr "awaria fortunki" + +#: ../IkiWiki/Plugin/googlecalendar.pm:22 +msgid "googlecalendar failed to find url in html" +msgstr "" +"awaria wtyczki googlecalendar z powodu nieodnalezionego adresu URL na " +"stronie HTML" + +#: ../IkiWiki/Plugin/inline.pm:37 +msgid "Must specify url to wiki with --url when using --rss or --atom" +msgstr "" +"Użycie parametru --rss lub --atom wymaga podania adresu URL do wiki za " +"pomocą parametru --url" + +#: ../IkiWiki/Plugin/inline.pm:97 +#, perl-format +msgid "unknown sort type %s" +msgstr "nieznany sposób sortowania %s" + +#: ../IkiWiki/Plugin/inline.pm:370 +msgid "RPC::XML::Client not found, not pinging" +msgstr "Niezainstalowany moduł RPC::XML::Client, brak możliwości pingowania" + +#: ../IkiWiki/Plugin/linkmap.pm:99 +msgid "linkmap failed to run dot" +msgstr "awaria wtyczki linkmap" + +#: ../IkiWiki/Plugin/mdwn.pm:37 +#, perl-format +msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" +msgstr "" +"Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " +"uruchamiania programu /usr/bin/markdown (%s)" + +#: ../IkiWiki/Plugin/mirrorlist.pm:23 +msgid "Mirrors" +msgstr "Kopie lustrzane" + +#: ../IkiWiki/Plugin/mirrorlist.pm:23 +msgid "Mirror" +msgstr "Kopia lustrzana" + +#: ../IkiWiki/Plugin/openid.pm:36 +msgid "What's this?" +msgstr "Więcej o OpenID" + +#: ../IkiWiki/Plugin/openid.pm:37 +msgid "Get an OpenID" +msgstr "Pobierz OpenID" + +#: ../IkiWiki/Plugin/orphans.pm:41 +msgid "All pages are linked to by other pages." +msgstr "Dla każdej strony istnieje odnośnik z innej strony" + +#: ../IkiWiki/Plugin/passwordauth.pm:104 +msgid "(use FirstnameLastName)" +msgstr "użyj formy ImieNazwisko" + +#: ../IkiWiki/Plugin/passwordauth.pm:144 +msgid "Account creation successful. Now you can Login." +msgstr "Konto założone pomyślnie. Teraz już można zalogować się." + +#: ../IkiWiki/Plugin/passwordauth.pm:147 +msgid "Error creating account." +msgstr "Błąd w trakcie zakładania konta." + +#: ../IkiWiki/Plugin/passwordauth.pm:168 +msgid "Failed to send mail" +msgstr "Awaria w trakcie wysyłania wiadomości" + +#: ../IkiWiki/Plugin/passwordauth.pm:170 +msgid "Your password has been emailed to you." +msgstr "Wiadomość z hasłem została wysłana." + +#: ../IkiWiki/Plugin/poll.pm:64 +msgid "vote" +msgstr "głosuj" + +#: ../IkiWiki/Plugin/poll.pm:72 +msgid "Total votes:" +msgstr "Oddane głosy:" + +#: ../IkiWiki/Plugin/polygen.pm:32 +msgid "polygen not installed" +msgstr "wtyczka polygen nie jest zainstalowana" + +#: ../IkiWiki/Plugin/polygen.pm:51 +msgid "polygen failed" +msgstr "awaria wtyczki polygen" + +#: ../IkiWiki/Plugin/search.pm:34 +#, perl-format +msgid "Must specify %s when using the search plugin" +msgstr "Wtyczka do wyszukiwarka wymaga podania %s" + +#: ../IkiWiki/Plugin/search.pm:58 +msgid "cleaning hyperestraier search index" +msgstr "czyszczanie indeksu z wynikami wtyczki hyperestraier" + +#: ../IkiWiki/Plugin/search.pm:64 +msgid "updating hyperestraier search index" +msgstr "aktualizacja indeksu z wynikami wtyczki hyperestraier" + +#: ../IkiWiki/Plugin/shortcut.pm:24 +msgid "shortcut missing name or url parameter" +msgstr "brakująca nazwa lub adres URL we wtyczce shortcut" + +#. translators: This is used to display what shortcuts are defined. +#. translators: First parameter is the name of the shortcut, the second +#. translators: is an URL. +#: ../IkiWiki/Plugin/shortcut.pm:33 +#, perl-format +msgid "shortcut %s points to %s" +msgstr "skrót %s wskazuje na adres %s" + +#: ../IkiWiki/Plugin/smiley.pm:22 +msgid "failed to parse any smileys, disabling plugin" +msgstr "" +"Wtyczka smiley wyłączona z powodu awarii w trakcie przetwarzania emitoikonek" + +#: ../IkiWiki/Plugin/template.pm:19 +msgid "template missing id parameter" +msgstr "brakujący parametr id we wtyczce template" + +#: ../IkiWiki/Plugin/template.pm:26 +#, perl-format +msgid "template %s not found" +msgstr "nieznaleziony szablon %s" + +#: ../IkiWiki/Plugin/template.pm:45 +msgid "template failed to process:" +msgstr "awaria w trakcie przetwarzania szablonu:" + +#: ../IkiWiki/Rcs/Stub.pm:66 +msgid "getctime not implemented" +msgstr "niedostępna funkcja getctime" + +#: ../IkiWiki/Rcs/svn.pm:206 +msgid "" +"REV is not set, not running from svn post-commit hook, cannot send " +"notifications" +msgstr "" +"Brak możliwości wysłania powiadomień przez post-commit SVN-a z powodu " +"nieustawionego parametru REV" + +#: ../IkiWiki/Render.pm:98 +msgid "Discussion" +msgstr "Dyskusja" + +#: ../IkiWiki/Render.pm:228 ../IkiWiki/Render.pm:248 +#, perl-format +msgid "skipping bad filename %s" +msgstr "pomijanie nieprawidłowego pliku %s" + +#: ../IkiWiki/Render.pm:288 +#, perl-format +msgid "removing old page %s" +msgstr "usuwanie starej strony %s" + +#: ../IkiWiki/Render.pm:307 +#, perl-format +msgid "scanning %s" +msgstr "przeszukiwanie strony %s" + +#: ../IkiWiki/Render.pm:316 +#, perl-format +msgid "rendering %s" +msgstr "tworzenie strony %s" + +#: ../IkiWiki/Render.pm:328 +#, perl-format +msgid "rendering %s, which links to %s" +msgstr "tworzenie strony %s z odnośnikiem do strony %s" + +#: ../IkiWiki/Render.pm:345 +#, perl-format +msgid "rendering %s, which depends on %s" +msgstr "tworzenie strony %s zależącej od strony %s" + +#: ../IkiWiki/Render.pm:383 +#, perl-format +msgid "rendering %s, to update its backlinks" +msgstr "tworzenie strony %s w celu aktualizacji jej powrotnych odnośników" + +#: ../IkiWiki/Render.pm:395 +#, perl-format +msgid "removing %s, no longer rendered by %s" +msgstr "usuwanie strony %s nie tworzonej już przez %s" + +#: ../IkiWiki/Render.pm:421 +#, perl-format +msgid "ikiwiki: cannot render %s" +msgstr "ikiwiki: awaria w trakcie tworzenie strony %s" + +#. translators: The first parameter is a filename, and the second +#. translators: is a (probably not translated) error message. +#: ../IkiWiki/Setup.pm:15 +#, perl-format +msgid "cannot read %s: %s" +msgstr "awaria w trakcie czytania strony %s: %s" + +#: ../IkiWiki/Setup/Standard.pm:32 +msgid "generating wrappers.." +msgstr "tworzenie osłon..." + +#: ../IkiWiki/Setup/Standard.pm:68 +msgid "rebuilding wiki.." +msgstr "przebudowywanie wiki..." + +#: ../IkiWiki/Setup/Standard.pm:71 +msgid "refreshing wiki.." +msgstr "odświeżanie wiki..." + +#: ../IkiWiki/Setup/Standard.pm:80 +msgid "done" +msgstr "gotowe" + +#. translators: The three variables are the name of the wiki, +#. translators: A list of one or more pages that were changed, +#. translators: And the name of the user making the change. +#. translators: This is used as the subject of a commit email. +#: ../IkiWiki/UserInfo.pm:139 +#, perl-format +msgid "update of %s's %s by %s" +msgstr "aktualizacja stron wiki %s %s przez użytkownika %s" + +#: ../IkiWiki/Wrapper.pm:16 +#, perl-format +msgid "%s doesn't seem to be executable" +msgstr "osłona %s nie jest wykonywalna" + +#: ../IkiWiki/Wrapper.pm:20 +msgid "cannot create a wrapper that uses a setup file" +msgstr "awaria w trakcie tworzenia osłony używającej pliku konfiguracyjnego" + +#: ../IkiWiki/Wrapper.pm:24 +msgid "wrapper filename not specified" +msgstr "nieokreślona nazwa pliku osłony" + +#. translators: The first parameter is a filename, and the second is +#. translators: a (probably not translated) error message. +#: ../IkiWiki/Wrapper.pm:64 +#, perl-format +msgid "failed to write %s: %s" +msgstr "awaria w trakcie zapisu strony %s: %s" + +#. translators: The parameter is a C filename. +#: ../IkiWiki/Wrapper.pm:100 +#, perl-format +msgid "failed to compile %s" +msgstr "awaria w trakcie zestawiania strony %s" + +#. translators: The parameter is a filename. +#: ../IkiWiki/Wrapper.pm:108 +#, perl-format +msgid "successfully generated %s\n" +msgstr "strona pomyślnie utworzona %s\n" + +#: ../ikiwiki.in:13 +msgid "usage: ikiwiki [options] source dest" +msgstr "użycie: ikiwiki [parametry] źródło cel" + +#: ../IkiWiki.pm:99 +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:144 ../IkiWiki.pm:145 +msgid "Error" +msgstr "Błąd" + +#. translators: The first parameter is a +#. translators: preprocessor directive name, +#. translators: the second a page name, the +#. translators: third a number. +#: ../IkiWiki.pm:524 +#, perl-format +msgid "%s preprocessing loop detected on %s at depth %i" +msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -- 2.39.5