From 5418385336e7eeab79166e7ddccefa6bdea8c759 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 18:27:40 -0400 Subject: Optimise use of gettext, and avoid ugly warnings if Locale::gettext is not available. The test suite was emitting a lot of ugly gettext warnings; setting LC_ALL didn't solve the problem for all locale setups (since ikiwiki remaps it to LANG, and ikiwiki didn't know about the C locale). People also seem generally annoyed by the messages when Locale::Gettext is not installed, and I suspect will be generally happier if it just silently doesn't localize. The optimisation came about when I noticed that the gettext sub was doing rather a lot of work each call just to see if localisation is needed. We can avoid that work by caching, and the best thing to cache is a version of the gettext sub that does exactly the right thing. This was slightly complicated by the locale setting, which might need to override the original locale (or lack thereof) after gettext has been called. So it needs to invalidate the cache in that case. It used to do it via a global variable, which I am happy to have also gotten rid of. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7f8257813..126c1826b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ ikiwiki (3.15) UNRELEASED; urgency=low name, to support several cases including mercurial's long user names on the RecentChanges page, and urls with spaces being handled by the 404 plugin. + * Optimise use of gettext, and avoid ugly warnings if Locale::gettext + is not available. Closes: #532285 -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- cgit v1.2.3 From bf55a7fbb1f27ca815ac1e2ee04867686851a134 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 8 Jun 2009 21:40:06 -0400 Subject: meta: Add openid delegate parameter to allow delegating only openid or openid2. --- IkiWiki/Plugin/meta.pm | 13 +++++++++---- debian/changelog | 4 +++- doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn | 3 +++ doc/ikiwiki/directive/meta.mdwn | 3 +++ 4 files changed, 18 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index cc5455d64..b2295923e 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -163,17 +163,22 @@ sub preprocess (@) { "\" type=\"text/css\" />"; } elsif ($key eq 'openid') { + my $delegate=0; # both by default + if (exists $params{delegate}) { + $delegate = 1 if lc $params{delegate} eq 'openid'; + $delegate = 2 if lc $params{delegate} eq 'openid2'; + } if (exists $params{server} && safeurl($params{server})) { push @{$metaheaders{$page}}, ''; + '" rel="openid.server" />' if $delegate ne 2; push @{$metaheaders{$page}}, ''; + '" rel="openid2.provider" />' if $delegate ne 1; } if (safeurl($value)) { push @{$metaheaders{$page}}, ''; + '" rel="openid.delegate" />' if $delegate ne 2; push @{$metaheaders{$page}}, ''; + '" rel="openid2.local_id" />' if $delegate ne 1; } if (exists $params{"xrds-location"} && safeurl($params{"xrds-location"})) { push @{$metaheaders{$page}}, ' Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn index 16382a936..d926cebed 100644 --- a/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn +++ b/doc/forum/is_it_possible_to_NOT_add_openid2_meta_tags.mdwn @@ -60,3 +60,6 @@ Thanks Joey. --[Mick](http://www.lunix.com.au) >> Not clear to me if identi.ca or certifi.ca is at failt, >> but luckily he runs both.. >> --[[Joey]] + +>> ikiwiki's next release will allow adding 'delegate=1' to the +>> meta directive to only delegate to openid1. --[[Joey]] diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index f29a118bf..7a7b0fa19 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -78,6 +78,9 @@ Supported fields: server="http://www.myopenid.com/server" xrds-location="http://www.myopenid.com/xrds?username=joeyh.myopenid.com""]] + By default this will delegate for both `openid` and `openid2`. To only + delegate for one, add a parameter such as `delegate=openid`. + * link Specifies a link to another page. This can be used as a way to make the -- cgit v1.2.3 From 48a5f9f2d8daef8c16b3e4b00511e00eaa0fa024 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 9 Jun 2009 15:39:00 -0400 Subject: Disable the Preferences link if no plugin with an auth hook is enabled. --- IkiWiki/Plugin/passwordauth.pm | 11 +++++++++-- IkiWiki/Render.pm | 3 ++- debian/changelog | 1 + doc/todo/Allow_disabling_edit_and_preferences_links.mdwn | 10 ++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/passwordauth.pm b/IkiWiki/Plugin/passwordauth.pm index 90e2ca564..8cf5af51e 100644 --- a/IkiWiki/Plugin/passwordauth.pm +++ b/IkiWiki/Plugin/passwordauth.pm @@ -8,9 +8,10 @@ use IkiWiki 3.00; sub import { hook(type => "getsetup", id => "passwordauth", "call" => \&getsetup); - hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup); - hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder); + hook(type => "formbuilder_setup", id => "passwordauth", call => \&formbuilder_setup); + hook(type => "formbuilder", id => "passwordauth", call => \&formbuilder); hook(type => "sessioncgi", id => "passwordauth", call => \&sessioncgi); + hook(type => "auth", id => "passwordauth", call => \&auth); } sub getsetup () { @@ -337,4 +338,10 @@ sub sessioncgi ($$) { } } +sub auth ($$) { + # While this hook is not currently used, it needs to exist + # so ikiwiki knows that the wiki supports logins, and will + # enable the Preferences page. +} + 1 diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index f4de19378..2da18738d 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -65,7 +65,8 @@ sub genpage ($$) { if (length $config{cgiurl}) { $template->param(editurl => cgiurl(do => "edit", page => $page)) if IkiWiki->can("cgi_editpage"); - $template->param(prefsurl => cgiurl(do => "prefs")); + $template->param(prefsurl => cgiurl(do => "prefs")) + if exists $hooks{auth}; $actions++; } diff --git a/debian/changelog b/debian/changelog index dd24e0bba..06bed479b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low is not available. Closes: #532285 * meta: Add openid delegate parameter to allow delegating only openid or openid2. + * Disable the Preferences link if no plugin with an auth hook is enabled. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn index 5b9cc8742..4277ae899 100644 --- a/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn +++ b/doc/todo/Allow_disabling_edit_and_preferences_links.mdwn @@ -67,3 +67,13 @@ Patch: >>> Adding a new `canlogin` hook looks like overkill to me. [[Joey]], how >>> about making registration of the `auth` hook mandatory for all plugins >>> making sense of the "Preferences" link? --[[Lunar]] + +>>>> Hmm, using the `auth` hook existance does seem like a nice solution. +>>>> While splitting the preferences code out into its own plugin is +>>>> easily enough done, it has the minor problem of being yet another +>>>> file nearly all ikiwikis will have to load, and also, prefs would +>>>> have to be disabled manually. So I like that using the hook would +>>>> cause it to auto-disable if nothing uses it. It's a bit ugly that +>>>> passwordauth doesn't need an auth hook (it could be reorged to +>>>> use it instead of formbuilder, maybe) and would probably just have an +>>>> empty one. Thanks for the idea. --[[Joey]] [[done]] -- cgit v1.2.3 From dd15cc426f75b4277ae0dbbfee221fe278245d54 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 10 Jun 2009 13:58:59 -0400 Subject: Updated French translation. Closes: #532654 --- debian/changelog | 1 + po/fr.po | 77 +++++++++++++++++++++++++++++--------------------------- 2 files changed, 41 insertions(+), 37 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 06bed479b..dbf8dac88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low * meta: Add openid delegate parameter to allow delegating only openid or openid2. * Disable the Preferences link if no plugin with an auth hook is enabled. + * Updated French translation. Closes: #532654 -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 diff --git a/po/fr.po b/po/fr.po index 9724633c0..73864948b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,10 +7,10 @@ # Cyril Brulebois , 2007. msgid "" msgstr "" -"Project-Id-Version: ikiwiki 3.04\n" +"Project-Id-Version: ikiwiki 3.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" -"PO-Revision-Date: 2009-03-15 16:10+0100\n" +"POT-Creation-Date: 2009-05-25 09:19+0200\n" +"PO-Revision-Date: 2009-06-08 16:41+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -189,10 +189,10 @@ msgstr "" "blogspam.net/\">blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 -#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 -msgid "Discussion" +#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26 +#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 +#: ../IkiWiki/Render.pm:149 +msgid "discussion" msgstr "Discussion" #: ../IkiWiki/Plugin/brokenlinks.pm:48 @@ -204,68 +204,68 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:129 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:185 +#: ../IkiWiki/Plugin/comments.pm:183 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:345 +#: ../IkiWiki/Plugin/comments.pm:343 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:363 +#: ../IkiWiki/Plugin/comments.pm:361 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:370 +#: ../IkiWiki/Plugin/comments.pm:368 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:462 msgid "comment stored for moderation" -msgstr "Le commentaire a été enregistré en attente de modération" +msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:466 +#: ../IkiWiki/Plugin/comments.pm:464 msgid "Your comment will be posted after moderator review" -msgstr "Votre commentaire sera publié après que le modérateur l'ait vérifié" +msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:479 +#: ../IkiWiki/Plugin/comments.pm:477 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:483 +#: ../IkiWiki/Plugin/comments.pm:481 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:523 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:576 +#: ../IkiWiki/Plugin/comments.pm:574 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:615 +#: ../IkiWiki/Plugin/comments.pm:613 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:766 +#: ../IkiWiki/Plugin/comments.pm:764 msgid "Comments" msgstr "Commentaires" @@ -341,7 +341,7 @@ msgstr "Vous n'êtes pas autorisé à modifier %s" #: ../IkiWiki/Plugin/git.pm:666 #, perl-format msgid "you cannot act on a file with mode %s" -msgstr "Vous ne pouvez utiliser le mode %s pour les fichiers" +msgstr "Vous ne pouvez modifier un fichier dont le mode est %s" #: ../IkiWiki/Plugin/git.pm:670 msgid "you are not allowed to change file modes" @@ -376,17 +376,19 @@ msgstr "Ce programme n'est pas un programme graphviz valable" #: ../IkiWiki/Plugin/highlight.pm:46 #, perl-format msgid "tohighlight contains unknown file type '%s'" -msgstr "" +msgstr "tohighlight contient un type de fichier inconnu : '%s'" #: ../IkiWiki/Plugin/highlight.pm:57 #, perl-format msgid "Source code: %s" -msgstr "" +msgstr "Code source : %s" #: ../IkiWiki/Plugin/highlight.pm:122 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" +"Avertissement : le module perl « highlight » n'est pas disponible. " +"Continuation malgré tout." #: ../IkiWiki/Plugin/img.pm:62 msgid "Image::Magick is not installed" @@ -429,7 +431,7 @@ msgstr "Paramètre « pages » manquant" #: ../IkiWiki/Plugin/inline.pm:196 msgid "Sort::Naturally needed for title_natural sort" -msgstr "" +msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" #: ../IkiWiki/Plugin/inline.pm:207 #, perl-format @@ -445,6 +447,10 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" +#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83 +msgid "Discussion" +msgstr "Discussion" + #: ../IkiWiki/Plugin/inline.pm:596 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -551,7 +557,7 @@ msgstr "Ping reçu" #: ../IkiWiki/Plugin/pinger.pm:53 msgid "requires 'from' and 'to' parameters" -msgstr "les paramètres 'de' et 'à' sont nécessaires" +msgstr "les paramètres 'from' et 'to' sont nécessaires" #: ../IkiWiki/Plugin/pinger.pm:58 #, perl-format @@ -709,7 +715,7 @@ msgstr "Aucun changement dans le nom du fichier n'a été spécifié" #: ../IkiWiki/Plugin/rename.pm:68 #, perl-format msgid "illegal name" -msgstr "Appellation non autorisée" +msgstr "Appellation interdite" #: ../IkiWiki/Plugin/rename.pm:73 #, perl-format @@ -732,7 +738,7 @@ msgstr "« SubPages » et attachements renommés." #: ../IkiWiki/Plugin/rename.pm:226 msgid "Only one attachment can be renamed at a time." -msgstr "Une seule pièce jointe peut être renommée à la fois" +msgstr "Modification de pièce jointe : une seule à la fois" #: ../IkiWiki/Plugin/rename.pm:229 msgid "Please select the attachment to rename." @@ -900,7 +906,7 @@ msgstr "" #: ../IkiWiki/Plugin/websetup.pm:436 #, perl-format msgid "Error: %s exited nonzero (%s). Discarding setup changes." -msgstr "" +msgstr "Erreur : %s s'est terminé anormalement (%s). Modifications ignorées." #: ../IkiWiki/Receive.pm:35 #, perl-format @@ -1068,9 +1074,9 @@ msgid "yes" msgstr "oui" #: ../IkiWiki.pm:1865 -#, fuzzy, perl-format +#, perl-format msgid "cannot match pages: %s" -msgstr "Lecture impossible de %s : %s" +msgstr "Impossible de trouver les pages %s" #: ../auto.setup:16 msgid "What will the wiki be named?" @@ -1092,9 +1098,6 @@ 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 "

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

