diff options
author | intrigeri <intrigeri@boum.org> | 2009-08-27 19:56:37 +0200 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2009-08-27 19:56:37 +0200 |
commit | 0c032b0ccb3766c422980a0e956dacbe44cfa021 (patch) | |
tree | 3f7d5d2821fee7f336bdabfa56e71f7048e77569 | |
parent | 496e8523c6706d096f1b794e3f3ba5dd2fa260f3 (diff) | |
parent | 5e515b493c00c70095aeb8bad1e0b7757ed943db (diff) |
Merge commit 'upstream/master' into prv/po
-rw-r--r-- | IkiWiki/Plugin/htmltidy.pm | 5 | ||||
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | doc/bugs/defintion_lists_appear_to_be_disabled.mdwn | 54 | ||||
-rw-r--r-- | doc/ikiwiki/formatting.mdwn | 2 | ||||
-rw-r--r-- | doc/ikiwiki/searching.mdwn | 2 | ||||
-rw-r--r-- | doc/plugins/po.mdwn | 53 | ||||
-rw-r--r-- | doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn | 24 | ||||
-rw-r--r-- | doc/todo/tmplvars_plugin/discussion.mdwn | 1 | ||||
-rw-r--r-- | po/fr.po | 34 | ||||
-rw-r--r-- | po/ikiwiki.pot | 22 | ||||
-rw-r--r-- | po/it.po | 195 |
11 files changed, 272 insertions, 121 deletions
diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm index 6f3379ef4..fc0d3b1d6 100644 --- a/IkiWiki/Plugin/htmltidy.pm +++ b/IkiWiki/Plugin/htmltidy.pm @@ -46,7 +46,10 @@ sub sanitize (@) { waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - return "" if $sigpipe || ! defined $ret; + if ($sigpipe || ! defined $ret) { + print STDERR gettext("warning: tidy failed")."\n"; + return ""; + } return $ret; } diff --git a/debian/changelog b/debian/changelog index 0d3f61e6f..69e197e37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,7 @@ ikiwiki (3.1415926) UNRELEASED; urgency=low slower. (smcv) * Rebuild wikis on upgrade to this version to fix bloat caused by the dependency bug. + * htmltidy: Print a warning message if tidy fails. Closes: #543722 -- Joey Hess <joeyh@debian.org> Wed, 12 Aug 2009 12:25:30 -0400 diff --git a/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn new file mode 100644 index 000000000..6dac9c8b8 --- /dev/null +++ b/doc/bugs/defintion_lists_appear_to_be_disabled.mdwn @@ -0,0 +1,54 @@ +Adding text of the format + + Apple + : Pomaceous fruit of plants of the genus Malus in + the family Rosaceae. + : An american computer company. + + Orange + : The fruit of an evergreen tree of the genus Citrus. + +Does not result in expected HTML as described in the [MultiMarkdown Syntax Guide](http://fletcherpenney.net/multimarkdown/users_guide/multimarkdown_syntax_guide/): + +Should be + + <dl xmlns="http://www.w3.org/1999/xhtml"> + <dt>Apple</dt> + <dd> + <p>Pomaceous fruit of plants of the genus Malus in + the family Rosaceae.</p> + </dd> + <dd> + <p>An american computer company.</p> + </dd> + <dt>Orange</dt> + <dd> + <p>The fruit of an evergreen tree of the genus Citrus.</p> + </dd> + </dl> + +But instead it gives: + + <p>Apple + : Pomaceous fruit of plants of the genus Malus in + the family Rosaceae. + : An american computer company.</p> + + <p>Orange + : The fruit of an evergreen tree of the genus Citrus.</p> + +> ikiwiki's markdown support does not include support for multimarkdown by +> default. If you want to enable that, you can turn on the `multimarkdown` +> option in the setup file. --[[Joey]] + +>> Sorry, I should have indicated, I have multimarkdown enabled: + + # mdwn plugin + # enable multimarkdown features? + multimarkdown => 1, + +>>Other features appear to be working, tables and footnotes for instance. See current install: <http://wiki.infosoph.org> + +>>> Ok, in that case it's a bug in the perl module. Forwarded to +>>> <http://github.com/bobtfish/text-markdown/issues#issue/6> --[[Joey]] +>>> [[!tag done]] diff --git a/doc/ikiwiki/formatting.mdwn b/doc/ikiwiki/formatting.mdwn index 2ed5cc26f..befbce9aa 100644 --- a/doc/ikiwiki/formatting.mdwn +++ b/doc/ikiwiki/formatting.mdwn @@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this: Leave blank lines between paragraphs. -You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it +You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it in single or double asterisks. To create a list, start each line with an asterisk: diff --git a/doc/ikiwiki/searching.mdwn b/doc/ikiwiki/searching.mdwn index 539e7193d..4c1287933 100644 --- a/doc/ikiwiki/searching.mdwn +++ b/doc/ikiwiki/searching.mdwn @@ -5,7 +5,7 @@ then="This wiki has searching **enabled**." else="This wiki has searching **disabled**."]] If searching is enabled, you can enter search terms in the search field, -as you'd expect. There are a few special things you can do to constuct +as you'd expect. There are a few special things you can do to construct more powerful searches. * To match a phrase, enclose it in double quotes. diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn index dca2f5d66..65573b877 100644 --- a/doc/plugins/po.mdwn +++ b/doc/plugins/po.mdwn @@ -260,7 +260,14 @@ If a page contains a WikiLink to itself, ikiwiki does not normally turn that into a hyperlink. However, if a translated page contains a WikiLink to itself, a hyperlink is inserted, at least with the default `po_link_to` the link points to the English version of the page. Is there a -good reason for that to be done? --[[Joey]] +good reason for that to be done? --[[Joey]] + +> The commit 0113c69d4fb in my po branch might fix this. --[[intrigeri]] + +>> It may fix it in passing, but shouldn't it also be fixed for the other +>> `po_link_to` styles? (Also, if `mybestlink` is going to always +>> just return `bestlink` in this case, there seems no reason to inject +>> it.) --[[Joey]] Language display order ---------------------- @@ -280,12 +287,37 @@ That used to be so, but the bug was fixed. Does this mean that po might be replacing the only link on a page, in error? --[[Joey]] +> It would replace it. The only problematic case is when another +> plugin has its own reasons, in its `scan` hook, to add a page +> that is already there to `$links{$page}`. This other plugin's +> effect might then be changed by po's `scan` hook... which could +> be either good (better overall l10n) or bad (break the other +> plugin's goal). --[[intrigeri]] + +>> Right.. well, the cases where links are added is very small. +>> Grepping for `add_link`, it's just done by link, camelcase, meta, and +>> tag. All of these are supposed to work just link regular links +>> so I'd think that is ok. We could probably remove the currently scary +>> comment about only wanting to change the first link. --[[Joey]] + Name of toplevel index page --------------------------- Normally at the top index page of a wiki, you see the wiki name at the top. However, at the top *translated* index page, you see something -like "index.da". --[[Joey]] +like "index.da". --[[Joey]] + +> I suggest changing `Render.pm`, line 115, to replace the `$page eq 'index'` +> test with a predicate call such as isindexpage($page). Such a predicate +> function could then be overriden by the po plugin. --[[intrigeri]] + +>> Could do that, but if you have such a function it's natural to want to +>> use it elsewhere. Not clear to me it would make sense for po to override +>> such a function if it were used in some of the other places that compare +>> to index. +>> +>> The other option would be for po to override the template setting. +>> --[[Joey]] Pagespecs --------- @@ -314,14 +346,6 @@ Also, this may only happen if the page being linked to is coming from an underlay, and the underlays lack translation to a given language. --[[Joey]] -recentchanges links to po files -------------------------------- - -When a po file is changed, the recentchanges page shows a link such as -"sandbox.es". But, clicking on it goes to the English (or negotiated -language) version of the page. It would be better in this one case if -the link went direct to the translated version of the page. --[[Joey]] - Double commits of po files -------------------------- @@ -341,6 +365,15 @@ Ugly messages with empty files If there are empty .mdwn files, the po plugin displays some ugly messages. +Translation of directives +------------------------- + +If a translated page contains a directive, it may expand to some english +text, or text in whatever single language ikiwiki is configured to "speak". + +Maybe there could be a way to switch ikiwiki to speaking another language +when building a non-english page? Then the directives would get translated. + Documentation ------------- diff --git a/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn new file mode 100644 index 000000000..6ca9962ba --- /dev/null +++ b/doc/todo/mirrorlist_with_per-mirror_usedirs_settings.mdwn @@ -0,0 +1,24 @@ +I've got a wiki that is built at two places: + +* a static copy, aimed at being viewed without any web server, using + a web browser's `file:///` urls => usedirs is disabled to get nice + and working links +* an online copy, with usedirs enabled in order to benefit from the + language negotiation using the po plugin + +I need to use mirrorlist on the static copy, so that one can easily +reach the online, possibly updated, pages. But as documented, "pages are +assumed to exist in the same location under the specified url on each +mirror", so the generated urls are wrong. + +My `mirrorlist` branch contains a patch that allows one to configure usedirs +per-mirror. Note: the old configuration format is still supported, so this should +not break existing wikis. + +OT: as a bonus, this branch contains a patch to support {hashes,arrays} of +{hashes,arrays} in `$config`, which I missed a bit when writing the po plugin, +and decided this time it was really needed to implement this feature. + +--[[intrigeri]] + +[[!tag patch]] diff --git a/doc/todo/tmplvars_plugin/discussion.mdwn b/doc/todo/tmplvars_plugin/discussion.mdwn new file mode 100644 index 000000000..93cb9b414 --- /dev/null +++ b/doc/todo/tmplvars_plugin/discussion.mdwn @@ -0,0 +1 @@ +I find this plugin quite usefull. But one thing, I would like to be able to do is set a tmplvar e.g. in a sidebar so that it affects all Pages this sidebar is used in. --martin @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: 2009-08-17 10:06+0200\n" "Last-Translator: Philippe Batailler <philippe.batailler@free.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -57,7 +57,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Erreur" @@ -184,7 +184,9 @@ msgstr "Génération de l'index automatique" msgid "" "Sorry, but that looks like spam to <a href=\"http://blogspam.net/" "\">blogspam</a>: " -msgstr "Désolé, mais cela ressemble à un « spam » selon les critères de <a href=\"http://blogspam.net/\">blogspam</a> : " +msgstr "" +"Désolé, mais cela ressemble à un « spam » selon les critères de <a href=" +"\"http://blogspam.net/\">blogspam</a> : " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -444,16 +446,16 @@ msgstr "Sort::Naturally est nécessaire pour un tri « title_natural »" msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Ajouter un nouvel article dont le titre est :" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "Le modèle de page %s n'existe pas" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -531,7 +533,9 @@ msgstr "Erreur lors de la création du compte." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "Aucune adresse indiquée. Impossible d'envoyer les instructions pour réinitialiser le mot de passe." +msgstr "" +"Aucune adresse indiquée. Impossible d'envoyer les instructions pour " +"réinitialiser le mot de passe." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -1061,22 +1065,22 @@ msgstr "Examen de %s" msgid "building %s, which links to %s" msgstr "Reconstruction de %s, qui est lié à %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "Reconstruction de %s, qui dépend de %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "Suppression de %s, qui n'est plus rendu par %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1106,7 +1110,9 @@ msgstr "Échec lors de la création du dépôt avec ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "** Désactivation du greffon %s, l'installation a échoué avec le message suivant :" +msgstr "" +"** Désactivation du greffon %s, l'installation a échoué avec le message " +"suivant :" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1176,12 +1182,12 @@ msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "oui" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index a9c0fbb99..29a2d508c 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -54,7 +54,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "" @@ -437,16 +437,16 @@ msgstr "" msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -1028,22 +1028,22 @@ msgstr "" msgid "building %s, which links to %s" msgstr "" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1139,12 +1139,12 @@ msgstr "" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-15 14:07-0400\n" +"POT-Creation-Date: 2009-08-25 18:43-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno <lucab@debian.org>\n" "Language-Team: Italian TP <tp@lists.linux.it>\n" @@ -18,15 +18,18 @@ msgid "You need to log in first." msgstr "Occorre prima effettuare l'accesso." #: ../IkiWiki/CGI.pm:146 -msgid "probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https" -msgstr "possibile errore di configurazione: sslcookie è impostato, ma si sta tentando un accesso via http, non https" +msgid "" +"probable misconfiguration: sslcookie is set, but you are attempting to login " +"via http, not https" +msgstr "" +"possibile errore di configurazione: sslcookie è impostato, ma si sta " +"tentando un accesso via http, non https" #: ../IkiWiki/CGI.pm:149 msgid "login failed, perhaps you need to turn on cookies?" msgstr "errore nell'accesso, probabilmente i cookie sono disabilitati?" -#: ../IkiWiki/CGI.pm:168 -#: ../IkiWiki/CGI.pm:299 +#: ../IkiWiki/CGI.pm:168 ../IkiWiki/CGI.pm:299 msgid "Your login session has expired." msgstr "La sessione è scaduta." @@ -50,9 +53,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:390 -#: ../IkiWiki/CGI.pm:391 -#: ../IkiWiki.pm:1260 +#: ../IkiWiki/CGI.pm:390 ../IkiWiki/CGI.pm:391 ../IkiWiki.pm:1269 msgid "Error" msgstr "Errore" @@ -62,7 +63,8 @@ msgstr "Aggregazione attivata dal web." #: ../IkiWiki/Plugin/aggregate.pm:93 msgid "Nothing to do right now, all feeds are up-to-date!" -msgstr "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." +msgstr "" +"Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." #: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format @@ -133,8 +135,7 @@ msgstr "creazione nuova pagina %s" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 -#: ../ikiwiki.in:210 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:210 msgid "done" msgstr "fatto" @@ -177,8 +178,12 @@ msgid "automatic index generation" msgstr "generazione automatica dell'indice" #: ../IkiWiki/Plugin/blogspam.pm:108 -msgid "Sorry, but that looks like spam to <a href=\"http://blogspam.net/\">blogspam</a>: " -msgstr "È stato riconosciuto come spam da <a href=\"http://blogspam.net/\">blogspam</a>: " +msgid "" +"Sorry, but that looks like spam to <a href=\"http://blogspam.net/" +"\">blogspam</a>: " +msgstr "" +"È stato riconosciuto come spam da <a href=\"http://blogspam.net/\">blogspam</" +"a>: " #: ../IkiWiki/Plugin/brokenlinks.pm:42 #, perl-format @@ -189,8 +194,7 @@ msgstr "%s da %s" msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:124 -#: ../IkiWiki/Plugin/format.pm:38 +#: ../IkiWiki/Plugin/comments.pm:124 ../IkiWiki/Plugin/format.pm:38 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" @@ -203,8 +207,7 @@ msgstr "i commenti devono avere un contenuto" msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:340 -#: ../IkiWiki/Plugin/editpage.pm:97 +#: ../IkiWiki/Plugin/comments.pm:340 ../IkiWiki/Plugin/editpage.pm:97 msgid "bad page name" msgstr "nome pagina non valido" @@ -240,8 +243,7 @@ msgstr "Aggiunto commento" msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:525 -#: ../IkiWiki/Plugin/websetup.pm:236 +#: ../IkiWiki/Plugin/comments.pm:525 ../IkiWiki/Plugin/websetup.pm:236 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" @@ -257,10 +259,8 @@ msgstr "moderazione commento" msgid "Comments" msgstr "Commenti" -#: ../IkiWiki/Plugin/conditional.pm:27 -#: ../IkiWiki/Plugin/cutpaste.pm:30 -#: ../IkiWiki/Plugin/cutpaste.pm:45 -#: ../IkiWiki/Plugin/cutpaste.pm:61 +#: ../IkiWiki/Plugin/conditional.pm:27 ../IkiWiki/Plugin/cutpaste.pm:30 +#: ../IkiWiki/Plugin/cutpaste.pm:45 ../IkiWiki/Plugin/cutpaste.pm:61 #: ../IkiWiki/Plugin/testpagespec.pm:26 #, perl-format msgid "%s parameter is required" @@ -290,10 +290,8 @@ msgstr "%s non è una pagina modificabile" msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:310 -#: ../IkiWiki/Plugin/editpage.pm:329 -#: ../IkiWiki/Plugin/editpage.pm:339 -#: ../IkiWiki/Plugin/editpage.pm:383 +#: ../IkiWiki/Plugin/editpage.pm:310 ../IkiWiki/Plugin/editpage.pm:329 +#: ../IkiWiki/Plugin/editpage.pm:339 ../IkiWiki/Plugin/editpage.pm:383 #: ../IkiWiki/Plugin/editpage.pm:422 #, perl-format msgid "editing %s" @@ -324,13 +322,11 @@ msgstr "occorre specificare formato e testo" msgid "fortune failed" msgstr "errore nel fortune" -#: ../IkiWiki/Plugin/getsource.pm:62 -#: ../IkiWiki/Plugin/goto.pm:55 +#: ../IkiWiki/Plugin/getsource.pm:62 ../IkiWiki/Plugin/goto.pm:55 msgid "missing page" msgstr "pagina mancante" -#: ../IkiWiki/Plugin/getsource.pm:64 -#: ../IkiWiki/Plugin/goto.pm:57 +#: ../IkiWiki/Plugin/getsource.pm:64 ../IkiWiki/Plugin/goto.pm:57 #, perl-format msgid "The page %s does not exist." msgstr "La pagina %s non esiste." @@ -344,8 +340,7 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:626 -#: ../IkiWiki/Plugin/git.pm:644 +#: ../IkiWiki/Plugin/git.pm:626 ../IkiWiki/Plugin/git.pm:644 #: ../IkiWiki/Receive.pm:129 #, perl-format msgid "you are not allowed to change %s" @@ -360,8 +355,7 @@ msgstr "non è permesso lavorare su un file in modalità %s" msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/google.pm:27 -#: ../IkiWiki/Plugin/po.pm:129 +#: ../IkiWiki/Plugin/google.pm:27 ../IkiWiki/Plugin/po.pm:129 #: ../IkiWiki/Plugin/search.pm:36 #, perl-format msgid "Must specify %s when using the %s plugin" @@ -369,7 +363,9 @@ msgstr "Occorre specificare %s quando si usa il plugin %s" #: ../IkiWiki/Plugin/google.pm:31 msgid "Failed to parse url, cannot determine domain name" -msgstr "Errore nell'interpretazione dell'URL, impossibile determinare il nome del dominio" +msgstr "" +"Errore nell'interpretazione dell'URL, impossibile determinare il nome del " +"dominio" #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" @@ -390,8 +386,10 @@ msgid "Source code: %s" msgstr "Sorgente: %s" #: ../IkiWiki/Plugin/highlight.pm:123 -msgid "warning: highlight perl module not available; falling back to pass through" -msgstr "attenzione: modulo perl highlight non trovato, verrà passato inalterato" +msgid "" +"warning: highlight perl module not available; falling back to pass through" +msgstr "" +"attenzione: modulo perl highlight non trovato, verrà passato inalterato" #: ../IkiWiki/Plugin/img.pm:63 msgid "Image::Magick is not installed" @@ -402,8 +400,7 @@ msgstr "Image::Magick non è installato" msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:83 -#: ../IkiWiki/Plugin/img.pm:87 +#: ../IkiWiki/Plugin/img.pm:83 ../IkiWiki/Plugin/img.pm:87 #: ../IkiWiki/Plugin/img.pm:104 #, perl-format msgid "failed to read %s: %s" @@ -421,7 +418,8 @@ msgstr "impossibile determinare la dimensione dell'immagine %s" #: ../IkiWiki/Plugin/inline.pm:92 msgid "Must specify url to wiki with --url when using --rss or --atom" -msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" +msgstr "" +"Occorre specificare l'url del wiki tramite --url quando si usa --rss o --atom" #: ../IkiWiki/Plugin/inline.pm:138 msgid "page editing not allowed" @@ -445,16 +443,16 @@ msgstr "Sort::Naturally è richiesto per l'ordinamento title_natural" msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki/Plugin/inline.pm:327 +#: ../IkiWiki/Plugin/inline.pm:329 msgid "Add a new post titled:" msgstr "Aggiungere un nuovo articolo dal titolo:" -#: ../IkiWiki/Plugin/inline.pm:347 +#: ../IkiWiki/Plugin/inline.pm:349 #, perl-format msgid "nonexistant template %s" msgstr "modello %s non esistente" -#: ../IkiWiki/Plugin/inline.pm:612 +#: ../IkiWiki/Plugin/inline.pm:614 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -469,12 +467,14 @@ msgstr "%s è bloccata e non può essere modificata" #: ../IkiWiki/Plugin/mdwn.pm:44 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" -msgstr "multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" +msgstr "" +"multimarkdown è stato abilitato, ma Text::MultiMarkdown non è aggiornato" #: ../IkiWiki/Plugin/mdwn.pm:67 #, perl-format msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" -msgstr "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" +msgstr "" +"impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" #: ../IkiWiki/Plugin/meta.pm:158 msgid "stylesheet not found" @@ -530,7 +530,9 @@ msgstr "Errore nella creazione dell'account." #: ../IkiWiki/Plugin/passwordauth.pm:258 msgid "No email address, so cannot email password reset instructions." -msgstr "Nessun indirizzo email, impossibile inviare per email le istruzioni per reimpostare la password." +msgstr "" +"Nessun indirizzo email, impossibile inviare per email le istruzioni per " +"reimpostare la password." #: ../IkiWiki/Plugin/passwordauth.pm:292 msgid "Failed to send mail" @@ -538,7 +540,8 @@ msgstr "Impossibile spedire il messaggio" #: ../IkiWiki/Plugin/passwordauth.pm:294 msgid "You have been mailed password reset instructions." -msgstr "Il messaggio con le istruzioni per reimpostare la password è stato inviato." +msgstr "" +"Il messaggio con le istruzioni per reimpostare la password è stato inviato." #: ../IkiWiki/Plugin/passwordauth.pm:329 msgid "incorrect password reset url" @@ -572,7 +575,9 @@ msgstr "LWP non trovato, ping non inviato" #: ../IkiWiki/Plugin/po.pm:15 msgid "warning: Old po4a detected! Recommend upgrade to 0.35." -msgstr "attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno alla versione 0.35." +msgstr "" +"attenzione: è presente un vecchio po4a. Si raccomanda di aggiornare almeno " +"alla versione 0.35." #: ../IkiWiki/Plugin/po.pm:136 #, perl-format @@ -581,20 +586,25 @@ msgstr "%s non è una codifica di lingua valida" #: ../IkiWiki/Plugin/po.pm:148 #, perl-format -msgid "%s is not a valid value for po_link_to, falling back to po_link_to=default" -msgstr "%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" +msgid "" +"%s is not a valid value for po_link_to, falling back to po_link_to=default" +msgstr "" +"%s non è un valore per po_link_to valido, verrà utilizzato po_link_to=default" #: ../IkiWiki/Plugin/po.pm:153 -msgid "po_link_to=negotiated requires usedirs to be enabled, falling back to po_link_to=default" -msgstr "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato po_link_to=default" +msgid "" +"po_link_to=negotiated requires usedirs to be enabled, falling back to " +"po_link_to=default" +msgstr "" +"po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " +"po_link_to=default" #: ../IkiWiki/Plugin/po.pm:383 #, perl-format msgid "rebuilding all pages to fix meta titles" msgstr "rigenerazione di tutte le pagine per sistemare i meta-titoli" -#: ../IkiWiki/Plugin/po.pm:387 -#: ../IkiWiki/Render.pm:426 +#: ../IkiWiki/Plugin/po.pm:387 ../IkiWiki/Render.pm:426 #, perl-format msgid "building %s" msgstr "compilazione di %s" @@ -604,12 +614,20 @@ msgid "updated PO files" msgstr "file PO aggiornati" #: ../IkiWiki/Plugin/po.pm:448 -msgid "Can not remove a translation. If the master page is removed, however, its translations will be removed as well." -msgstr "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è stata eliminata anche le traduzioni lo saranno." +msgid "" +"Can not remove a translation. If the master page is removed, however, its " +"translations will be removed as well." +msgstr "" +"Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " +"stata eliminata anche le traduzioni lo saranno." #: ../IkiWiki/Plugin/po.pm:468 -msgid "Can not rename a translation. If the master page is renamed, however, its translations will be renamed as well." -msgstr "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è stata rinominata anche le traduzioni lo saranno." +msgid "" +"Can not rename a translation. If the master page is renamed, however, its " +"translations will be renamed as well." +msgstr "" +"Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " +"stata rinominata anche le traduzioni lo saranno." #: ../IkiWiki/Plugin/po.pm:829 #, perl-format @@ -644,8 +662,7 @@ msgstr "impossibile tradurre %s" msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1046 -#: ../IkiWiki/Plugin/po.pm:1060 +#: ../IkiWiki/Plugin/po.pm:1046 ../IkiWiki/Plugin/po.pm:1060 #: ../IkiWiki/Plugin/po.pm:1100 #, perl-format msgid "failed to write %s" @@ -662,7 +679,9 @@ msgstr "impossibile leggere %s" #: ../IkiWiki/Plugin/po.pm:1112 msgid "invalid gettext data, go back to previous page to continue edit" -msgstr "dati gettext non validi, tornare alle pagina precedente per continuare le modifiche" +msgstr "" +"dati gettext non validi, tornare alle pagina precedente per continuare le " +"modifiche" #: ../IkiWiki/Plugin/poll.pm:69 msgid "vote" @@ -759,14 +778,15 @@ msgstr "valore percentuale %s non ammesso" #: ../IkiWiki/Plugin/progress.pm:59 msgid "need either `percent` or `totalpages` and `donepages` parameters" -msgstr "occorrono alternativamente i parametri \"percent\" o \"totalpages\" e \"donepages\"" +msgstr "" +"occorrono alternativamente i parametri \"percent\" o \"totalpages\" e " +"\"donepages\"" #: ../IkiWiki/Plugin/recentchangesdiff.pm:37 msgid "(Diff truncated)" msgstr "(Diff troncato)" -#: ../IkiWiki/Plugin/remove.pm:31 -#: ../IkiWiki/Plugin/rename.pm:36 +#: ../IkiWiki/Plugin/remove.pm:31 ../IkiWiki/Plugin/rename.pm:36 #, perl-format msgid "%s does not exist" msgstr "%s non esiste" @@ -776,8 +796,7 @@ msgstr "%s non esiste" msgid "%s is not in the srcdir, so it cannot be deleted" msgstr "%s non è in src, quindi non può essere eliminato" -#: ../IkiWiki/Plugin/remove.pm:41 -#: ../IkiWiki/Plugin/rename.pm:45 +#: ../IkiWiki/Plugin/remove.pm:41 ../IkiWiki/Plugin/rename.pm:45 #, perl-format msgid "%s is not a file" msgstr "%s non è un file" @@ -976,12 +995,19 @@ msgid "plugins" msgstr "plugin" #: ../IkiWiki/Plugin/websetup.pm:395 -msgid "The configuration changes shown below require a wiki rebuild to take effect." -msgstr "Le sottostanti modifiche alla configurazione richiedono la ricompilazione del wiki." +msgid "" +"The configuration changes shown below require a wiki rebuild to take effect." +msgstr "" +"Le sottostanti modifiche alla configurazione richiedono la ricompilazione " +"del wiki." #: ../IkiWiki/Plugin/websetup.pm:399 -msgid "For the configuration changes shown below to fully take effect, you may need to rebuild the wiki." -msgstr "Affinché le sottostanti modifiche alla configurazione abbiano effetto, occorre ricostruire il wiki." +msgid "" +"For the configuration changes shown below to fully take effect, you may need " +"to rebuild the wiki." +msgstr "" +"Affinché le sottostanti modifiche alla configurazione abbiano effetto, " +"occorre ricostruire il wiki." #: ../IkiWiki/Plugin/websetup.pm:436 #, perl-format @@ -1000,11 +1026,14 @@ msgstr "nome file %s scorretto" #: ../IkiWiki/Render.pm:264 #, perl-format -msgid "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this" -msgstr "collegamento simbolico trovato nel percorso srcdir (%s) -- impostare allow_symlinks_before_srcdir per abilitare questa configurazione" +msgid "" +"symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to " +"allow this" +msgstr "" +"collegamento simbolico trovato nel percorso srcdir (%s) -- impostare " +"allow_symlinks_before_srcdir per abilitare questa configurazione" -#: ../IkiWiki/Render.pm:287 -#: ../IkiWiki/Render.pm:312 +#: ../IkiWiki/Render.pm:287 ../IkiWiki/Render.pm:312 #, perl-format msgid "skipping bad filename %s" msgstr "ignorato il file dal nome scorretto %s" @@ -1029,22 +1058,22 @@ msgstr "scansione %s" msgid "building %s, which links to %s" msgstr "compilazione di %s, che è collegato a %s" -#: ../IkiWiki/Render.pm:468 +#: ../IkiWiki/Render.pm:473 #, perl-format msgid "building %s, which depends on %s" msgstr "compilazione di %s, che dipende da %s" -#: ../IkiWiki/Render.pm:507 +#: ../IkiWiki/Render.pm:513 #, perl-format msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:519 +#: ../IkiWiki/Render.pm:525 #, perl-format msgid "removing %s, no longer built by %s" msgstr "rimozione di %s, non più richiesto da %s" -#: ../IkiWiki/Render.pm:543 +#: ../IkiWiki/Render.pm:549 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1072,7 +1101,8 @@ msgstr "impossibile creare un repository tramite ikiwiki-makerepo" #: ../IkiWiki/Setup/Automator.pm:115 #, perl-format msgid "** Disabling plugin %s, since it is failing with this message:" -msgstr "** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" +msgstr "" +"** Plugin %s disabilitato, a causa della seguente segnalazione di errore:" #: ../IkiWiki/Wrapper.pm:16 #, perl-format @@ -1140,12 +1170,12 @@ msgstr "impossibile usare più plugin rcs" msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1243 +#: ../IkiWiki.pm:1251 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1783 +#: ../IkiWiki.pm:1791 msgid "yes" msgstr "sì" @@ -1173,4 +1203,3 @@ msgstr "Quale utente (openid o del wiki) sarà l'amministratore?" #: ../auto.setup:23 msgid "What is the domain name of the web server?" msgstr "Qual è il nome del dominio del server web?" - |