Erreur : %s s'est terminé, valeur de sortie nonzero (%" -- cgit v1.2.3 From 90b4d079605b72bb50d1da41402d994960e10937 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jun 2009 19:24:47 -0400 Subject: aggregate: Fix storing of changed md5. The aggregate state merge code neglected to merge changes to the md5 field of an item. Therefore, if an item's md5 changed after initial aggregation, it would be updated, and rewritten, each time thereafter. This was wasteful and indirectly led to some expire problems. --- IkiWiki/Plugin/aggregate.pm | 6 ++++++ debian/changelog | 1 + 2 files changed, 7 insertions(+) (limited to 'debian') diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index e1baae666..60c292d52 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -404,6 +404,7 @@ sub mergestate () { } # New guids can be created during aggregation. + # Guids have a few fields that may be updated during aggregation. # It's also possible that guids were removed from the on-disk state # while the aggregation was in process. That would only happen if # their feed was also removed, so any removed guids added back here @@ -412,6 +413,11 @@ sub mergestate () { if (! exists $guids{$guid}) { $guids{$guid}=$myguids{$guid}; } + else { + foreach my $field (qw{md5}) { + $guids{$guid}->{$field}=$myguids{$guid}->{$field}; + } + } } } diff --git a/debian/changelog b/debian/changelog index dbf8dac88..6444fb8ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low openid or openid2. * Disable the Preferences link if no plugin with an auth hook is enabled. * Updated French translation. Closes: #532654 + * aggregate: Fix storing of changed md5. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- cgit v1.2.3 From 91513466877df4329567f2cc73b6719999394258 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jun 2009 19:31:18 -0400 Subject: aggregate: Avoid resetting ctime when an item md5 changes. Besides being wrong to do, this could lead to the wrong item being expired, as follows: If B is added and at the same time A is changed, then A's ctime may be set to the current time, while B's is set to its creation time. Thus the new item, A, is incorrectly removed as older. (This interacted especially badly with the bug fixed by 90b4d079605b72bb50d1da41402d994960e10937.) --- IkiWiki/Plugin/aggregate.pm | 6 ++++-- debian/changelog | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm index 60c292d52..5a9eb433d 100644 --- a/IkiWiki/Plugin/aggregate.pm +++ b/IkiWiki/Plugin/aggregate.pm @@ -650,11 +650,13 @@ sub add_page (@) { # creation time on record for the new page. utime $mtime, $mtime, "$config{srcdir}/".htmlfn($guid->{page}); # Store it in pagectime for expiry code to use also. - $IkiWiki::pagectime{$guid->{page}}=$mtime; + $IkiWiki::pagectime{$guid->{page}}=$mtime + unless exists $IkiWiki::pagectime{$guid->{page}}; } else { # Dummy value for expiry code. - $IkiWiki::pagectime{$guid->{page}}=time; + $IkiWiki::pagectime{$guid->{page}}=time + unless exists $IkiWiki::pagectime{$guid->{page}}; } } diff --git a/debian/changelog b/debian/changelog index 6444fb8ba..9b96eee81 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low * Disable the Preferences link if no plugin with an auth hook is enabled. * Updated French translation. Closes: #532654 * aggregate: Fix storing of changed md5. + * aggregate: Avoid resetting ctime when an item md5 changes. -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 -- cgit v1.2.3 From 6ead2573e91405c268ddd4e4072b3a7b30b6b461 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 13 Jun 2009 14:40:36 -0400 Subject: releasing version 3.141 --- debian/changelog | 4 +- po/bg.po | 77 ++++++++++++++++++----------------- po/cs.po | 77 ++++++++++++++++++----------------- po/da.po | 77 ++++++++++++++++++----------------- po/de.po | 77 ++++++++++++++++++----------------- po/es.po | 77 ++++++++++++++++++----------------- po/fr.po | 120 ++++++++++++++++++++++++++++--------------------------- po/gu.po | 77 ++++++++++++++++++----------------- po/ikiwiki.pot | 77 ++++++++++++++++++----------------- po/pl.po | 77 ++++++++++++++++++----------------- po/sv.po | 77 ++++++++++++++++++----------------- po/vi.po | 77 ++++++++++++++++++----------------- 12 files changed, 474 insertions(+), 420 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9b96eee81..8ee065803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.141) UNRELEASED; urgency=low +ikiwiki (3.141) unstable; urgency=low * comment: Make comment directives no longer use the internal "_comment" form, and document the comment directive syntax. @@ -27,7 +27,7 @@ ikiwiki (3.141) UNRELEASED; urgency=low * aggregate: Fix storing of changed md5. * aggregate: Avoid resetting ctime when an item md5 changes. - -- Joey Hess Tue, 02 Jun 2009 17:03:41 -0400 + -- Joey Hess Fri, 12 Jun 2009 19:50:46 -0400 ikiwiki (3.14) unstable; urgency=low diff --git a/po/bg.po b/po/bg.po index b9c32cf72..d1dfe6925 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -84,51 +84,51 @@ msgstr "съобщения" msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" @@ -190,7 +190,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Дискусия" @@ -358,12 +358,12 @@ msgstr "При използване на приеставката „search” msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -483,12 +483,12 @@ msgstr "" msgid "stylesheet not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" @@ -525,31 +525,31 @@ msgstr "Всички страници имат връзки от други ст msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Акаунтът е създаден. Можете да влезете." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Грешка при създаване на акаунта." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Грешка при изпращане на поща" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -929,59 +929,59 @@ msgstr "" msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "премахване на старата страница „%s”" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "сканиране на „%s”" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "обновяване на страницата „%s”" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "обновяване на страницата „%s”, съдържаща препратки към „%s”" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "обновяване на страницата „%s”, зависеща от „%s”" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "премахване на „%s” понеже не се генерира от „%s”" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1006,6 +1006,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1075,11 +1080,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 70336e41b..22d90462d 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-05-09 21:21+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -82,50 +82,50 @@ msgstr "příspěvky" msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji zdroj %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít zdroj na %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo ze zdroje odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "zdroj shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" @@ -187,7 +187,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskuse" @@ -355,12 +355,12 @@ msgstr "Při používání vyhledávacího modulu musíte zadat %s" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "chybí hodnoty" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -473,12 +473,12 @@ msgstr "" msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "zdroj nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "zdroj nebyl nalezen" @@ -515,31 +515,31 @@ msgstr "Na každou stránku vede odkaz z jiné stránky." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Vytvoření účtu bylo úspěšné. Nyní se můžete přihlásit." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Chyba při vytváření účtu." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Nepodařilo se odeslat email." -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -911,59 +911,59 @@ msgstr "" msgid "bad file name %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "přeskakuji chybné jméno souboru %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "odstraňuji starou stránku %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "prohledávám %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "zpracovávám %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "zpracovávám %s, která odkazuje na %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "zpracovávám %s, která závisí na %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "zpracovávám %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "odstraňuji %s, již není zpracovávána %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: nelze zpracovat %s" @@ -988,6 +988,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1055,11 +1060,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "nemohu číst %s: %s" diff --git a/po/da.po b/po/da.po index c94b71feb..e2bbc0b1b 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-05-28 14:58+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -88,50 +88,50 @@ msgstr "indlæg" msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" @@ -193,7 +193,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskussion" @@ -358,11 +358,11 @@ msgstr "Skal angive %s når google søgeudvidelsen bruges" msgid "Failed to parse url, cannot determine domain name" msgstr "Tolkning af URL mislykkedes, kan ikke afgøre domænenavn" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "manglende side" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "Siden %s eksisterer ikke." @@ -476,11 +476,11 @@ msgstr "" msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" @@ -516,32 +516,32 @@ msgstr "Alle sider henvises til fra andre sider." msgid "bad or missing template" msgstr "dårlig eller manglende skabelon" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Konto korrekt oprettet. Nu kan du logge på." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Fejl ved kontooprettelse." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "Ingen emailadresse, så kan ikke sende adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Afsendelse af mail mislykkedes" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "Du har fået tilsendt adgangskodenulstillingsinstruktioner." -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "Ukorrekt adgangskodenumstillings-URL" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "adgangskodenulstilling afvist" @@ -911,7 +911,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:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -920,52 +920,52 @@ msgstr "" "symbolsk lænke fundet i srcdir-sti (%s) -- sæt allow_symlinks_before_srcdir " "for at tillade dette" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "udelader forkert filnavn %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s har flere mulige kildesider" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "fjerner gammel side %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "gennemlæser %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "danner %s, som henviser til %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "danner %s, som afhænger af %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "fjerner %s, ikke længere dannet af %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan ikke danne %s" @@ -990,6 +990,11 @@ msgstr "revisionskontrolsystem %s ikke understøttet" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "opsætning af depotet med ikiwiki-makerepo mislykkedes" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1058,11 +1063,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index ee779c795..f4e795094 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.06\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-03-02 15:39+0100\n" "Last-Translator: Kai Wasserbäch \n" "Language-Team: German \n" @@ -84,50 +84,50 @@ msgstr "Beiträge" msgid "new" msgstr "neu" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s läuft aus (%s Tage alt)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "%s läuft aus" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "zuletzt überprüft am %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "überprüfe Feed %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "konnte Feed unter %s nicht finden" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "Feed nicht gefunden" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(ungültiges UTF-8-Zeichen wurde aus dem Feed entfernt)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(Feed-Entitäten maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "Feed führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" @@ -189,7 +189,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskussion" @@ -359,11 +359,11 @@ msgid "Failed to parse url, cannot determine domain name" msgstr "" "Verarbeiten der URL fehlgeschlagen, konnte Domainnamen nicht feststellen" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "fehlende Seite" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "Die Seite %s existiert nicht." @@ -477,11 +477,11 @@ msgstr "" msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" @@ -517,33 +517,33 @@ msgstr "Alle Seiten sind von anderen Seiten aus verlinkt." msgid "bad or missing template" msgstr "fehlerhafte oder fehlende Vorlage" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Kontoerstellung erfolgreich. Sie können sich jetzt anmelden." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Konto konnte nicht erstellt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "Keine E-Mail-Adresse angegeben; deshalb können keine Anweisungen zum " "Zurücksetzen des Passworts via E-Mail versandt werden." -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Es konnte keine E-Mail versandt werden" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "Ihnen wurden Anweisungen zum Zurücksetzen des Passworts zugesandt." -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "Fehlerhafte URL zum Zurücksetzen des Passworts" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "Zurücksetzen des Passworts abgelehnt" @@ -917,7 +917,7 @@ msgstr "Kann ID des nicht vertrauenswürdigen Bearbeiters %s nicht feststellen" msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -926,52 +926,52 @@ msgstr "" "Symbolischer Verweis im Quellverzeichnis (%s) gefunden -- setzen Sie " "allow_symlinks_before_srcdir, um dies zu erlauben" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "überspringe fehlerhaften Dateinamen %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s hat mehrere mögliche Quellseiten" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "entferne alte Seite %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "durchsuche %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "erzeuge %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "erzeuge %s, die auf %s verlinkt" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "erzeuge %s, die von %s abhängt" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rücklinks zu aktualisieren" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "entferne %s, wird nicht länger von %s erzeugt" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -997,6 +997,11 @@ msgstr "Nicht unterstütztes Versionskontrollsystem %s" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Erstellen des Depots mit ikiwiki-makerepo ist fehlgeschlagen" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1067,11 +1072,11 @@ msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kann %s nicht lesen: %s" diff --git a/po/es.po b/po/es.po index dda242df9..5b556501a 100644 --- a/po/es.po +++ b/po/es.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-05-25 09:30+0200\n" "Last-Translator: Víctor Moral \n" "Language-Team: spanish \n" @@ -91,50 +91,50 @@ msgstr "entradas" msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "última comprobación el %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(una secuencia UTF-8 inválida ha sido eliminada de la fuente de datos)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" @@ -196,7 +196,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Comentarios" @@ -364,11 +364,11 @@ msgid "Failed to parse url, cannot determine domain name" msgstr "" "Error en el análisis del URL, no puedo determinar el nombre del dominio" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "página no encontrada" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "No existe la página %s." @@ -486,11 +486,11 @@ msgstr "" msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" @@ -526,35 +526,35 @@ msgstr "Todas las páginas están referenciadas entre sí." msgid "bad or missing template" msgstr "plantilla errónea ó no existente" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Cuenta de usuario creada con éxito. Ahora puede identificarse." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Error creando la cuenta de usuario." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "No tengo dirección de correo electrónica, así que no puedo enviar " "instrucciones para reiniciar la contraseña" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "No he podido enviar el mensaje de correo electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" "Las instrucciones para reiniciar la contraseña se le han enviado por correo " "electrónico" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "el url para reiniciar la contraseña es incorrecto" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "reinicio de contraseña denegado" @@ -926,7 +926,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:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -935,54 +935,54 @@ msgstr "" "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use " "la directiva allow_symlinks_before_srcdir para permitir la acción" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "ignorando el archivo %s porque su nombre no es correcto" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s tiene mútiples páginas fuente posibles" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "eliminando la antigua página %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "explorando %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "convirtiendo %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "convirtiendo la página %s, la cual referencia a %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "convirtiendo la página %s, la cual depende de %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "eliminando la página %s puesto que ya no se deriva de %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1007,6 +1007,11 @@ msgstr "el sistema de control de versiones %s no está soportado" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "no he podido crear un repositorio con el programa ikiwiki-makerepo" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1079,11 +1084,11 @@ msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 73864948b..2e79e8e99 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-25 09:19+0200\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2009-06-08 16:41+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -86,50 +86,50 @@ msgstr "Articles" msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -189,10 +189,10 @@ msgstr "" "blogspam.net/\">blogspam: " #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 -#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/opendiscussion.pm:26 -#: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79 -#: ../IkiWiki/Render.pm:149 -msgid "discussion" +#: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 +#: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 +msgid "Discussion" msgstr "Discussion" #: ../IkiWiki/Plugin/brokenlinks.pm:48 @@ -204,68 +204,68 @@ msgstr "%s sur %s" msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:122 ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:127 +#: ../IkiWiki/Plugin/comments.pm:129 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:183 +#: ../IkiWiki/Plugin/comments.pm:185 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:338 ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:343 +#: ../IkiWiki/Plugin/comments.pm:345 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:361 +#: ../IkiWiki/Plugin/comments.pm:363 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:368 +#: ../IkiWiki/Plugin/comments.pm:370 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:462 +#: ../IkiWiki/Plugin/comments.pm:464 msgid "comment stored for moderation" msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:464 +#: ../IkiWiki/Plugin/comments.pm:466 msgid "Your comment will be posted after moderator review" msgstr "Votre commentaire sera publié après vérification par le modérateur" -#: ../IkiWiki/Plugin/comments.pm:477 +#: ../IkiWiki/Plugin/comments.pm:479 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:481 +#: ../IkiWiki/Plugin/comments.pm:483 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:523 ../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 "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:574 +#: ../IkiWiki/Plugin/comments.pm:576 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:613 +#: ../IkiWiki/Plugin/comments.pm:615 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:764 +#: ../IkiWiki/Plugin/comments.pm:766 msgid "Comments" msgstr "Commentaires" @@ -356,11 +356,11 @@ msgstr "Vous devez indiquer %s lors de l'utilisation du greffon « google »." msgid "Failed to parse url, cannot determine domain name" msgstr "Impossible d'analyser l'url, pas de nom de domaine" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." @@ -447,10 +447,6 @@ msgstr "Ajouter un nouvel article dont le titre est :" msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:365 ../IkiWiki/Render.pm:83 -msgid "Discussion" -msgstr "Discussion" - #: ../IkiWiki/Plugin/inline.pm:596 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -479,11 +475,11 @@ msgstr "" msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" @@ -519,35 +515,35 @@ msgstr "Toutes les pages sont liées à d'autres pages." msgid "bad or missing template" msgstr "Modèle de page incorrect ou manquant" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Le compte a été créé. Vous pouvez maintenant vous identifier." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Erreur lors de la création du compte." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" "Pas d'adresse spécifiée. Impossible d'envoyer les instructions pour " "réinitialiser le mot de passe." -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Impossible d'envoyer un courriel" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" "Vous avez reçu un message contenant les instructions pour réinitialiser le " "mot de passe" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "Adresse pour la réinitialisation du mot de passe incorrecte" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "réinitialisation du mot de passe refusée" @@ -919,7 +915,7 @@ msgstr "" msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " @@ -928,52 +924,52 @@ msgstr "" "Lien symbolique trouvé dans l'adresse de srcdir (%s) -- pour l'autoriser, " "activez le paramètre « allow_symlinks_before_srcdir »." -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "Omission du fichier au nom incorrect %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "%s peut être associé à plusieurs pages source." -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "Suppression de l'ancienne page %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "Examen de %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "Reconstruction de %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1000,6 +996,11 @@ msgstr "Système de contrôle de version non reconnu : %s" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1069,11 +1070,11 @@ msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages %s" @@ -1098,6 +1099,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 "

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

Erreur : %s s'est terminé, valeur de sortie nonzero (%" diff --git a/po/gu.po b/po/gu.po index fe42deed4..c8cf72bb6 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -83,50 +83,50 @@ msgstr "પોસ્ટ" msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" @@ -188,7 +188,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "ચર્ચા" @@ -356,12 +356,12 @@ msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કર msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "ખોવાયેલ કિંમતો" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -473,12 +473,12 @@ msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bi msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" @@ -515,31 +515,31 @@ msgstr "બધા પાનાંઓ બીજા પાનાંઓ વડે msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "ખાતું બનાવવાનું સફળ. તમે હવે લોગઇન કરી શકો છો." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "ખાતું બનાવવામાં ક્ષતિ." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "મેઇલ મોકલવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -911,59 +911,59 @@ msgstr "" msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "જુનાં પાનાં દૂર કરે છે %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "%s શોધે છે" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "રેન્ડર કરે છે %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "રેન્ડર કરે છે %s, જે %s સાથે જોડાણ ધરાવે છે" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "રેન્ડર કરે છે %s, જે %s પર આધારિત છે" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "દૂર કરે છે %s, હવે %s વડે રેન્ડર કરાતું નથી" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -988,6 +988,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1055,11 +1060,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d5e54f468..4ca908807 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -83,50 +83,50 @@ msgstr "" msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "" @@ -186,7 +186,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "" @@ -351,11 +351,11 @@ msgstr "" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -464,11 +464,11 @@ msgstr "" msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 msgid "redir cycle is not allowed" msgstr "" @@ -504,31 +504,31 @@ msgstr "" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -894,59 +894,59 @@ msgstr "" msgid "bad file name %s" msgstr "" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "" @@ -971,6 +971,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1038,11 +1043,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/pl.po b/po/pl.po index 16f3a18b1..425ec2c00 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -86,51 +86,51 @@ msgstr "wpisy" msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "Nieprawidłowe kodowanie UTF-8 usunięte z kanału RSS" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" @@ -192,7 +192,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Dyskusja" @@ -360,12 +360,12 @@ msgstr "Wtyczka do wyszukiwarka wymaga podania %s" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "brakujące wartości" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -486,12 +486,12 @@ msgstr "" msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" @@ -528,31 +528,31 @@ msgstr "Dla każdej strony istnieje odnośnik z innej strony" msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Konto założone pomyślnie. Teraz można zalogować się." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Błąd w trakcie zakładania konta." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Awaria w trakcie wysyłania wiadomości" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -935,59 +935,59 @@ msgstr "" msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "usuwanie starej strony %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "skanowanie %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "renderowanie %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "renderowanie %s z odnośnikiem do %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "renderowanie %s zależącego od %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "usuwanie %s nie tworzonego już przez %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1012,6 +1012,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1081,11 +1086,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 1951cb91d..c7729a221 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -83,51 +83,51 @@ msgstr "inlägg" msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" @@ -189,7 +189,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Diskussion" @@ -357,12 +357,12 @@ msgstr "Måste ange %s när sökinsticket används" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -479,12 +479,12 @@ msgstr "" msgid "stylesheet not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" @@ -521,31 +521,31 @@ msgstr "Alla sidor länkas till av andra sidor." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Kontot har skapats. Du kan nu logga in." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Fel vid skapandet av konto." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Misslyckades med att skicka e-post" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -924,59 +924,59 @@ msgstr "" msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "tar bort gammal sida %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "söker av %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "ritar upp %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "ritar upp %s, vilken länkar till %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "ritar upp %s, vilken är beroende av %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "tar bort %s, som inte längre ritas upp av %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1001,6 +1001,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1068,11 +1073,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/vi.po b/po/vi.po index 1415269f6..e93349c91 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-06-04 13:21-0400\n" +"POT-Creation-Date: 2009-06-12 19:52-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -84,51 +84,51 @@ msgstr "bài" msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:435 +#: ../IkiWiki/Plugin/aggregate.pm:441 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:442 +#: ../IkiWiki/Plugin/aggregate.pm:448 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:475 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:473 +#: ../IkiWiki/Plugin/aggregate.pm:479 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:478 +#: ../IkiWiki/Plugin/aggregate.pm:484 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:497 +#: ../IkiWiki/Plugin/aggregate.pm:503 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:508 +#: ../IkiWiki/Plugin/aggregate.pm:514 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:516 +#: ../IkiWiki/Plugin/aggregate.pm:522 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:524 +#: ../IkiWiki/Plugin/aggregate.pm:530 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:610 +#: ../IkiWiki/Plugin/aggregate.pm:616 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" @@ -190,7 +190,7 @@ msgstr "" #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:233 #: ../IkiWiki/Plugin/inline.pm:357 ../IkiWiki/Plugin/inline.pm:365 #: ../IkiWiki/Plugin/opendiscussion.pm:26 ../IkiWiki/Plugin/orphans.pm:37 -#: ../IkiWiki/Render.pm:79 ../IkiWiki/Render.pm:83 ../IkiWiki/Render.pm:149 +#: ../IkiWiki/Render.pm:80 ../IkiWiki/Render.pm:84 ../IkiWiki/Render.pm:150 msgid "Discussion" msgstr "Thảo luận" @@ -358,12 +358,12 @@ msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" msgid "Failed to parse url, cannot determine domain name" msgstr "" -#: ../IkiWiki/Plugin/goto.pm:49 +#: ../IkiWiki/Plugin/goto.pm:55 #, fuzzy msgid "missing page" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/goto.pm:51 +#: ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "" @@ -480,12 +480,12 @@ 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:192 +#: ../IkiWiki/Plugin/meta.pm:197 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:205 +#: ../IkiWiki/Plugin/meta.pm:210 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" @@ -522,31 +522,31 @@ msgstr "Mọi trang được liên kết với trang khác." msgid "bad or missing template" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:247 +#: ../IkiWiki/Plugin/passwordauth.pm:248 msgid "Account creation successful. Now you can Login." msgstr "Tài khoản đã được tạo. Lúc bây giờ bạn có thể đăng nhập." -#: ../IkiWiki/Plugin/passwordauth.pm:250 +#: ../IkiWiki/Plugin/passwordauth.pm:251 msgid "Error creating account." msgstr "Gặp lỗi khi tạo tài khoản." -#: ../IkiWiki/Plugin/passwordauth.pm:257 +#: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:291 +#: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" msgstr "Lỗi gửi thư" -#: ../IkiWiki/Plugin/passwordauth.pm:293 +#: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:328 +#: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" msgstr "" -#: ../IkiWiki/Plugin/passwordauth.pm:331 +#: ../IkiWiki/Plugin/passwordauth.pm:332 msgid "password reset denied" msgstr "" @@ -925,59 +925,59 @@ msgstr "" msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:253 +#: ../IkiWiki/Render.pm:254 #, perl-format msgid "" "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " "allow this" msgstr "" -#: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302 +#: ../IkiWiki/Render.pm:278 ../IkiWiki/Render.pm:303 #, perl-format msgid "skipping bad filename %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki/Render.pm:284 +#: ../IkiWiki/Render.pm:285 #, perl-format msgid "%s has multiple possible source pages" msgstr "" -#: ../IkiWiki/Render.pm:360 +#: ../IkiWiki/Render.pm:361 #, perl-format msgid "removing old page %s" msgstr "đang gỡ bỏ trang cũ %s" -#: ../IkiWiki/Render.pm:400 +#: ../IkiWiki/Render.pm:401 #, perl-format msgid "scanning %s" msgstr "đang quét %s" -#: ../IkiWiki/Render.pm:405 +#: ../IkiWiki/Render.pm:406 #, perl-format msgid "rendering %s" msgstr "đang vẽ %s" -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Render.pm:427 #, perl-format msgid "rendering %s, which links to %s" msgstr "đang vẽ %s mà liên kết tới %s" -#: ../IkiWiki/Render.pm:447 +#: ../IkiWiki/Render.pm:448 #, perl-format msgid "rendering %s, which depends on %s" msgstr "đang vẽ %s mà phụ thuộc vào %s" -#: ../IkiWiki/Render.pm:486 +#: ../IkiWiki/Render.pm:487 #, perl-format msgid "rendering %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:498 +#: ../IkiWiki/Render.pm:499 #, perl-format msgid "removing %s, no longer rendered by %s" msgstr "đang gỡ bỏ %s, không còn được vẽ lại bởi %s" -#: ../IkiWiki/Render.pm:522 +#: ../IkiWiki/Render.pm:523 #, perl-format msgid "ikiwiki: cannot render %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1002,6 +1002,11 @@ msgstr "" msgid "failed to set up the repository with ikiwiki-makerepo" msgstr "" +#: ../IkiWiki/Setup/Automator.pm:115 +#, perl-format +msgid "** Disabling plugin %s, since it is failing with this message:" +msgstr "" + #: ../IkiWiki/Wrapper.pm:16 #, perl-format msgid "%s doesn't seem to be executable" @@ -1069,11 +1074,11 @@ msgstr "" msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1733 +#: ../IkiWiki.pm:1741 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1865 +#: ../IkiWiki.pm:1873 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" -- cgit v1.2.3 From d25c4acfdb06d1c5529be8e3cd10e87f6a816bc9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Jun 2009 15:09:49 -0400 Subject: img: Fix extra double quote with alt text. (smcv) --- debian/changelog | 6 ++++++ doc/bugs/img_with_alt_has_extra_double_quote.mdwn | 2 ++ 2 files changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8ee065803..86aeb0b7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1415) UNRELEASED; urgency=low + + * img: Fix extra double quote with alt text. (smcv) + + -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 + ikiwiki (3.141) unstable; urgency=low * comment: Make comment directives no longer use the internal "_comment" diff --git a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn index 18aea6841..81bbe7fb5 100644 --- a/doc/bugs/img_with_alt_has_extra_double_quote.mdwn +++ b/doc/bugs/img_with_alt_has_extra_double_quote.mdwn @@ -28,3 +28,5 @@ This [[patch]] is available from the img-bugfix branch in my git repository: (exists $params{id} ? ' id="'.$params{id}.'"' : ''). --[[smcv]] + +[[done]] --[[Joey]] -- cgit v1.2.3 From 7cba8bd3759576c8e0454efa32feeb3c22b8e12f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 29 Jun 2009 14:51:49 -0400 Subject: Updated French debconf templates translation. Closes: #535103 --- debian/changelog | 1 + po/fr.po | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 86aeb0b7a..c119dea8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.1415) UNRELEASED; urgency=low * img: Fix extra double quote with alt text. (smcv) + * Updated French debconf templates translation. Closes: #535103 -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 diff --git a/po/fr.po b/po/fr.po index 2e79e8e99..49784e42b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,10 +7,10 @@ # Cyril Brulebois , 2007. msgid "" msgstr "" -"Project-Id-Version: ikiwiki 3.14\n" +"Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-12 19:52-0400\n" -"PO-Revision-Date: 2009-06-08 16:41+0200\n" +"PO-Revision-Date: 2009-06-29 16:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgid "" "via http, not https" msgstr "" "Erreur de configuration probable : sslcookie est positionné mais vous tentez " -"de vous connecter avec http et non https" +"de vous connecter avec http au lieu de https" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" @@ -1000,6 +1000,8 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" msgstr "" +"** désactivation du greffon %s, car échec de l'installation, avec le message " +"suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format -- cgit v1.2.3 From ea4686a565067b8c9a4cd1f1a76c205c7a38bfed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 21 Jun 2009 12:12:30 +0100 Subject: Update IkiWiki::openiduser to work with Net::OpenID 2.x openiduser previously used a constructor that no longer works in 2.x. However, all we actually want is the (undocumented) DisplayOfURL function that is invoked by the display method, so try to use that. (cherry picked from commit c3dd0ff5c7c10743107f203a5b456fdcd1b171df) --- IkiWiki/Plugin/openid.pm | 14 ++++++++++++-- debian/changelog | 2 ++ 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 5424c57e2..87569915b 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -189,8 +189,18 @@ sub openiduser ($) { if ($user =~ m!^https?://! && eval q{use Net::OpenID::VerifiedIdentity; 1} && !$@) { - my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); - my $display=$oid->display; + my $display; + + if (Net::OpenID::VerifiedIdentity->can("DisplayOfURL")) { + # this works in at least 2.x + $display = Net::OpenID::VerifiedIdentity::DisplayOfURL($user); + } + else { + # this only works in 1.x + my $oid=Net::OpenID::VerifiedIdentity->new(identity => $user); + $display=$oid->display; + } + # Convert "user.somehost.com" to "user [somehost.com]" # (also "user.somehost.co.uk") if ($display !~ /\[/) { diff --git a/debian/changelog b/debian/changelog index c119dea8e..bb33f25f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ ikiwiki (3.1415) UNRELEASED; urgency=low * img: Fix extra double quote with alt text. (smcv) * Updated French debconf templates translation. Closes: #535103 + * openid: Support Net::OpenID 2.x when pretty-printing + openids. (smcv) -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 -- cgit v1.2.3 From feae031a80805550b38cb4fd9694d01ce7ef0627 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 7 Jul 2009 16:31:18 -0400 Subject: highlight: Fix utf-8 encoding bug. Closes: #535028 --- IkiWiki/Plugin/highlight.pm | 3 ++- debian/changelog | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 20f79ef57..9bdde85ae 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -4,6 +4,7 @@ package IkiWiki::Plugin::highlight; use warnings; use strict; use IkiWiki 3.00; +use Encode; # locations of highlight's files my $filetypes="/etc/highlight/filetypes.conf"; @@ -69,7 +70,7 @@ sub htmlizefallback { return; } - return highlight($langfile, shift); + return Encode::decode_utf8(highlight($langfile, shift)); } my %ext2lang; diff --git a/debian/changelog b/debian/changelog index bb33f25f3..239b22b42 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -ikiwiki (3.1415) UNRELEASED; urgency=low +ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) * Updated French debconf templates translation. Closes: #535103 * openid: Support Net::OpenID 2.x when pretty-printing openids. (smcv) + * highlight: Fix utf-8 encoding bug. Closes: #535028 - -- Joey Hess Tue, 16 Jun 2009 15:08:31 -0400 + -- Joey Hess Tue, 07 Jul 2009 16:25:05 -0400 ikiwiki (3.141) unstable; urgency=low -- cgit v1.2.3 From 0c6a47e9e4c6a5508868b730bed0ac2d0c358ae4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 8 Jul 2009 13:13:23 -0400 Subject: svn: Fix rcs_rename to properly scope call to dirname. --- IkiWiki/Plugin/svn.pm | 4 ++-- debian/changelog | 6 ++++++ ...enaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index fe55e7d08..06b987f51 100644 --- a/IkiWiki/Plugin/svn.pm +++ b/IkiWiki/Plugin/svn.pm @@ -243,10 +243,10 @@ sub rcs_rename ($$) { if (-d "$config{srcdir}/.svn") { # Add parent directory for $dest - my $parent=dirname($dest); + my $parent=IkiWiki::dirname($dest); if (! -d "$config{srcdir}/$parent/.svn") { while (! -d "$config{srcdir}/$parent/.svn") { - $parent=dirname($dest); + $parent=IkiWiki::dirname($dest); } if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); diff --git a/debian/changelog b/debian/changelog index 239b22b42..e83e570d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.1416) UNRELEASED; urgency=low + + * svn: Fix rcs_rename to properly scope call to dirname. + + -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + ikiwiki (3.1415) unstable; urgency=low * img: Fix extra double quote with alt text. (smcv) diff --git a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn index 4f2257891..1a737df0a 100644 --- a/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn +++ b/doc/bugs/Renaming_a_file_via_the_web_is_failing_when_using_subversion.mdwn @@ -22,3 +22,7 @@ Applying the following patch fixed it: if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) { warn("svn add $parent failed\n"); + +> Thank you very much for the patch, which I've applied. I wonder how +> that snuck in (aside from the obvious, that the svn plugin is not often +> used and the code was added w/o being tested..). [[done]] --[[Joey]] -- cgit v1.2.3 From b1b7a2100f6b32ef6bf75e9992e10ed7d28f8525 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Jul 2009 00:33:19 -0400 Subject: img: Pass the align parameter through to the generated img tag. --- IkiWiki/Plugin/img.pm | 1 + debian/changelog | 1 + doc/ikiwiki/directive/img.mdwn | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index a186abdfc..78e378917 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -123,6 +123,7 @@ sub preprocess (@) { '" height="'.$im->Get("height").'"'. (exists $params{alt} ? ' alt="'.$params{alt}.'"' : ''). (exists $params{title} ? ' title="'.$params{title}.'"' : ''). + (exists $params{align} ? ' align="'.$params{align}.'"' : ''). (exists $params{class} ? ' class="'.$params{class}.'"' : ''). (exists $params{id} ? ' id="'.$params{id}.'"' : ''). ' />'; diff --git a/debian/changelog b/debian/changelog index e83e570d3..5001031df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.1416) UNRELEASED; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. + * img: Pass the align parameter through to the generated img tag. -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 diff --git a/doc/ikiwiki/directive/img.mdwn b/doc/ikiwiki/directive/img.mdwn index 1d1f29bea..66efd008e 100644 --- a/doc/ikiwiki/directive/img.mdwn +++ b/doc/ikiwiki/directive/img.mdwn @@ -18,9 +18,9 @@ making the image smaller than the specified size. You can also specify only the width or the height, and the other value will be calculated based on it: "200x", "x200" -You can also pass `alt`, `title`, `class` and `id` parameters. These are -passed through unchanged to the html img tag. If you include a `caption` -parameter, the caption will be displayed centered beneath the image. +You can also pass `alt`, `title`, `class`, `align` and `id` parameters. +These are passed through unchanged to the html img tag. If you include a +`caption` parameter, the caption will be displayed centered beneath the image. The `link` parameter is used to control whether the scaled down image links to the full size version. By default it does; set "link=somepage" to link -- cgit v1.2.3 From b9f4708f682be0002c0ece9029860c17333590e4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 11 Jul 2009 15:56:02 -0400 Subject: Move OpenID pretty-printing from openid plugin to core (smcv) --- debian/changelog | 1 + doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5001031df..d57158c1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.1416) UNRELEASED; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. * img: Pass the align parameter through to the generated img tag. + * Move OpenID pretty-printing from openid plugin to core (smcv) -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 diff --git a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn index 373c120a6..3d4338a78 100644 --- a/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn +++ b/doc/todo/pretty-print_OpenIDs_even_if_not_enabled.mdwn @@ -21,4 +21,9 @@ A feature I originally requested on >> logins, so I think recognising OpenIDs can reasonably be considered core >> functionality! --[[smcv]] +>>> That seemed easier than expected, [[done]]. +>>> (I do wonder if the call to openiduser still needs to be evaled -- +>>> it was probably only evaled before in case it was not available, but +>>> I have not carefully checked it to make sure it doesn't ever die. --[[Joey]] + [[!tag patch]] -- cgit v1.2.3 From 8f971999c6cbf7025500a84ef5125019d373d8cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 16 Jul 2009 14:44:17 -0400 Subject: releasing version 3.14159 --- debian/changelog | 4 ++-- po/ikiwiki.pot | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d57158c1a..05b7be70f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -ikiwiki (3.1416) UNRELEASED; urgency=low +ikiwiki (3.14159) unstable; urgency=low * svn: Fix rcs_rename to properly scope call to dirname. * img: Pass the align parameter through to the generated img tag. * Move OpenID pretty-printing from openid plugin to core (smcv) - -- Joey Hess Wed, 08 Jul 2009 13:10:38 -0400 + -- Joey Hess Thu, 16 Jul 2009 14:37:22 -0400 ikiwiki (3.1415) unstable; urgency=low diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 74ffd1c74..c914fd69d 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-07 16:32-0400\n" +"POT-Creation-Date: 2009-07-16 14:38-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:1218 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1253 msgid "Error" msgstr "" @@ -1038,16 +1038,16 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1201 +#: ../IkiWiki.pm:1236 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1741 +#: ../IkiWiki.pm:1776 msgid "yes" msgstr "" -#: ../IkiWiki.pm:1873 +#: ../IkiWiki.pm:1908 #, perl-format msgid "cannot match pages: %s" msgstr "" -- cgit v1.2.3