<TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL

+ + + +Can't we avoid adding this div when there's no enclosure? --[[Joey]] + +> Sure, I've moved the `` check to outside the +> section-and-div block for `{,inline}page.tmpl`. --[[schmonz]] + + +Download this episode + +"Download this episode" is pretty specific to particular use cases. +Can this be made more generic, perhaps just "Download"? --[[Joey]] + +> Yep, I got a little carried away. Done. --[[schmonz]] + + - + - <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> + - + +This change removes the author name from the title of the rss feed, which +does not seem necessary for fancy podcasts. And it is a change that +could negatively impact eg, Planet style aggregators using ikiwiki. --[[Joey]] + +> While comparing how feeds render in podcatchers, I noticed that +> RSS and Atom were inconsistent in a couple ways, of which this was +> one. The way I noticed it: with RSS, valuable title space was being +> spent to display the author. I figured Atom's display was the one +> worth matching. You're right, of course, that planets using the +> default template and somehow relying on the current author-in-the-title +> rendering for RSS feeds (but not Atom feeds!) would be broken by +> this change. I'm having trouble imagining exactly what would break, +> though, since guids and timestamps are unaffected. Would it suffice +> to provide a note in the changelog warning people to be careful +> upgrading their planets, and to customize `rssitem.tmpl` if they +> really prefer the old behavior (or don't want to take any chances)? +> --[[schmonz]] + +>> A specific example I know of is updo.debian.net, when used with +>> rss2email. Without the author name there, one cannot see who posted +>> an item. It's worth noting that planet.debian.org does the same thing +>> with its rss feed. (That's probably what I copied.) Atom feeds may +>> not have this problem, don't know. --[[Joey]] + +>>> Okay, that's easy to reproduce. It looks like this _might_ be +>>> a simple matter of getting \[[!aggregate]] to populate author in +>>> `add_page()`. I'll see what I can figure out. --[[schmonz]] + +>>>> Yep, that was mostly it. If the feed entry defines an author, +>>>> and the author is distinct from the feed name, we now show `NAME: +>>>> AUTHOR`, else just show `NAME` (same as always). In addition, +>>>> the W3 feed validator says `` is invalid, so +>>>> I replaced it with ``, and all of a sudden `r2e` +>>>> gives me better `From:` headers. With the latest on my branch, +>>>> when I generate the same planet as updo and run `r2e` over it, +>>>> the names I get in `From:` look like so: + +* `"updo: Junio C Hamano"` +* `"updo: Greg Kroah-Hartman"` +* `"updo: Eric Raymond: esr"` (article author != feed name, so we get both) +* `"updo: Jannis Pohlman: Jannis Pohlmann"` (oops! I tweaked the real updo) + +>>>> --[[schmonz]] + + +++ b/templates/rsspage.tmpl + + xmlns:atom="http://www.w3.org/2005/Atom" + + + +Why is it using atom namespace inside an rss feed? What are the chances +every crummy rss reader on earth is going to understand this? I'd put it at +about 0%; I doubt ikiwiki's own rss reader understands such a mashup. +--[[Joey]] + +> The validator I used () told me to. +> Pretty sure it doesn't make anything work better in the podcatchers +> I tried. Hadn't considered that it might break some readers. +> Removed. --[[schmonz]] + + +ikiwiki + +Does this added tag provide any benefits? --[[Joey]] + +> Consistency with the Atom feed, and of course it trumpets ikiwiki +> to software and/or curious humans who inspect their feeds. The tag +> arrived only in RSS 2.0, but that's already the version we're +> claiming to be, and it's over a decade old. Seems much less risky +> than the atom namespace bits. --[[schmonz]] + +>> Sounds ok then. --[[Joey]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/fancypodcast.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/fancypodcast.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/fancypodcast.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/fancypodcast.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,75 @@ +## Status + +[[!template id=gitbranch branch=schmonz/fancypodcast author="[[schmonz]]"]] +[[!tag patch]] + +Nothing new since 2013/07/21 [[merge|done]] to `master`. + +## Features + +[[!table data=""" +Feature |iTunes RSS|iTunes Atom|Downcast RSS|Downcast Atom +Feed image | | | | +Feed title |(./) |(./) |(./) |(./) +Feed publisher | | | | +Feed "category" | | | | +Feed date |(./) |(./) |(./) |(./) +Feed description |(./) |(./) |(./) | +Episode image | | | | +Episode title |(./) |(./) |(./) |(./) +Episode date |(./) |(./) |(./) |(./) +Episode duration | | | | +Episode author | | | | +Episode description|(./) |(./) |(./) | +Episode enclosure |(./) |(./) |(./) |(./) +"""]] + +## Future improvements + +### iTunes fancy podcasting + +* [iTunes-specific tags](https://www.apple.com/itunes/podcasts/specs.html) + appear to be RSS-only + * If they work in Atom, teach `inline` to optionally iTunesify RSS/Atom. + * Else, add `itunes` as a third kind of feed (RSS plus more stuff). +* Notable tags for feeds: + * `itunes:subtitle` + * `itunes:author` + * `itunes:summary` (same as `description`) + * `itunes:owner` (includes `itunes:name` and `itunes:email`) + * `itunes:image href=''` + * `itunes:publisher` + * `itunes:category text=''` (can contain subcategories) + * `itunes:keywords` +* Notable tags for entries: + * `itunes:duration` + * [[!cpan Audio::TagLib]] might be fastest, if present and applicable + * [ffprobe](http://ffmpeg.org/ffprobe.html) is reasonably fast + * [mediainfo](http://mediainfo.sourceforge.net/) is way slower + * Cache computed durations as pagestate + +### Fancy podcast aggregating + +* Write tests comparing a fancy podcast (HTML and feeds) against + the same podcast aggregated and republished, then make them pass + via changes to `aggregatepost.impl` and [[plugins/aggregate]]. + +### Other ideas + +* Don't render template text (e.g., "Use this template to insert a + note into a page") in feeds. + * [[schmonz]] observes this in a dual-feed (one for enclosures, + another for browsers) scenario, but not in the typical case. + Remaining to be verified: that once migrated to fancypodcast, + this stops being a problem. +* Optionally specify the enclosure's: + * MIME type, in case `File::MimeInfo` guesses wrong. + * Duration, in case `ffprobe` guesses wrong. +* Optionally specify enclosures outside the wiki: + * Some people don't want to store big unchanging files in the VCS. + * Other people like [podcasting found media](http://huffduffer.com/about). + * We'd have to download the file just to compute some metadata + about it, and then somehow not frequently re-download it. +* Configurably generate additional subscription links (such as + iTunes) alongside the RSS/Atom ones in [[plugins/inline]]. +* Support Apple's "enhanced podcasts" (if they're still relevant). diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/flexible_relationships_between_pages/blocks.pm.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/flexible_relationships_between_pages/blocks.pm.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/flexible_relationships_between_pages/blocks.pm.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/flexible_relationships_between_pages/blocks.pm.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,129 @@ +#!/usr/bin/perl +# Ikiwiki "blocks" relationship plugin. +package IkiWiki::Plugin::blocks; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "blocks", call => \&getsetup); + hook(type => "checkconfig", id => "skeleton", call => \&checkconfig); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 1, + }, + blocks_names => { + type => "string", + example => "blocks/blockedby", + description => "comma separated list of defined relationship pairs, the forward and backward name separated by a slash", + safe => 1, + rebuild => 1, + }, +} + +sub checkconfig () { + my $blocksnames; + if (defined $config{blocks_names}) { + $blocksnames = $config{blocks_names}; + } else { + $blocksnames = "blocks/blockedby"; + } + + while ( $blocksnames =~ /([^ ]+)/g ) + { + if ( $1 =~ m@([a-zA-Z0-9]+)(/([a-zA-Z0-9]+))?@ ) + { + my $from = $1; + my $to = $3; + hook( + type => "preprocess", + shortcut => 1, # gets interpreted by listdirectives; see doc/bugs/cannot_preview_shortcuts.mdwn / ikiwiki commit 354d22e2 + no_override => 1, + id => $from, + scan => 1, + call => sub { preprocess_blocks($from, 1, @_); } + ); + if ($to) + { + hook( + type => "preprocess", + shortcut => 1, + no_override => 1, + id => $to, + scan => 1, + call => sub { preprocess_blocks($from, 0, @_); } + ); + } + + my $backward_match; my $backward_name; + my $forward_match; my $forward_name; + + $backward_match = sub ($$;@) { + my $page=shift; + my $glob=shift; + return IkiWiki::PageSpec::match_backlink($page, $glob, linktype => $from, @_); + }; + + $backward_name = "IkiWiki::PageSpec::match_$from"; + + if ($to) + { + $forward_match = sub ($$;@) { + my $page=shift; + my $glob=shift; + return IkiWiki::PageSpec::match_link($page, $glob, linktype => $from, @_); + }; + + $forward_name = "IkiWiki::PageSpec::match_$to"; + } + + { + no strict 'refs'; + + if ($to) + { + *$forward_name = $forward_match; + } + *$backward_name = $backward_match; + } + } else { + error gettext("Malformed option in blocks_names"); + } + } +} + +sub preprocess_blocks ($$@) { + # with flip=0, the directive occurring on page A pointing at page B + # means that A $relation B, with flip=1, it means B $relation A + my $relation = shift; + my $flip = shift; + + if (! @_) { + return ""; + } + my %params=@_; + my $page = $params{page}; + delete $params{page}; + delete $params{destpage}; + delete $params{preview}; + + foreach my $blocks (keys %params) { + $blocks=linkpage($blocks); + + # hidden WikiLink + if ( $flip == 0 ) { + add_link($page, $blocks, $relation); + } else { + add_link($blocks, $page, $relation); + } + } + + return ""; +} + +1 diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/flexible_relationships_between_pages.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/flexible_relationships_between_pages.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/flexible_relationships_between_pages.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/flexible_relationships_between_pages.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,147 @@ +it has been some years since the [[matching different kinds of links]] issue +was tackled, but hardly a plugin is using it. + +in order to enhance on the [[todo/rel attribute for links]] and [[todo/better bug tracking support]] +issues and to provide a more general infrastructure, i'd like to propose a +generic plugin for typed links. it can be also viewed of a way to have +[[todo/structured page data]] that consists of URLs inside the wiki. + +following the use case i've developed it for, i'll call it `blocks` for the +moment (but am open to better suggestions). + +outline +======= + +the plugin has a **configuration option** called `blocks_names`, which consists +of pairs of verbs; the typical example is `blocks/blockedby`, but other values +could be `next/prev up/down` or `owner/owns`. + +for each verb in the options, there is a **directive** which is used to state +the relationship; relationships can be declared on both ends, so a page `bugA` +with the contents `\[[!blocks bugB]]` is semantically equivalent to a page +`bugB` with the contents `\[[!blockedby bugA]]`. + +for each verb, there is also a **pagespec** which matches all pages that are +the origin of a relationship to a given page. if `developerA` `\[[!owns +bug1]]`, then if `bug1` contains `\[[!map pages="owns(.)"]]`, it will show the +owning developer. these specs match both ways, ie. if `bug1` `\[[!owner +developerA]]`, the said map directive will still produce the same result. + +details +======= + +* single word relationships vs. symmetric relationships + + with some verbs, it is possible that a relationship is only used in one + direction (eg `index`, even though one could declare it as + `index/isindexof`). + + > isindexof is not a very interesting relationship - it just clogs up + > the link-map, since the index is "the index of" all pages. I can't + > see any situation in which you'd want to do pagespec matching + > on it? --[[smcv]] + + >> that's why i used `index` as an example of a one-direction relationship. + >> + >> it wouldn't clog up the link map, though: in order to cleanly match both + >> directions, when the "inverse" term of a relationship is used, the link in + >> taggedlinks uses the "forward" term, but switches the objects. + >> + >> --[[chrysn]] + + other verbs are symmetric, eg. `equivalent`, which need different treatment. + +* "taglink" style directives + + the [[plugins/tag]] plugin would be a special case for this plugin (apart + from the autotag and tagdir features). as there is a `\[[!taglink ...]]` + directive, there could be an analogous directive for every single directive. + + > This is basically the traillink/trailitem duality, too. + > I'd be quite tempted to generalize to something like this: + > + > We can't fix [[!link blocks="bug123" text="Bug 123"]] until we do this. + > + > [[!hiddenlink owner="smcv"]] + > + > but perhaps that's too wordy? + > + > I think both trail and tag need their own special processing beyond the + > general case, but maybe not? --[[smcv]] + + >> i'd be all in favor of having this unified and deeper; there has been the + >> idea of a `\[[!link]]` directive [[again|todo/link plugin perhaps too general__63__]] + >> and [[again|todo/do not make links backwards]]. + >> + >> i like the `\[[!link text=""]]` and `[[!hiddenlink]]` conventions, but + >> think that ${REL}="${TARGET}" isn't ideal because it implies that a single + >> link can have more than one target. instead, i'd go for + >> `\[[!link to="bug123" rel="blocks" text="Bug 123"]]; as with the html rel + >> parameter, rel would be a list of whitespace separated values. + >> + >> positional parameters (`\[[!link bug123 rel="blocks" text="Bug 123"]]` or + >> even `\[[!link Bug 123|bug123 rel="blocks"]]`) would be possible, but i + >> prefer explicit syntax and not joining stings back again with the + >> whitespace that was split off it before. + >> + >> if the '|' character is not widespread in page names (which i assume it is + >> not), instead of using positional parameters in `\[[!link]]` for + >> shortcuts, we could extend the regular link syntax; the same relationship + >> could then be declared as `\[[Bug 123|bug123|blocks]]`; this would be an + >> easy extension to the original link syntax. it would even work for hidden links + >> (`\[[|smcv|owner]]`), which previously made no sense because a link with + >> neither a physicial representation nor metadat is of no use. + >> + >> --[[chrysn]] + +* implementation notes + + the way pagespec hooks are implemented required some nasty perl tricks, for + which the people who showed me felt very bad for having spoilt me. indeed, + `no strict refs;` and `*$forward_name = $forward_match;` are not exactly + ideal. a change in the pagespec declaration api (why not just `hook` like + everything else) would make the implementation cleaner. + + > How about replacing `blockedby(bug*)` with `linktype(blockedby bug*)` or + > something? Then you'd only need one pseudo-hook. --[[smcv]] + + >> there has been the topic of pagespecs like `typedlink(type glob)` back in + >> the [[matching different kinds of links]] discussion, but it was removed + >> in favor of per-type matchers. --[[chrysn]] + +* configuration location + + i aimed for static configuration of the `block_names` in the setup file. this + could be made more general like in the [[plugins/shortcut]] plugin, but that + would make things more complex. + +* no html links with `rel=` yet + + as there are no taglink style links between the articles so far, no htmllink + gets rendered that could carry the relationship name in its rel field. + + having the inverse relationship description in backlinks (as in the link + created by the map directive in the example above) would be hard to + implement. (actually, i think it'd be easier to determine the rel values from + the taggedlinks for *every* htmllink than to influence the backlinks in this + plugin). + +* one direction also creates a normal link + + due to the way add\_link treats relationships, the forward relationship is + always going to be reflected in the links/backlinks. a section of + [[todo/matching different kinds of links]] was dismissed with "let's not + worry about it", this plugin might be reason to worry about it again. (i'd + consider what is in @links to be a representation of which hyperlinks are + there, and in this case, none are generated). + + > taglink and traillink already count as wikilinks without generating + > any visible HTML. --[[smcv]] + +implementation +============== + +there is a working but slightly incomplete (basically where it comes to the +details mentioned above) implementation in [[blocks.pm]]. + +--[[chrysn]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/hook_to_detect_markdown_links_to_wiki_pages.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/hook_to_detect_markdown_links_to_wiki_pages.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/hook_to_detect_markdown_links_to_wiki_pages.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/hook_to_detect_markdown_links_to_wiki_pages.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +For an internal wiki, we occasionally get patches that link to internal wiki pages using the Markdown link syntax. I'd love to see an optional git hook to detect that and complain. diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/inline_postform_autotitles.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/inline_postform_autotitles.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/inline_postform_autotitles.mdwn 2013-02-13 09:08:27.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/inline_postform_autotitles.mdwn 2013-09-04 22:10:49.000000000 +0000 @@ -1,5 +1,5 @@ [[!tag wishlist patch plugins/inline]] -[[!template id=gitbranch branch=chrysn/patches author="[[chrysn]]"]] +[[!template id=gitbranch branch=chrysn/inlineautotitles author="[[chrysn]]"]] for postforms in inlines of pages which follow a certain scheme, it might not be required to set the title for each individual post, but to automatically set @@ -8,7 +8,7 @@ munging mechanism, which appends numbers to page titles in case that page already exists. -two patches ([1], [2]) set inline up for that, adding an additional `autotitle` +two patches (b568eb25, 34bc82f2) set inline up for that, adding an additional `autotitle` parameter. if that is given, the regular input of the inline postform will be replaced with a hidden input of that text. in addition, the empty title is permitted (both for autotitle and regular titles, as they go in the same GET @@ -42,7 +42,7 @@ in "the 10%-rule"). both can be circumvented by using another GET parameter for autotexts, as -implemented in [3]. +implemented in 40dc10a4. > this patch still does not work perfectly; especially, it should make a > distinction between "autotitle is set but equal ''" (in which case it > should create a page named `1.mdwn`, and "autotitle is not set, and title is @@ -61,7 +61,3 @@ cool (eg for creating an entry with yesterday's date), but would be a bit of a problem with static pages. javascript could help with the date part, but name munging would be yet another thing. - -[1]: http://github.com/github076986099/ikiwiki/commit/b568eb257a3ef5ff49a84ac00a3a7465b643c1e1 -[2]: http://github.com/github076986099/ikiwiki/commit/34bc82f232be141edf036d35e8ef5aa289415072 -[3]: http://github.com/github076986099/ikiwiki/commit/40dc10a4ec7809e401b4497c2abccfba30f7a2af diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/outbound_proxy.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/outbound_proxy.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/outbound_proxy.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/outbound_proxy.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,57 @@ +[[!template id=gitbranch branch=schmonz/proxy author="[[schmonz]]"]] +[[!tag patch]] + +## Background + +Ikiwiki has several plugins that open outbound connections: + +* [[plugins/aggregate]] +* [[plugins/openid]] +* [[plugins/pinger]] + +In some networks it is desired (or necessary) for these connections +to traverse a proxy. Proxies are usually configured via environment +variables, so for ikiwiki it is probably not desirable (or necessary) +to manage proxy configuration via new purpose-specific settings in +the setup file; `ENV` ought to suffice. + +[[!cpan LWP::UserAgent]] by default doesn't care about the usual +environment variables, but if its constructor is passed a true +`env_proxy` value, it does. Then environment settings such as these +influence the agent, as expected: + + ENV: + http_proxy: 'http://foo.internal:8080' + no_proxy: 'localhost,.bar.internal' + +If the proxy and/or destination requires authentication, it may +also be necessary to prime `cookiejar`. + +## Changes + +This patch causes ikiwiki's `LWP::UserAgent` instances to: + +* honor proxy configuration in the environment +* consistently make use of cookies configured in the setup file + +## Limitations + +The patch lets me configure [[plugins/aggregate]] to traverse my +corporate proxy and to skip the proxy for internal hosts. I haven't +tested it with the other two plugins, both of which prefer [[!cpan +LWPx::ParanoidAgent]] if present, which deliberately lacks proxy +support. There exists [[!cpan LWP::UserAgent::Paranoid]] claiming +to be more modern, but I haven't looked at it further, so I don't +know whether its paranoia measures up or whether it supports proxies. + +## See also + +* [[bugs/http_proxy_for_openid]] +* [[forum/Setting_http__95__proxy]] + +> This looks fine, but you forgot to move the config entry for cookiejar +> from aggregate to the config setting list in IkiWiki.pm --[[Joey]] + +>> Indeed, fixed. --[[schmonz]] + +>>> [[merged|done]] --[[Joey]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/sortable_tables.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/sortable_tables.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/sortable_tables.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/sortable_tables.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +It would be nice if ikiwiki's table plugin could create sortable tables like Mediawiki does. diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/support_linking_to_cgit.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/support_linking_to_cgit.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/support_linking_to_cgit.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/support_linking_to_cgit.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,20 @@ +As described on [Tails issue #5879](https://labs.riseup.net/code/issues/5879), +cgit wants URLs like: + + https://git-tails.immerda.ch/tails/commit/wiki/src/todo/fix_localized_iceweasel_search_engine.mdwn?id=c682a361418bef7bce040ea2905691d54be192ab + +... while ikiwiki generates links like: + + https://git-tails.immerda.ch/tails/commit/wiki/src/todo%2Ffix_localized_iceweasel_search_engine.mdwn?id=c682a361418bef7bce040ea2905691d54be192ab + +on the recentchanges page. + +Would it make sense to add an option to skip URL-encoding when doing +the substitution of `\[[file]]` in `diffurl` and `historyurl`? + +--[[intrigeri]] + +> In `91b477c` I made a similar change to how the cvs backend encodes +> `diffurl`. Perhaps it applies to all VCS backends? --[[schmonz]] + +[[wishlist]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/toc-with-human-readable-anchors.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/toc-with-human-readable-anchors.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/toc-with-human-readable-anchors.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/toc-with-human-readable-anchors.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,7 @@ +The [[/plugins/toc]] plugin is very useful but it creates anchors with names such as #index1h3 + +In #ikiwiki today, another user and I were in agreement that an option for human readable anchors would be preferable. + +> +1 - i would love to see that happen too. Here's a patch I wrote a while back for similar functionality in moinmoin: https://svn.koumbit.net/koumbit/trunk/patches/moinmoin/nice_headings.patch -- [[anarcat]] + +[[!tag wishlist]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/translation_links.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/translation_links.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/translation_links.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/translation_links.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,46 @@ +This is an offshoot of [[this rant|translation/discussion/#index3h1]]. + +Basically, while I can appreciate the [[plugins/po]] plugin for more or less "static" site, or more organised wikis, for certain wikis, it's way too overhead. + +## Stories + +The following stories should be answered by that plugin: + + 1. a user browses the wiki, finds that the page is translated in another language and clicks on the language to see that page translated + 2. a user browses the wiki and gets automatically the right language + 3. an editor creates a wiki page, and it gets assigned a language + 4. a translator sees that page and translates it to another language, and that page is linked with the first one, both ways (in that stories 1 and 2 can work) + 5. (optional) a translator can see the list of pages needing translation and translate pages + 6. (optional) an editor changes a wiki page, the translated page is marked as "dirty" (ie. needing translation) + +## Fundamental constraints + +This issue is about creating a "wikipedia-like" translation structure where: + + 1. there's no "master language" + 2. there's a loose connexion between pages + 3. not all pages are necessarily translated, nor is it a goal + +Those are fundamental constraints that should be required by that plugin. It doesn't mean that the plugin cannot be used otherwise, but that's all it needs to respect to fulfill the requirements here. + +## Optional constraints + +There can be more constraints that we may want to impose or not, which will make things more or less complicated: + + 4. the page URLs need to be translatable - it would make [[!wikipedia Content_negotiation]] fail, so it would require the CGI for story 2. it would also make it harder to create the connexion between pages, as metadata would be needed in each page + 5. the language must not be visible in the URL - same as #4 + 6. translation system must also be usable from the commandline/git repository - #5 and #6 would be basically impossible to implement there + +## Basic spec + + 1. a hook that looks for foo.la.mdwn pages, where la is a language code (defined where..?), and that lists available translations - + this is where most of the work needs to happen. we can probably reuse the builtin template stuff that got injected with the [[plugins/po]] plugin was imported, to start with + 2. instructions on how to setup [[!wikipedia Content_negotiation]] so that the above works out of the box - just documentation + 3. a button to create such translations - that would be through the [[pageactions hook|plugins/write/#index15h3]] + 4. a default language setting? - that's obviously the getsetup hook + 5. a set of language code settings? - same + 6. content-negotiation - the po module has good code for that + +## Authors + + * [[anarcat]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/vCard_rendering.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/vCard_rendering.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/vCard_rendering.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/vCard_rendering.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,100 @@ +Addressbooks are commonly kept on a CardDAV server, where the individual +contacts are represented as single vCard (`.vcf`) files. Supporting those files +as a source format could facilitate integration between ikiwiki and address +books, and allow linking wiki entries to people. With the plugin presented here +and the [[calypso|http://keithp.com/blogs/calypso/]] server, that is easily +possible. + +The idea was first presented on [[DebConf13|forum/debconf13 ikiwiki bof]] by +[[chrysn]]. + +Software involved +================= + +* CardDAV server + + ikiwiki generates its pages from the local file system. Using the + [[calypso|http://keithp.com/blogs/calypso/]] CardDAV/CalDAV server makes that + trivial, as it stores its contacts as plain files already (and under git + version control!). + + The files can be pulled into ikiwiki in the form of an underlay. + +* Rendering VCF files + + A python plugin called `vcf` has been published in chrysn's plugin repository + at `git://prometheus.amsuess.com/ikiwiki-plugins`. It supports contact images + (as `data:` URLs) as well as all the attributes Evolution generates, creates + external hyperlinks for those attributes that can be dereferenced (including + telephone numbers), and renders vCard categories into ikiwiki tags. + + Python was chosen as a programming language due to the availability of the + [[`vobject`|http://vobject.skyhouseconsulting.com/]] python module and the + author's personal preference. + +* Linking to contacts + + File names of vCard files are usually not usable + (`4FD53349-51280409-28AD50CB.vcf`). To make links like "`I've talked to + \[[John Doe]] about this`" possible, the [[todo/alias directive]] has to be + implemented in the same repository. (Work in progress.) + +Issues / Further development +============================ + +* The rendered output is currently a plain definition list, and could need some + theming and/or grouping. + + The current implementation does not use templating, and instead generates + HTML directly in Python (with the help of the + [[MarkupSafe|https://pypi.python.org/pypi/MarkupSafe]] module). Due to the + [[limitations of the foreign language API|plugins/write/external]], ikiwiki's + regular templating can't be used anyway. + +* Addresses are rendered by `python-vcard` builtin address renderer (plus a + hack to get unicode out of it), and are not always most beautiful; moreover, + this kind of rendering is not themable. + +* The `paramlist` words in the vcards are plain dumped out after the respective + fields. That's unsuitable for theming, and would need localization. + +* In general, the plugin is not internationalized. + +* All VCF pages currently receive a 'Contact' tag. That needs configurability + and/or localization. In the same vein, prefix configuration for the category + taggings would be useful too. + +* The alias plugin is not ready yet. + +* vCards can not be edited. To be precise: vCards can be edited, but they show + vCard sources which are not suitable for user editing. Moreover, the changes + would be committed into the wiki main from the underlay, and not travel back. + + Two approaches would make editing feasible, a relatively easy one and a + hard-but-wow-if-it-works one: + + * Use a dedicated vCard editing online tool like CardDavMate, which accepts + URLs for editing (unlike CardDavMate). Ideally we would even hijack the + edit button on vCard pages to take the user to a proper editor. + + * Have a simple edit mask for vCard objects. (It'd be ok if it was incomplete + with respect to fields, the vCard format is designed to make that + possible). That's related to the + [[structured data|forum/an alternative approach to structured data]] issue. + + In such a setup, the vCard list would not go to an underlay, but rather to + a git checkout in a subdirectory or a submodule, from which the change + could then be pushed back to Calypso. (AFAIK, different git roots are not + supported in ikiwiki yet.) + +* Would such a renderer be useful for vCalendar too? (vCard and vCalendar only + differ in what they can represent, not in how they do it.) + +Status +====== + +The setup is currently usable, but just barely so. Once the basic issues are +solved (aliases, parameters for tags, enhanced appearence), I will suggest this +plugin for inclusion in ikiwiki. + +-- [[chrysn]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/wikitrails.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/wikitrails.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/wikitrails.mdwn 2013-02-13 09:08:27.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/wikitrails.mdwn 2013-09-04 22:10:48.000000000 +0000 @@ -3,7 +3,7 @@ ### smcv's implementation -... is the out-of-tree [[plugins/contrib/trail]] plugin, see there for details. +... is the out-of-tree [[plugins/trail]] plugin, see there for details. > And will be the one landing in ikiwiki. So, I'm closing this bug report. [[done]] --[[Joey]] @@ -11,10 +11,12 @@ i'm working on a python xmlrpc plugin for ikiwiki to support wikitrails, both as a navigation feature (have "forward" and "back" links based on a sequence) and a modified inline that includes all pages in the trail with appropriate modifications (suitable for printing if necessary). -the current status is published on `git://github.com/github076986099/ikiwiki-plugins.git`; as of now, i don't have a public demo of it. +the current status is published on `git://prometheus.amsuess.com/ikiwiki-plugins`; as of now, i don't have a public demo of it. feedback on both the concept and the code is very much appreciated by [[discussion]] or [email](mailto:chrysn@fsfe.org). +> update as of 2013: this implementation is kept in said ikiwiki-plugins directory for historical reference only; with the implementation nowadays available in ikiwiki, my implementation is obsolete. --[[chrysn]] + #### usage two preprocessor commands are provided: diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/xapian_omega_same_lang_when_indexing_and_searching.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/xapian_omega_same_lang_when_indexing_and_searching.mdwn --- ikiwiki-3.20130212ubuntu1/doc/todo/xapian_omega_same_lang_when_indexing_and_searching.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/todo/xapian_omega_same_lang_when_indexing_and_searching.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,72 @@ +Hi, by default xapian/omega use locate param from blog.setup to set stemmer language when wiki is indexing. + +But, when you search, we use omega cgi, and we not set language, so if you indexing in french, but search in english, you have a bad result. + +I propose to set a new param omega_stemmer in blog.setup, to fix the same language when we indexing, and searching. And if omega_stemmer is not set, we use LANG env param. + +Bellow, you can find the patch. + + + + diff --git a/IkiWiki/Plugin/search.pm b/IkiWiki/Plugin/search.pm + index 42d2e0d..08a0a01 100644 + --- a/IkiWiki/Plugin/search.pm + +++ b/IkiWiki/Plugin/search.pm + @@ -33,6 +33,13 @@ sub getsetup () { + safe => 0, # external program + rebuild => 0, + }, + + omega_stemmer => { + + type => "string", + + example => "en", + + description => "language used for indexing and searching", + + safe => 0, # external program + + rebuild => 0, + + }, + } + + sub checkconfig () { + @@ -136,7 +143,7 @@ sub indexhtml (@) { + # Index document and add terms for other metadata. + my $tg = Search::Xapian::TermGenerator->new(); + if (! $stemmer) { + - my $langcode=$ENV{LANG} || "en"; + + my $langcode=$config{omega_stemmer} || $ENV{LANG} || "en"; + $langcode=~s/_.*//; + + # This whitelist is here to work around a xapian bug (#486138) + @@ -183,6 +190,18 @@ sub cgi ($) { + IkiWiki::loadindex(); + $ENV{HELPLINK}=htmllink("", "", "ikiwiki/searching", + noimageinline => 1, linktext => "Help"); + + my $langcode=$config{omega_stemmer} || $ENV{LANG} || "en"; + + $langcode=~s/_.*//; + + + + # This whitelist is here to work around a xapian bug (#486138) + + my @whitelist=qw{da de en es fi fr hu it no pt ru ro sv tr}; + + + + if (grep { $_ eq $langcode } @whitelist) { + + $ENV{STEMMER}=$langcode; + + } + + else { + + $ENV{STEMMER}="en"; + + } + exec($config{omega_cgi}) || error("$config{omega_cgi} failed: $!"); + } + } + diff --git a/templates/searchquery.tmpl b/templates/searchquery.tmpl + index 15bc78e..4742460 100644 + --- a/templates/searchquery.tmpl + +++ b/templates/searchquery.tmpl + @@ -1,6 +1,6 @@ + $setmap{prefix,title,S} + $setmap{prefix,link,XLINK} + -$set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} + +$set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France}$set{stemmer,$env{STEMMER}} + ${ + $def{PREV, + $if{$ne{$topdoc,0}, I have a hopefully clearer spec for a plugin called [[todo/translation_links]]. -- [[anarcat]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/Ramsey.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/Ramsey.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/Ramsey.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/Ramsey.mdwn 2013-07-11 02:04:36.000000000 +0000 @@ -0,0 +1,3 @@ +Hi everyone, I'm Ramsey. I am a web developer/aerospace engineer in order of preference. + +I am using ikiwiki to create a [[blog|http://blog.coderfly.com]] and [[wiki|http://wiki.coderfly.com]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/acodispo.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/acodispo.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/acodispo.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/acodispo.mdwn 2013-07-17 07:48:26.000000000 +0000 @@ -0,0 +1,2 @@ +# ACodispo + diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/chrysn/interests.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/chrysn/interests.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/chrysn/interests.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/chrysn/interests.mdwn 2013-08-22 09:51:54.000000000 +0000 @@ -0,0 +1,32 @@ +these are the topics [[chrysn]] is or was interested in inside ikiwiki: + +* [[bugs/linkmap displays underscore escapes]] +* [[bugs/methodResponse in add__95__plugins]] +* [[bugs/preprocessing loop control too tight]] +* [[bugs/proxy.py utf8 troubles]] +* [[bugs/Underscores in links don't appear]] +* [[bugs/unicode encoded urls and recentchanges]] +* [[bugs/wrong link in recentchanges when reverting an ikiwiki outside git root]] +* [[forum/debconf13 ikiwiki bof]] +* [[forum/link to an image inside the wiki without inlining it]] +* [[forum/managing todo lists]] +* [[ikiwiki/directive/map/discussion]] +* [[plugins/write/names]] +* [[todo/ad-hoc plugins]] +* [[todo/alias directive]] +* [[todo/auto-create tag pages according to a template]] +* [[todo/Better bug tracking support]] +* [[todo/calendar with "create" links]] +* [[todo/credentials page]] +* [[todo/flexible relationships between pages]] +* [[todo/inline postform autotitles]] +* [[todo/internal definition list support]] +* [[todo/mirrorlist with per-mirror usedirs settings]] +* [[todo/more customisable titlepage function]] +* [[todo/natural sorting]] +* [[todo/sort parameter for map plugin and directive]] +* [[todo/tracking bugs with dependencies]] +* [[todo/unaccent url instead of encoding]] +* [[todo/Using page titles in internal links]] +* [[todo/vCard rendering]] +* [[todo/wikitrails]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/chrysn.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/chrysn.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/chrysn.mdwn 2013-02-13 09:08:45.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/chrysn.mdwn 2013-09-04 22:11:07.000000000 +0000 @@ -2,3 +2,11 @@ * **website**: * **uses ikiwiki for**: a bunch of internal documentation / organization projects * **likes ikiwiki because**: it is a distributed organization tool that pretends to be a web app for the non-programmers out there + +chrysn is [[interested|interests]] in these pages: + +[[!map pages="backlink(users/chrysn/interests) and !link(todo/done) and !link(bugs/done) and !."]] + +chrysn was interested in these pages before they were done: + +[[!map pages="backlink(users/chrysn/interests) and (link(todo/done) or link(bugsdone))"]] diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/ivan_shmakov.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/ivan_shmakov.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/ivan_shmakov.mdwn 2013-02-13 09:08:45.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/ivan_shmakov.mdwn 2013-09-04 22:11:07.000000000 +0000 @@ -1,26 +1,39 @@ … To put it short: an Ikiwiki newbie. +[Altai State University]: http://www.asu.ru/ [Emacs]: http://www.gnu.org/software/emacs/ [Lynx]: http://lynx.isc.org/ +[Software Freedom Day]: http://sf-day.org/ ## Wikis Currently, I run a few Ikiwiki instances. Namely: -* - — to hold random stuff written by me, my colleagues, - students, etc. +* + — [Software Freedom Day][] + event at [Altai State University][]. + +* + — introductory materials + on XML, Markdown, Ikiwiki, etc. + in Russian. + +* + — bits & pieces related to the course on computer + networks I've read in 2011. -* - — for some of the materials related to the +* http://rsdesne.am-1.org/rsdesne-2010/ + **(down since December, 2012)** + — used to hold some of the materials related to the “Remote Sensing in Education, Science and National Economy” (2010-03-29 … 2010-04-10, Altai State - University) program I've recently participated in as + University) program I've participated in as an instructor. -* - — for bits & pieces related to the course on computer - networks I've read in 2011. +* http://lhc.am-1.org/lhc/ + **(down since December, 2012)** + — used to hold random stuff written by me, my colleagues, + students, etc. ## Preferences diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/schmonz.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/schmonz.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/schmonz.mdwn 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/schmonz.mdwn 2013-09-04 22:11:08.000000000 +0000 @@ -1,10 +1,32 @@ -[Amitai Schlair](http://www.schmonz.com/) finds himself using ikiwiki -for all sorts of things. His attempts at contributing: +[Amitai Schlair](http://www.schmonz.com/) has contributed code to ikiwiki... [[!map -pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)" +pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs or todo/fancypodcast)" ]] -He's also written a plugin for [WIND -authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which -may or may not be of general utility. +...and uses ikiwiki for all sorts of things: + +## Public + +* [A major open-source project's wiki](http://wiki.netbsd.org) (with + the [[rcs/cvs]] plugin) +* [An undergraduate group's university-provided-static-hosted + site](http://www.columbia.edu/cu/philo/) (with [[plugins/rsync]] and a [WIND + authentication](http://www.columbia.edu/acis/rad/authmethods/wind/) plugin) +* [A small personal site](http://www.anglofish.net/) (happily hosted at + [Branchable](http://www.branchable.com/)) + +## Non-public + +* At work, team documentation and project planning: product and sprint + backlogs, burndown charts, release plans/procedures/announcements, + aggregating feeds of shared interest, etc. +* On my laptop, personal to-do and scratch space +* [A small personal site](http://podcast.schmonz.com/) (happily hosted at + [Branchable](http://www.branchable.com/)) + +## Non-yet-ikiwiki + +* [My personal web site](http://www.schmonz.com/) (to be happily + hosted at Branchable when it's running a post-[[todo/fancypodcast]] + release) diff -Nru ikiwiki-3.20130212ubuntu1/doc/users/svend.mdwn ikiwiki-3.20130904.1ubuntu1/doc/users/svend.mdwn --- ikiwiki-3.20130212ubuntu1/doc/users/svend.mdwn 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/users/svend.mdwn 2013-09-04 22:11:08.000000000 +0000 @@ -1,4 +1,4 @@ [[!meta title="Svend Sorensen"]] -* [website](http://ciffer.net/~svend/) -* [blog](http://ciffer.net/~svend/blog/) +* [website](http://svend.ciffer.net) +* [blog](http://svend.ciffer.net/blog) diff -Nru ikiwiki-3.20130212ubuntu1/doc/wishlist/watched_pages.mdwn ikiwiki-3.20130904.1ubuntu1/doc/wishlist/watched_pages.mdwn --- ikiwiki-3.20130212ubuntu1/doc/wishlist/watched_pages.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/doc/wishlist/watched_pages.mdwn 2013-07-11 02:04:36.000000000 +0000 @@ -0,0 +1 @@ +Is there a way to mark pages I edit as "watched"? A way of doing this through git would be acceptable too. Right now I link to my homepage on every page I comment on, but this doesn't tell me if the pages were updated... --[[anarcat]] diff -Nru ikiwiki-3.20130212ubuntu1/ikiwiki.spec ikiwiki-3.20130904.1ubuntu1/ikiwiki.spec --- ikiwiki-3.20130212ubuntu1/ikiwiki.spec 2013-02-13 09:08:24.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/ikiwiki.spec 2013-09-04 22:10:45.000000000 +0000 @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20130212 +Version: 3.20130904.1 Release: 1%{?dist} Summary: A wiki compiler diff -Nru ikiwiki-3.20130212ubuntu1/plugins/.gitignore ikiwiki-3.20130904.1ubuntu1/plugins/.gitignore --- ikiwiki-3.20130212ubuntu1/plugins/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/plugins/.gitignore 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +proxy.pyc diff -Nru ikiwiki-3.20130212ubuntu1/plugins/proxy.py ikiwiki-3.20130904.1ubuntu1/plugins/proxy.py --- ikiwiki-3.20130212ubuntu1/plugins/proxy.py 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/plugins/proxy.py 2013-09-04 22:11:09.000000000 +0000 @@ -175,7 +175,7 @@ data = _xmlrpc_client.loads(xml)[0][0] self._debug_fn( 'parsed data from response to procedure {0}: [{1}]'.format( - cmd, data)) + cmd, repr(data))) return data def handle_rpc(self, in_fd, out_fd): diff -Nru ikiwiki-3.20130212ubuntu1/po/.gitignore ikiwiki-3.20130904.1ubuntu1/po/.gitignore --- ikiwiki-3.20130212ubuntu1/po/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/.gitignore 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +*.mo diff -Nru ikiwiki-3.20130212ubuntu1/po/bg.po ikiwiki-3.20130904.1ubuntu1/po/bg.po --- ikiwiki-3.20130212ubuntu1/po/bg.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/bg.po 2013-09-04 22:11:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -52,85 +52,85 @@ msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Грешка" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "липсващ параметър „id” на шаблона" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "нов източник" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "съобщения" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "ново" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "премахване на „%s” (на %s дни)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "премахване на „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "проверка на източника „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "не е намерен източник на адрес „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 #, fuzzy msgid "feed not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "данните от източника предизвикаха грешка в модула XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "създаване на нова страницa „%s”" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "грешка при обработване на шаблона" @@ -193,7 +193,7 @@ msgid "creating index page %s" msgstr "създаване на нова страницa „%s”" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -208,87 +208,87 @@ msgid "There are no broken links!" msgstr "Няма „счупени” връзки!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, fuzzy, perl-format msgid "commenting on %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -298,7 +298,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -387,26 +387,26 @@ msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "крешка при компилиране на файла %s" @@ -510,7 +510,7 @@ msgid "failed to process template %s" msgstr "грешка при обработване на шаблона" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "модулът „RPC::XML::Client” не е намерен; източникът не е проверен" @@ -541,27 +541,32 @@ "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/" "markdown” (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 #, fuzzy -msgid "stylesheet not found" +msgid "enclosure not found" msgstr "шаблонът „%s” не е намерен" #: ../IkiWiki/Plugin/meta.pm:187 #, fuzzy +msgid "stylesheet not found" +msgstr "шаблонът „%s” не е намерен" + +#: ../IkiWiki/Plugin/meta.pm:199 +#, fuzzy msgid "script not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 #, fuzzy msgid "redir page not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 #, fuzzy msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -585,11 +590,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1203,12 +1208,12 @@ msgid "building %s, to update its backlinks" msgstr "обновяване на „%s” и осъвременяване на обратните връзки" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, fuzzy, perl-format msgid "building %s" msgstr "промяна на %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: неуспех при обновяване на страницата „%s”" @@ -1309,56 +1314,56 @@ msgid "Discussion" msgstr "Дискусия" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, fuzzy, perl-format msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/cs.po ikiwiki-3.20130904.1ubuntu1/po/cs.po --- ikiwiki-3.20130212ubuntu1/po/cs.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/cs.po 2013-09-04 22:11:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -52,84 +52,84 @@ msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Chyba" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "Agregace spuštěna přes web." -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Není třeba nic dělat, všechny kanály jsou aktuální!" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "chybí parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "nový kanál" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "příspěvky" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "nový" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "expiruji %s (stará %s dnů)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "expiruji %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "poslední kontrola %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "kontroluji kanál %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "nemohu najít kanál na %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "kanál nebyl nalezen" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(neplatné UTF-8 bylo z kanálu odstraněno)" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(entity byly v kanálu zakódovány)" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "kanál shodil XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "vytvářím novou stránku %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "nepodařilo se zpracovat:" @@ -190,7 +190,7 @@ msgid "creating index page %s" msgstr "vytvářím novou stránku %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -207,89 +207,89 @@ msgid "There are no broken links!" msgstr "Žádné porušené odkazy!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "komentář k %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 #, fuzzy msgid "moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "komentář musí mít obsah" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 #, fuzzy msgid "Comment Moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "chybný název stránky" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "komentář k %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "stránka „%s“ neexistuje, takže nemůžete komentovat" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "komentáře na stránce „%s“ jsou uzamčeny" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "komentář uložen pro schválení" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "Váš komentář bude zobrazen po schválení moderátorem" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "Přidán komentář" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "Přidán komentář: %s" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "nejste přihlášeni jako správce" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "Schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "schvalování komentářů" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -299,7 +299,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 #, fuzzy msgid "Comment" msgstr "Komentáře" @@ -386,27 +386,27 @@ msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "nelze zkompilovat %s" @@ -503,7 +503,7 @@ msgid "failed to process template %s" msgstr "nepodařilo se zpracovat:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nebyl nalezen, nepinkám" @@ -531,24 +531,29 @@ msgstr "" "selhalo nahrání perlového modulu Markdown.pm (%s) nebo /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "kanál nebyl nalezen" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "styl nebyl nalezen" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "%s nenalezen" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -574,11 +579,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 #, fuzzy msgid "comment notification:" msgstr "schvalování komentářů" @@ -1194,12 +1199,12 @@ msgid "building %s, to update its backlinks" msgstr "sestavuji %s, aby se aktualizovaly zpětné odkazy" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "sestavuji %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: nelze sestavit %s" @@ -1301,54 +1306,54 @@ msgid "Discussion" msgstr "Diskuse" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "nepodporovaný formát stránky %s" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "chybné jméno souboru %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "šablona %s nebyla nalezena" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/da.po ikiwiki-3.20130904.1ubuntu1/po/da.po --- ikiwiki-3.20130212ubuntu1/po/da.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/da.po 2013-09-04 22:11:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.20110430\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2011-05-05 13:30+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -56,84 +56,84 @@ msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Fejl" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "Indsamling udløst via web." -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Intet at gøre lige nu, alle fødninger er tidssvarende!" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "mangler parametren %s" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "ny fødning" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "indlæg" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "nyt" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "udløber %s (%s dage gammel)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "udløber %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "senest undersøgt %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "undersøger fødning %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "kunne ikke finde fødning ved %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "fødning ikke fundet" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(defekt UTF-8 fjernet fra fødning)" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(fødningselementer omgået (escaped))" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "fødning fik XML::Feed til at bryde sammen!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "opretter ny side %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr "behandling af skabelon mislykkedes:" @@ -193,7 +193,7 @@ msgid "creating index page %s" msgstr "opretter indeks-side %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -210,87 +210,87 @@ msgid "There are no broken links!" msgstr "Ingen henvisninger der ikker fungerer!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, perl-format msgid "this comment needs %s" msgstr "denne kommentar kræver %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "moderering" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "kommentar skal have indhold" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "dårligt sidenavn" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "kommenterer på %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "siden '%s' eksisterer ikke, så du kan ikke kommentere" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "kommentarer på side '%s' er lukket" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "kommentar gemt for moderering" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "Din kommentar vil blive tilføjet efter moderatorgenemsyn" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "Tilføjede en kommentar" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "Tilføjede en kommentar: %s" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "du er ikke logget på som en administrator" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "Kommentarmoderering" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "kommentarkoderering" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -300,7 +300,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "Kommentér" @@ -386,26 +386,26 @@ msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "Du har ikke lov til at tilbageføre en sammenlægning" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, perl-format msgid "Failed to revert commit %s" msgstr "tilbageføring af indlæg %s mislykkedes" @@ -504,7 +504,7 @@ msgid "failed to process template %s" msgstr "behandling af skabelon %s mislykkedes" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client ikke fundet, pinger ikke" @@ -534,23 +534,28 @@ "Indlæsning af perl-modulet Markdown.pm (%s) eller /usr/bin/markdown (%s) " "mislykkedes" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "fødning ikke fundet" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "stilsnit (stylesheet) ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 msgid "script not found" msgstr "skript ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "henvisningsside ikke fundet" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -574,11 +579,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 #, fuzzy msgid "comment notification:" msgstr "kommentarkoderering" @@ -1196,12 +1201,12 @@ msgid "building %s, to update its backlinks" msgstr "danner %s, for at opdatere dens krydshenvisninger (backlinks)" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "danner %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan ikke danne %s" @@ -1302,55 +1307,55 @@ msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "Ikke-understøttet sideformat %s" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/de.po ikiwiki-3.20130904.1ubuntu1/po/de.po --- ikiwiki-3.20130212ubuntu1/po/de.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/de.po 2013-09-04 22:11:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -53,84 +53,84 @@ msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Fehler" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "Das Web löst die Zusammenstellung aus" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Es gibt nichts zu tun, alle Vorlagen (feeds) sind aktuell!" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "Parameter %s fehlt" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "neue Vorlage (feed)" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "Beiträge" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "neu" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s läuft aus (%s Tage alt)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "%s läuft aus" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "zuletzt geprüft %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "überprüfe Vorlage (feed) %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "konnte Vorlage (feed) unter %s nicht finden" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(ungültiges UTF-8 wurde aus der Vorlage (feed) entfernt)" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(Einträge in der Vorlage (feed) wurden maskiert)" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "Vorlage (feed) führte zum Absturz von XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "erstelle neue Seite %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "Fehler beim Ablauf:" @@ -192,7 +192,7 @@ msgid "creating index page %s" msgstr "erstelle neue Seite %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -209,90 +209,90 @@ msgid "There are no broken links!" msgstr "Es gibt keine ungültigen Verweise!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "kommentiere %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 #, fuzzy msgid "moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "ein Kommentar sollte Inhalt haben" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "Anonym" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 #, fuzzy msgid "Comment Moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "fehlerhafter Seitenname" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "kommentiere %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" "Seite %s existiert nicht, Sie können sie deshalb auch nicht kommentieren" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "Kommentare zur Seite %s sind gesperrt" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "Der Kommentar wurde zur Moderation gespeichert" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "Ihr Kommentar wird nach Moderation verschickt" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "Kommentar hinzugefügt" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "Kommentar hinzugefügt: %s" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "Sie sind nicht als Administrator angemeldet" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "Kommentar-Moderation" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -302,7 +302,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "Kommentieren" @@ -388,27 +388,27 @@ msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "erzeugen von %s fehlgeschlagen" @@ -509,7 +509,7 @@ msgid "failed to process template %s" msgstr "Fehler beim Ablauf:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client nicht gefunden, führe Ping nicht aus" @@ -540,24 +540,29 @@ "laden des Perlmoduls Markdown.pm (%s) oder /usr/bin/markdown (%s) " "fehlgeschlagen" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "Vorlage (feed) nicht gefunden" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "Stylesheet nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "Vorlage (feed) nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "Umleitungsseite nicht gefunden" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -582,11 +587,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 #, fuzzy msgid "comment notification:" msgstr "Kommentar-Moderation" @@ -1211,12 +1216,12 @@ msgid "building %s, to update its backlinks" msgstr "erzeuge %s, um dessen Rückverweise zu aktualisieren" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "erzeuge %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kann %s nicht erzeugen" @@ -1321,57 +1326,57 @@ msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "nicht unterstütztes Seitenformat %s" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "Vorlage %s nicht gefunden" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/es.po ikiwiki-3.20130904.1ubuntu1/po/es.po --- ikiwiki-3.20130212ubuntu1/po/es.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/es.po 2013-09-04 22:11:14.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -57,85 +57,85 @@ msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Error" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "Contenido añadido activado vía web." -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "falta el parámetro %s" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "nueva entrada" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "entradas" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "nuevo" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s caducada (%s días de antigüedad)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "%s caducada" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "última comprobación el %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "comprobando fuente de datos %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "no puedo encontrar la fuente de datos en %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, 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:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(los caracteres especiales de la fuente de datos están exceptuados)" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "¡ la fuente de datos ha provocado un error fatal en XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "creando nueva página %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" @@ -199,7 +199,7 @@ msgid "creating index page %s" msgstr "creando nueva página %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -216,89 +216,89 @@ msgid "There are no broken links!" msgstr "¡ No hay enlaces rotos !" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "creando comentarios en la página %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 #, fuzzy msgid "moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "Un comentario debe tener algún contenido" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "Anónimo" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 #, fuzzy msgid "Comment Moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "nombre de página erróneo" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "creando comentarios en la página %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "la página '%s' no existe, así que no se puede comentar sobre ella" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "los comentarios para la página '%s' están cerrados" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "comentario guardado a la espera de aprobación" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "Su comentario será publicado después de que el moderador lo revise" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "Añadir un comentario" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "Comentario añadido: %s" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "No está registrado como un administrador" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "Aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "aprobación de comentarios" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -308,7 +308,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 #, fuzzy msgid "Comment" msgstr "Comentarios" @@ -396,27 +396,27 @@ msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "ha fallado la compilación del programa %s" @@ -518,7 +518,7 @@ msgid "failed to process template %s" msgstr "se ha producido un error fatal mientras procesaba la plantilla:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna" @@ -548,24 +548,29 @@ "no he podido cargar el módulo Perl Markdown.pm (%s) ó no he podido ejecutar " "el programa /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "fuente de datos no encontrada" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "hoja de estilo no encontrada " -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "fuente de datos no encontrada" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "falta la página a donde redirigir" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -591,11 +596,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 #, fuzzy msgid "comment notification:" msgstr "aprobación de comentarios" @@ -1217,12 +1222,12 @@ "convirtiendo la página %s para actualizar la lista de páginas que hacen " "referencia a ella." -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, fuzzy, perl-format msgid "building %s" msgstr "Informaremos a %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: no puedo convertir la página %s" @@ -1326,58 +1331,58 @@ msgid "Discussion" msgstr "Comentarios" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "formato de página %s no soportado" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "no he encontrado la plantilla %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/fr.po ikiwiki-3.20130904.1ubuntu1/po/fr.po --- ikiwiki-3.20130212ubuntu1/po/fr.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/fr.po 2013-09-04 22:11:14.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -54,84 +54,84 @@ msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Erreur" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "Agrégation déclenchée par le web" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Rien à faire pour le moment, tous les flux sont à jour !" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "Paramètre %s manquant" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "Nouveau flux" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "Articles" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr "Échec du traitementdu modèle :" @@ -191,7 +191,7 @@ msgid "creating index page %s" msgstr "Création de la nouvelle page %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -208,87 +208,87 @@ msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, perl-format msgid "this comment needs %s" msgstr "Ce commentaire demande %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "Modération" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, 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:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "Le commentaire a été enregistré, en attente de « modération »" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 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:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "Vous n'êtes pas authentifié comme administrateur" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "Modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "modération du commentaire" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -298,7 +298,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "poster un commentaire" @@ -384,27 +384,27 @@ msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "Échec de la compilation de %s" @@ -505,7 +505,7 @@ msgid "failed to process template %s" msgstr "Échec du traitementdu modèle :" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client introuvable, pas de réponse au ping" @@ -534,24 +534,29 @@ "Échec du chargement du module Perl Markdown.pm (%s) ou de /usr/bin/markdown " "(%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "Flux introuvable " + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "Feuille de style introuvable " -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "%s introuvable" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "Page de redirection introuvable" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "sort=meta demande un paramètre." @@ -575,11 +580,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 #, fuzzy msgid "comment notification:" msgstr "modération du commentaire" @@ -1207,12 +1212,12 @@ msgid "building %s, to update its backlinks" msgstr "Reconstruction de %s, afin de mettre à jour ses rétroliens" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "construction de %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki : impossible de reconstruire %s" @@ -1318,55 +1323,55 @@ msgid "Discussion" msgstr "Discussion" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, 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:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "Modèle de page %s introuvable" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages : %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/gu.po ikiwiki-3.20130904.1ubuntu1/po/gu.po --- ikiwiki-3.20130212ubuntu1/po/gu.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/gu.po 2013-09-04 22:11:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -51,84 +51,84 @@ msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "ક્ષતિ" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "ખોવાયેલ %s વિકલ્પ" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "નવું ફીડ" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "પોસ્ટ" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "નવું" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "જુનું કરે છે %s (%s દિવસો જુનું)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "જુનું કરે છે %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "ફીડ %s ચકાસે છે ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "%s પર ફીડ મળી શક્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, fuzzy, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "ફીડમાંથી અયોગ્ય રીતે UTF-8 નીકાળેલ છે" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "ફીડ ભાંગી ગયું XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "નવું પાનું %s બનાવે છે" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" @@ -192,7 +192,7 @@ msgid "creating index page %s" msgstr "નવું પાનું %s બનાવે છે" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -207,87 +207,87 @@ msgid "There are no broken links!" msgstr "અહીં કોઇ તૂટેલ કડી નથી!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, fuzzy, perl-format msgid "commenting on %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -297,7 +297,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -386,26 +386,26 @@ msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" @@ -506,7 +506,7 @@ msgid "failed to process template %s" msgstr "ક્રિયા કરવામાં નિષ્ફળ:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client મળ્યું નહી, પિંગ કરવામાં આવતું નથી" @@ -533,26 +533,31 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "Markdown.pm પર્લ મોડ્યુલ (%s) અથવા /usr/bin/markdown (%s) લાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "ફીડ મળ્યું નહી" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "સ્ટાઇલશીટ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 #, fuzzy msgid "redir page not found" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 #, fuzzy msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -576,11 +581,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1191,12 +1196,12 @@ msgid "building %s, to update its backlinks" msgstr "રેન્ડર કરે છે %s, તેનાં પાછળનાં જોડાણો સુધારવા માટે" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, fuzzy, perl-format msgid "building %s" msgstr "%s સુધારે છે" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: %s રેન્ડર કરી શકાતું નથી" @@ -1297,54 +1302,54 @@ msgid "Discussion" msgstr "ચર્ચા" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, fuzzy, perl-format msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/ikiwiki.pot ikiwiki-3.20130904.1ubuntu1/po/ikiwiki.pot --- ikiwiki-3.20130212ubuntu1/po/ikiwiki.pot 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/ikiwiki.pot 2013-09-04 22:11:09.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,84 +52,84 @@ msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr "" @@ -188,7 +188,7 @@ msgid "creating index page %s" msgstr "" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -203,87 +203,87 @@ msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, perl-format msgid "this comment needs %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -293,7 +293,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -378,26 +378,26 @@ msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, perl-format msgid "Failed to revert commit %s" msgstr "" @@ -494,7 +494,7 @@ msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -521,23 +521,27 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:175 -msgid "stylesheet not found" +#: ../IkiWiki/Plugin/meta.pm:127 +msgid "enclosure not found" msgstr "" #: ../IkiWiki/Plugin/meta.pm:187 +msgid "stylesheet not found" +msgstr "" + +#: ../IkiWiki/Plugin/meta.pm:199 msgid "script not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -561,11 +565,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1164,12 +1168,12 @@ msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1270,54 +1274,54 @@ msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "" diff -Nru ikiwiki-3.20130212ubuntu1/po/it.po ikiwiki-3.20130904.1ubuntu1/po/it.po --- ikiwiki-3.20130212ubuntu1/po/it.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/it.po 2013-09-04 22:11:14.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -50,85 +50,85 @@ msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Errore" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "Aggregazione attivata dal web." -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" "Nessuna azione da intraprendere, tutti i notiziari sono già aggiornati." -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "parametro %s mancante" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "nuovo notiziario" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "articoli" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "nuovo" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "in scadenza %s (vecchio di %s giorni)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "in scadenza %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "ultimo controllo %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "controllo notiziario %s..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "impossibile trovare il notiziario %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(codifica UTF-8 non valida eliminata dal notiziario)" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(entità del notiziario espanse con escape)" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "il notiziario ha fatto andare in crash XML::Feed." -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "creazione nuova pagina %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "errore nell'elaborazione:" @@ -189,7 +189,7 @@ msgid "creating index page %s" msgstr "creazione nuova pagina %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -206,89 +206,89 @@ msgid "There are no broken links!" msgstr "Non ci sono collegamenti rotti." -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "commento su %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 #, fuzzy msgid "moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "i commenti devono avere un contenuto" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "Anonimo" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 #, fuzzy msgid "Comment Moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "nome pagina non valido" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "commento su %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "la pagina «%s» non esiste, impossibile commentarla" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "i commenti per la pagina «%s» sono chiusi" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "commento trattenuto per moderazione" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "Il commento sarà pubblicato dopo la verifica del moderatore" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "Aggiunto commento" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "Aggiunto commento: %s" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "non siete autenticati come amministratore" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "Moderazione commenti" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "moderazione commento" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, fuzzy, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -298,7 +298,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 #, fuzzy msgid "Comment" msgstr "Commenti" @@ -385,27 +385,27 @@ msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "errore nel compilare %s" @@ -505,7 +505,7 @@ msgid "failed to process template %s" msgstr "errore nell'elaborazione:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client non trovato, impossibile inviare ping" @@ -534,24 +534,29 @@ msgstr "" "impossibile caricare il modulo perl Markdown.pm (%s) o /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "notiziario non trovato" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "foglio di stile non trovato" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "notiziario non trovato" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "pagina di reindirizzamento non trovata" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -577,11 +582,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 #, fuzzy msgid "comment notification:" msgstr "moderazione commento" @@ -1205,12 +1210,12 @@ msgid "building %s, to update its backlinks" msgstr "compilazione di %s, per aggiornare i collegamenti ai precedenti" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "compilazione di %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: impossibile compilare %s" @@ -1313,54 +1318,54 @@ msgid "Discussion" msgstr "Discussione" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, fuzzy, perl-format msgid "unsupported umask setting %s" msgstr "formato pagina %s non supportato" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "nome file %s scorretto" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "modello %s non trovato" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/pl.po ikiwiki-3.20130904.1ubuntu1/po/pl.po --- ikiwiki-3.20130212ubuntu1/po/pl.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/pl.po 2013-09-04 22:11:14.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -54,85 +54,85 @@ msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Błąd" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "brakujący parametr %s" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "nowy kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "wpisy" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "nowy wpis" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "wygasający wpis %s (ma już %s dni)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "wygasający wpis %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "sprawdzanie kanału RSS %s..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "nie znaleziono kanału RSS pod adresem %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 #, fuzzy msgid "feed not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, 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:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "awaria kanału RSS w module XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "tworzenie nowej strony %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "awaria w trakcie przetwarzania:" @@ -196,7 +196,7 @@ msgid "creating index page %s" msgstr "tworzenie nowej strony %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -211,87 +211,87 @@ msgid "There are no broken links!" msgstr "Wszystkie odnośniki są aktualne!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, fuzzy, perl-format msgid "commenting on %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -301,7 +301,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -390,26 +390,26 @@ msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "awaria w trakcie kompilowania %s" @@ -513,7 +513,7 @@ msgid "failed to process template %s" msgstr "awaria w trakcie przetwarzania:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "Nieznaleziony moduł RPC::XML::Client, brak możliwości pingowania" @@ -545,27 +545,32 @@ "Awaria w trakcie ładowania perlowego modułu Markdown.pm (%s) lub " "uruchamiania programu /usr/bin/markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "nieznaleziony kanał RSS" + +#: ../IkiWiki/Plugin/meta.pm:187 #, fuzzy msgid "stylesheet not found" msgstr "nieznaleziony szablon ze stylami CSS" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "nie znaleziono %s" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 #, fuzzy msgid "redir page not found" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 #, fuzzy msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -589,11 +594,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1212,12 +1217,12 @@ msgid "building %s, to update its backlinks" msgstr "renderowanie %s w celu aktualizacji powrotnych odnośników" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, fuzzy, perl-format msgid "building %s" msgstr "edycja %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: awaria w trakcie tworzenia %s" @@ -1318,56 +1323,56 @@ msgid "Discussion" msgstr "Dyskusja" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, fuzzy, perl-format msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/sv.po ikiwiki-3.20130904.1ubuntu1/po/sv.po --- ikiwiki-3.20130212ubuntu1/po/sv.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/sv.po 2013-09-04 22:11:14.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -51,85 +51,85 @@ msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Fel" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mall saknar id-parameter" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "ny kanal" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "inlägg" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "ny" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "låter %s gå ut (%s dagar gammal)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "låter %s gå ut" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "kontrollerar kanalen %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "kunde inte hitta kanalen på %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 #, fuzzy msgid "feed not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "kanalen kraschade XML::Feed!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "skapar nya sidan %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "misslyckades med att behandla mall:" @@ -192,7 +192,7 @@ msgid "creating index page %s" msgstr "skapar nya sidan %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -207,87 +207,87 @@ msgid "There are no broken links!" msgstr "Det finns inga trasiga länkar!" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, fuzzy, perl-format msgid "commenting on %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -297,7 +297,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -386,26 +386,26 @@ msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "misslyckades med att kompilera %s" @@ -507,7 +507,7 @@ msgid "failed to process template %s" msgstr "misslyckades med att behandla mall:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "RPC::XML::Client hittades inte, pingar inte" @@ -537,27 +537,32 @@ "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/" "markdown (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 #, fuzzy -msgid "stylesheet not found" +msgid "enclosure not found" msgstr "mallen %s hittades inte" #: ../IkiWiki/Plugin/meta.pm:187 #, fuzzy +msgid "stylesheet not found" +msgstr "mallen %s hittades inte" + +#: ../IkiWiki/Plugin/meta.pm:199 +#, fuzzy msgid "script not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 #, fuzzy msgid "redir page not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 #, fuzzy msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -581,11 +586,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1198,12 +1203,12 @@ msgid "building %s, to update its backlinks" msgstr "ritar upp %s, för att uppdatera dess bakåtlänkar" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, fuzzy, perl-format msgid "building %s" msgstr "redigerar %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: kan inte rita upp %s" @@ -1304,54 +1309,54 @@ msgid "Discussion" msgstr "Diskussion" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "Måste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, fuzzy, perl-format msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff -Nru ikiwiki-3.20130212ubuntu1/po/tr.po ikiwiki-3.20130904.1ubuntu1/po/tr.po --- ikiwiki-3.20130212ubuntu1/po/tr.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/tr.po 2013-09-04 22:11:14.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -48,84 +48,84 @@ msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Hata" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, perl-format msgid "missing %s parameter" msgstr "%s parametresi eksik" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "yeni özet akışı" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "gönderi" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "yeni" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "%s için zaman aşımı (%s gün eski)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "%s için zaman aşımı" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "son güncelleme: %s" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "%s özet akışı denetleniyor ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "%s özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 msgid "feed not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(geçersiz UTF-8 dizgisi özet akışından çıkarıldı)" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "(özet akışı girdileri işlendi)" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "özet akışı XML::Feed'in çakılmasına yol açtı!" -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "%s için yeni sayfa oluşturuluyor" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 msgid "failed to process template:" msgstr "" @@ -184,7 +184,7 @@ msgid "creating index page %s" msgstr "%s için yeni sayfa oluşturuluyor" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -199,87 +199,87 @@ msgid "There are no broken links!" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, perl-format msgid "this comment needs %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, perl-format msgid "commenting on %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -289,7 +289,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -374,26 +374,26 @@ msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, perl-format msgid "Failed to revert commit %s" msgstr "" @@ -490,7 +490,7 @@ msgid "failed to process template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "" @@ -517,24 +517,29 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 +#, fuzzy +msgid "enclosure not found" +msgstr "özet akışı bulunamadı" + +#: ../IkiWiki/Plugin/meta.pm:187 msgid "stylesheet not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:187 +#: ../IkiWiki/Plugin/meta.pm:199 #, fuzzy msgid "script not found" msgstr "özet akışı bulunamadı" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 msgid "redir page not found" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -558,11 +563,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1162,12 +1167,12 @@ msgid "building %s, to update its backlinks" msgstr "" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, perl-format msgid "building %s" msgstr "" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, perl-format msgid "ikiwiki: cannot build %s" msgstr "" @@ -1268,54 +1273,54 @@ msgid "Discussion" msgstr "" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, perl-format msgid "cannot match pages: %s" msgstr "" diff -Nru ikiwiki-3.20130212ubuntu1/po/vi.po ikiwiki-3.20130904.1ubuntu1/po/vi.po --- ikiwiki-3.20130212ubuntu1/po/vi.po 2013-02-13 09:08:52.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/po/vi.po 2013-09-04 22:11:14.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-12 21:50-0400\n" +"POT-Creation-Date: 2013-09-04 10:16-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -52,85 +52,85 @@ msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1501 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1508 msgid "Error" msgstr "Lỗi" -#: ../IkiWiki/Plugin/aggregate.pm:95 +#: ../IkiWiki/Plugin/aggregate.pm:86 msgid "Aggregation triggered via web." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:104 +#: ../IkiWiki/Plugin/aggregate.pm:95 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:236 +#: ../IkiWiki/Plugin/aggregate.pm:227 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/aggregate.pm:271 +#: ../IkiWiki/Plugin/aggregate.pm:262 msgid "new feed" msgstr "nguồn tin mới" -#: ../IkiWiki/Plugin/aggregate.pm:285 +#: ../IkiWiki/Plugin/aggregate.pm:276 msgid "posts" msgstr "bài" -#: ../IkiWiki/Plugin/aggregate.pm:287 +#: ../IkiWiki/Plugin/aggregate.pm:278 msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:465 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:481 +#: ../IkiWiki/Plugin/aggregate.pm:472 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:509 +#: ../IkiWiki/Plugin/aggregate.pm:500 #, perl-format msgid "last checked %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:513 +#: ../IkiWiki/Plugin/aggregate.pm:504 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:518 +#: ../IkiWiki/Plugin/aggregate.pm:509 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:541 +#: ../IkiWiki/Plugin/aggregate.pm:529 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:552 +#: ../IkiWiki/Plugin/aggregate.pm:540 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:560 +#: ../IkiWiki/Plugin/aggregate.pm:548 #, perl-format msgid "(feed entities escaped)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:568 +#: ../IkiWiki/Plugin/aggregate.pm:556 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:660 +#: ../IkiWiki/Plugin/aggregate.pm:649 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" -#: ../IkiWiki/Plugin/aggregate.pm:688 ../IkiWiki/Plugin/edittemplate.pm:135 +#: ../IkiWiki/Plugin/aggregate.pm:677 ../IkiWiki/Plugin/edittemplate.pm:135 #, fuzzy msgid "failed to process template:" msgstr "mẫu không xử lý được:" @@ -193,7 +193,7 @@ msgid "creating index page %s" msgstr "đang tạo trang mới %s" -#: ../IkiWiki/Plugin/blogspam.pm:118 +#: ../IkiWiki/Plugin/blogspam.pm:119 msgid "" "Sorry, but that looks like spam to blogspam: " @@ -208,87 +208,87 @@ msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." -#: ../IkiWiki/Plugin/comments.pm:113 +#: ../IkiWiki/Plugin/comments.pm:124 #, fuzzy, perl-format msgid "this comment needs %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:116 +#: ../IkiWiki/Plugin/comments.pm:127 msgid "moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:137 ../IkiWiki/Plugin/format.pm:50 +#: ../IkiWiki/Plugin/comments.pm:154 ../IkiWiki/Plugin/format.pm:50 #, perl-format msgid "unsupported page format %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:142 +#: ../IkiWiki/Plugin/comments.pm:159 msgid "comment must have content" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:200 +#: ../IkiWiki/Plugin/comments.pm:217 msgid "Anonymous" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:262 +#: ../IkiWiki/Plugin/comments.pm:279 msgid "Comment Moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:358 ../IkiWiki/Plugin/comments.pm:362 +#: ../IkiWiki/Plugin/comments.pm:375 ../IkiWiki/Plugin/comments.pm:379 msgid "email replies to me" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:396 ../IkiWiki/Plugin/editpage.pm:96 +#: ../IkiWiki/Plugin/comments.pm:413 ../IkiWiki/Plugin/editpage.pm:96 #: ../IkiWiki/Plugin/editpage.pm:102 msgid "bad page name" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:399 +#: ../IkiWiki/Plugin/comments.pm:416 #, fuzzy, perl-format msgid "commenting on %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/comments.pm:416 +#: ../IkiWiki/Plugin/comments.pm:433 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:423 +#: ../IkiWiki/Plugin/comments.pm:440 #, perl-format msgid "comments on page '%s' are closed" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:548 +#: ../IkiWiki/Plugin/comments.pm:565 msgid "comment stored for moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:550 +#: ../IkiWiki/Plugin/comments.pm:567 msgid "Your comment will be posted after moderator review" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:563 +#: ../IkiWiki/Plugin/comments.pm:580 msgid "Added a comment" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:567 +#: ../IkiWiki/Plugin/comments.pm:584 #, perl-format msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:637 ../IkiWiki/Plugin/userlist.pm:55 +#: ../IkiWiki/Plugin/comments.pm:654 ../IkiWiki/Plugin/userlist.pm:55 #: ../IkiWiki/Plugin/websetup.pm:272 msgid "you are not logged in as an admin" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:691 +#: ../IkiWiki/Plugin/comments.pm:708 msgid "Comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:732 +#: ../IkiWiki/Plugin/comments.pm:749 msgid "comment moderation" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:893 +#: ../IkiWiki/Plugin/comments.pm:910 #, perl-format msgid "%i comment" msgid_plural "%i comments" @@ -297,7 +297,7 @@ #. translators: Here "Comment" is a verb; #. translators: the user clicks on it to #. translators: post a comment. -#: ../IkiWiki/Plugin/comments.pm:903 +#: ../IkiWiki/Plugin/comments.pm:920 msgid "Comment" msgstr "" @@ -386,26 +386,26 @@ msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:783 ../IkiWiki/Plugin/git.pm:846 -#: ../IkiWiki.pm:1721 +#: ../IkiWiki/Plugin/git.pm:789 ../IkiWiki/Plugin/git.pm:852 +#: ../IkiWiki.pm:1728 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:805 +#: ../IkiWiki/Plugin/git.pm:811 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:809 +#: ../IkiWiki/Plugin/git.pm:815 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:879 +#: ../IkiWiki/Plugin/git.pm:885 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:896 +#: ../IkiWiki/Plugin/git.pm:902 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "lỗi biên dịch %s" @@ -509,7 +509,7 @@ msgid "failed to process template %s" msgstr "mẫu không xử lý được:" -#: ../IkiWiki/Plugin/inline.pm:712 +#: ../IkiWiki/Plugin/inline.pm:725 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -537,27 +537,32 @@ msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgstr "lỗi nạp mô-đun perl Markdown.pm (%s) hay « /usr/bin/markdown » (%s)" -#: ../IkiWiki/Plugin/meta.pm:175 +#: ../IkiWiki/Plugin/meta.pm:127 #, fuzzy -msgid "stylesheet not found" +msgid "enclosure not found" msgstr "không tìm thấy mẫu %s" #: ../IkiWiki/Plugin/meta.pm:187 #, fuzzy +msgid "stylesheet not found" +msgstr "không tìm thấy mẫu %s" + +#: ../IkiWiki/Plugin/meta.pm:199 +#, fuzzy msgid "script not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:235 +#: ../IkiWiki/Plugin/meta.pm:247 #, fuzzy msgid "redir page not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:249 +#: ../IkiWiki/Plugin/meta.pm:261 #, fuzzy msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:434 +#: ../IkiWiki/Plugin/meta.pm:450 msgid "sort=meta requires a parameter" msgstr "" @@ -581,11 +586,11 @@ msgid "Cannot subscribe your email address without logging in." msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:135 +#: ../IkiWiki/Plugin/notifyemail.pm:136 msgid "change notification:" msgstr "" -#: ../IkiWiki/Plugin/notifyemail.pm:137 +#: ../IkiWiki/Plugin/notifyemail.pm:138 msgid "comment notification:" msgstr "" @@ -1198,12 +1203,12 @@ msgid "building %s, to update its backlinks" msgstr "đang vẽ %s để cập nhật các liên kết ngược của nó" -#: ../IkiWiki/Render.pm:798 +#: ../IkiWiki/Render.pm:806 #, fuzzy, perl-format msgid "building %s" msgstr "đang sửa %s" -#: ../IkiWiki/Render.pm:863 +#: ../IkiWiki/Render.pm:871 #, fuzzy, perl-format msgid "ikiwiki: cannot build %s" msgstr "ikiwiki: không thể vẽ %s" @@ -1304,55 +1309,55 @@ msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki.pm:573 +#: ../IkiWiki.pm:580 msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:621 +#: ../IkiWiki.pm:628 #, perl-format msgid "unsupported umask setting %s" msgstr "" -#: ../IkiWiki.pm:661 +#: ../IkiWiki.pm:668 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:691 +#: ../IkiWiki.pm:698 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1483 +#: ../IkiWiki.pm:1490 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1677 +#: ../IkiWiki.pm:1684 #, fuzzy, perl-format msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki.pm:1977 +#: ../IkiWiki.pm:1984 #, perl-format msgid "template %s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki.pm:2227 +#: ../IkiWiki.pm:2234 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2304 +#: ../IkiWiki.pm:2318 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2325 +#: ../IkiWiki.pm:2339 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2461 +#: ../IkiWiki.pm:2475 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" diff -Nru ikiwiki-3.20130212ubuntu1/t/map.t ikiwiki-3.20130904.1ubuntu1/t/map.t --- ikiwiki-3.20130212ubuntu1/t/map.t 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/map.t 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,242 @@ +#!/usr/bin/perl +package IkiWiki; + +use warnings; +use strict; +use Test::More; + +BEGIN { + unless (eval { require XML::Twig }) { + eval q{ + use Test::More skip_all => "XML::Twig is not available" + } + } +} + +BEGIN { use_ok("IkiWiki"); } +BEGIN { use_ok("IkiWiki::Render"); } +BEGIN { use_ok("IkiWiki::Plugin::map"); } +BEGIN { use_ok("IkiWiki::Plugin::mdwn"); } + +ok(! system("rm -rf t/tmp; mkdir t/tmp")); + +$config{verbose} = 1; +$config{srcdir} = 't/tmp'; +$config{underlaydir} = 't/tmp'; +$config{underlaydirbase} = '.'; +$config{templatedir} = 'templates'; +$config{usedirs} = 1; +$config{htmlext} = 'html'; +$config{wiki_file_chars} = "-[:alnum:]+/.:_"; +$config{userdir} = "users"; +$config{tagbase} = "tags"; +$config{default_pageext} = "mdwn"; +$config{wiki_file_prune_regexps} = [qr/^\./]; +$config{autoindex_commit} = 0; + +is(checkconfig(), 1); + +%oldrenderedfiles=%pagectime=(); +%pagesources=%pagemtime=%oldlinks=%links=%depends=%typedlinks=%oldtypedlinks= +%destsources=%renderedfiles=%pagecase=%pagestate=(); + +my @pages = qw( +alpha +alpha/1 +alpha/1/i +alpha/1/ii +alpha/1/iii +alpha/1/iv +alpha/2 +alpha/2/a +alpha/2/b +alpha/3 +beta +); + +foreach my $page (@pages) { + # we use a non-default extension for these, so they're distinguishable + # from programmatically-created pages + $pagesources{$page} = "$page.mdwn"; + $destsources{$page} = "$page.mdwn"; + $pagemtime{$page} = $pagectime{$page} = 1000000; + writefile("$page.mdwn", "t/tmp", "your ad here"); +} + +sub comment { + my $str = shift; + $str =~ s/^/# /gm; + print $str; +} + +sub node { + my $name = shift; + my $kids = shift; + my %stuff = @_; + + return { %stuff, name => $name, kids => $kids }; +} + +sub check_nodes { + my $ul = shift; + my $expected = shift; + + is($ul->tag, 'ul'); + + # expected is a list of hashes + # ul is a list of li + foreach my $li ($ul->children) { + my @kids = $li->children; + + is($li->tag, 'li'); + + my $expectation = shift @$expected; + + is($kids[0]->tag, 'a'); + my $a = $kids[0]; + + if ($expectation->{parent}) { + is($a->att('class'), 'mapparent'); + } + else { + is($a->att('class'), 'mapitem'); + } + + is_deeply([$a->text], [$expectation->{name}]); + + if (@{$expectation->{kids}}) { + is(scalar @kids, 2); + + check_nodes($kids[1], $expectation->{kids}); + } + else { + is_deeply([@kids], [$a]); + } + } +} + +sub check { + my $pagespec = shift; + my $expected = shift; + comment("*** $pagespec ***\n"); + + my $html = IkiWiki::Plugin::map::preprocess(pages => $pagespec, + page => 'map', + destpage => 'map'); + comment($html); + my $tree = XML::Twig->new(pretty_print => 'indented'); + eval { + $tree->parse($html); + }; + if ($@) { + print "malformed XML: $@\n$html\n"; + ok(0); + } + my $fragment = $tree->root; + + is($fragment->tag, 'div'); + is($fragment->att('class'), 'map'); + + if (@$expected) { + check_nodes(($fragment->children)[0], $expected); + } + else { + ok(! $fragment->children); + } + + $tree->dispose; +} + +check('doesnotexist', []); + +check('alpha', [node('alpha', [])]); + +check('alpha/*', + [ + node('1', [ + node('i', []), + node('ii', []), + node('iii', []), + node('iv', []), + ]), + node('2', [ + node('a', []), + node('b', []), + ]), + node('3', []), + ]); + +check('alpha or alpha/*', + [ + node('alpha', [ + node('1', [ + node('i', []), + node('ii', []), + node('iii', []), + node('iv', []), + ]), + node('2', [ + node('a', []), + node('b', []), + ]), + node('3', []), + ]), + ]); + +check('alpha or alpha/1 or beta', + [ + node('alpha', [ + node('1', []), + ]), + node('beta', []), + ]); + +check('alpha/1 or beta', + [ + node('alpha', [ + node('1', []), + ], parent => 1), + node('beta', []), + ]); + +check('alpha/1/i* or alpha/2/a or beta', + [ + node('alpha', [ + node('1', [ + node('i', []), + node('ii', []), + node('iii', []), + node('iv', []), + ], parent => 1), + node('2', [ + node('a', []), + ], parent => 1), + ], parent => 1), + node('beta', []), + ]); + +check('alpha/1/i* or alpha/2/a', + [ + node('1', [ + node('i', []), + node('ii', []), + node('iii', []), + node('iv', []), + ], parent => 1), + node('2', [ + node('a', []), + ], parent => 1), + ]); + +check('alpha/1/i*', + [ + node('i', []), + node('ii', []), + node('iii', []), + node('iv', []), + ]); + +ok(! system("rm -rf t/tmp")); +done_testing; + +1; diff -Nru ikiwiki-3.20130212ubuntu1/t/permalink.t ikiwiki-3.20130904.1ubuntu1/t/permalink.t --- ikiwiki-3.20130212ubuntu1/t/permalink.t 2013-02-13 09:08:50.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/permalink.t 2013-09-04 22:11:12.000000000 +0000 @@ -3,6 +3,7 @@ use strict; use Test::More 'no_plan'; +ok(! system("rm -rf t/tmp")); ok(! system("mkdir t/tmp")); ok(! system("make -s ikiwiki.out")); ok(! system("perl -I. ./ikiwiki.out -plugin inline -url=http://example.com -cgiurl=http://example.com/ikiwiki.cgi -rss -atom -underlaydir=underlays/basewiki -set underlaydirbase=underlays -templatedir=templates t/tinyblog t/tmp/out")); diff -Nru ikiwiki-3.20130212ubuntu1/t/po.t ikiwiki-3.20130904.1ubuntu1/t/po.t --- ikiwiki-3.20130212ubuntu1/t/po.t 2013-02-13 09:08:50.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/po.t 2013-09-04 22:11:12.000000000 +0000 @@ -135,7 +135,7 @@ is_deeply(\@{$links{'translatable'}}, ['nontranslatable'], "$msgprefix translatable"); is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es"); is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr"); -is_deeply(\@{$links{'nontranslatable'}}, ['/', 'translatable', 'translatable.fr', 'translatable.es'], "$msgprefix nontranslatable"); +is_deeply([sort @{$links{'nontranslatable'}}], [sort('/', 'translatable', 'translatable.fr', 'translatable.es')], "$msgprefix nontranslatable"); $config{po_link_to}='current'; $msgprefix="links (po_link_to=current)"; @@ -146,7 +146,7 @@ is_deeply(\@{$links{'translatable'}}, [bestlink('translatable', 'nontranslatable')], "$msgprefix translatable"); is_deeply(\@{$links{'translatable.es'}}, ['nontranslatable'], "$msgprefix translatable.es"); is_deeply(\@{$links{'translatable.fr'}}, ['nontranslatable'], "$msgprefix translatable.fr"); -is_deeply(\@{$links{'nontranslatable'}}, ['/', 'translatable', 'translatable.fr', 'translatable.es'], "$msgprefix nontranslatable"); +is_deeply([sort @{$links{'nontranslatable'}}], [sort('/', 'translatable', 'translatable.fr', 'translatable.es')], "$msgprefix nontranslatable"); ### targetpage $config{usedirs}=0; diff -Nru ikiwiki-3.20130212ubuntu1/t/podcast.t ikiwiki-3.20130904.1ubuntu1/t/podcast.t --- ikiwiki-3.20130212ubuntu1/t/podcast.t 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/podcast.t 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,233 @@ +#!/usr/bin/perl +use warnings; +use strict; + +BEGIN { + eval q{use XML::Feed; use HTML::Parser; use HTML::LinkExtor}; + if ($@) { + eval q{use Test::More skip_all => + "XML::Feed and/or HTML::Parser not available"}; + } + else { + eval q{use Test::More tests => 136}; + } +} + +use Cwd; +use File::Basename; + +my $tmp = 't/tmp'; +my $statedir = 't/tinypodcast/.ikiwiki'; + +sub podcast { + my $podcast_style = shift; + + my $baseurl = 'http://example.com'; + my @command = (qw(./ikiwiki.out -plugin inline -rss -atom)); + push @command, qw(-underlaydir=underlays/basewiki); + push @command, qw(-set underlaydirbase=underlays -templatedir=templates); + push @command, "-url=$baseurl", qw(t/tinypodcast), "$tmp/out"; + + ok(! system("mkdir $tmp"), + q{setup}); + ok(! system(@command), + q{build}); + + my %media_types = ( + 'simplepost' => undef, + 'piano.mp3' => 'audio/mpeg', + 'scroll.3gp' => 'video/3gpp', + 'walter.ogg' => 'video/x-theora+ogg', + ); + + for my $format (qw(atom rss)) { + my $feed = XML::Feed->parse("$tmp/out/$podcast_style/index.$format"); + + is($feed->title, $podcast_style, + qq{$format feed title}); + is($feed->link, "$baseurl/$podcast_style/", + qq{$format feed link}); + is($feed->description, 'wiki', + qq{$format feed description}); + if ('atom' eq $format) { + is($feed->author, $feed->description, + qq{$format feed author}); + is($feed->id, $feed->link, + qq{$format feed id}); + is($feed->generator, "ikiwiki", + qq{$format feed generator}); + } + + for my $entry ($feed->entries) { + my $title = $entry->title; + my $url = $entry->id; + my $body = $entry->content->body; + my $enclosure = $entry->enclosure; + + is($entry->link, $url, qq{$format $title link}); + isnt($entry->issued, undef, + qq{$format $title issued date}); + isnt($entry->modified, undef, + qq{$format $title modified date}); + + if (defined $media_types{$title}) { + is($url, "$baseurl/$title", + qq{$format $title id}); + is($body, undef, + qq{$format $title no body text}); + is($enclosure->url, $url, + qq{$format $title enclosure url}); + is($enclosure->type, $media_types{$title}, + qq{$format $title enclosure type}); + cmp_ok($enclosure->length, '>', 0, + qq{$format $title enclosure length}); + } + else { + # XXX hack hack hack + my $expected_id = "$baseurl/$title/"; + $expected_id =~ s/\ /_/g; + + is($url, $expected_id, + qq{$format $title id}); + isnt($body, undef, + qq{$format $title body text}); + + if ('fancy' eq $podcast_style) { + isnt($enclosure, undef, + qq{$format $title enclosure}); + my $filename = basename($enclosure->url); + is($enclosure->type, $media_types{$filename}, + qq{$format $title enclosure type}); + cmp_ok($enclosure->length, '>', 0, + qq{$format $title enclosure length}); + } + else { + is($enclosure, undef, + qq{$format $title no enclosure}); + } + } + } + } + + ok(! system("rm -rf $tmp $statedir"), q{teardown}); +} + +sub single_page_html { + my @command = (qw(./ikiwiki.out)); + push @command, qw(-underlaydir=underlays/basewiki); + push @command, qw(-set underlaydirbase=underlays -templatedir=templates); + push @command, qw(t/tinypodcast), "$tmp/out"; + + ok(! system("mkdir $tmp"), + q{setup}); + ok(! system(@command), + q{build}); + + my $html = "$tmp/out/pianopost/index.html"; + like(_extract_html_content($html, 'content'), qr/has content and/m, + q{html body text}); + like(_extract_html_content($html, 'enclosure'), qr/Download/m, + q{html enclosure}); + my ($href) = _extract_html_links($html, 'piano'); + is($href, '/piano.mp3', + q{html enclosure sans -url is site-absolute}); + + $html = "$tmp/out/attempted_multiple_enclosures/index.html"; + like(_extract_html_content($html, 'content'), qr/has content and/m, + q{html body text}); + like(_extract_html_content($html, 'enclosure'), qr/Download/m, + q{html enclosure}); + ($href) = _extract_html_links($html, 'walter'); + is($href, '/walter.ogg', + q{html enclosure sans -url is site-absolute}); + + my $baseurl = 'http://example.com'; + ok(! system(@command, "-url=$baseurl", q{--rebuild})); + + $html = "$tmp/out/pianopost/index.html"; + ($href) = _extract_html_links($html, 'piano'); + is($href, "$baseurl/piano.mp3", + q{html enclosure with -url is fully absolute}); + + $html = "$tmp/out/attempted_multiple_enclosures/index.html"; + ($href) = _extract_html_links($html, 'walter'); + is($href, "$baseurl/walter.ogg", + q{html enclosure with -url is fully absolute}); + + ok(! system("rm -rf $tmp $statedir"), q{teardown}); +} + +sub inlined_pages_html { + my @command = (qw(./ikiwiki.out -plugin inline)); + push @command, qw(-underlaydir=underlays/basewiki); + push @command, qw(-set underlaydirbase=underlays -templatedir=templates); + push @command, qw(t/tinypodcast), "$tmp/out"; + + ok(! system("mkdir $tmp"), + q{setup}); + ok(! system(@command), + q{build}); + + my $html = "$tmp/out/fancy/index.html"; + my $contents = _extract_html_content($html, 'content'); + like($contents, qr/has content and an/m, + q{html body text from pianopost}); + like($contents, qr/has content and only one/m, + q{html body text from attempted_multiple_enclosures}); + my $enclosures = _extract_html_content($html, 'inlineenclosure'); + like($enclosures, qr/Download/m, + q{html enclosure}); + my ($href) = _extract_html_links($html, 'piano.mp3'); + is($href, '/piano.mp3', + q{html enclosure from pianopost sans -url}); + ($href) = _extract_html_links($html, 'walter.ogg'); + is($href, '/walter.ogg', + q{html enclosure from attempted_multiple_enclosures sans -url}); + + ok(! system("rm -rf $tmp $statedir"), q{teardown}); +} + +sub _extract_html_content { + my ($file, $desired_id, $desired_tag) = @_; + $desired_tag = 'div' unless defined $desired_tag; + + my $p = HTML::Parser->new(api_version => 3); + my $content = ''; + + $p->handler(start => sub { + my ($tag, $self, $attr) = @_; + return if $tag ne $desired_tag; + return unless exists $attr->{id} && $attr->{id} eq $desired_id; + + $self->handler(text => sub { + my ($dtext) = @_; + $content .= $dtext; + }, "dtext"); + }, "tagname,self,attr"); + + $p->parse_file($file) || die $!; + + return $content; +} + +sub _extract_html_links { + my ($file, $desired_value) = @_; + + my @hrefs = (); + + my $p = HTML::LinkExtor->new(sub { + my ($tag, %attr) = @_; + return if $tag ne 'a'; + return unless $attr{href} =~ qr/$desired_value/; + push(@hrefs, values %attr); + }, getcwd() . '/' . $file); + + $p->parse_file($file); + + return @hrefs; +} + +podcast('simple'); +single_page_html(); +inlined_pages_html(); +podcast('fancy'); diff -Nru ikiwiki-3.20130212ubuntu1/t/tinypodcast/attempted_multiple_enclosures.mdwn ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/attempted_multiple_enclosures.mdwn --- ikiwiki-3.20130212ubuntu1/t/tinypodcast/attempted_multiple_enclosures.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/attempted_multiple_enclosures.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,4 @@ +[[!meta enclosure="piano.mp3" enclosure="scroll.3gp"]] +[[!meta enclosure="walter.ogg"]] + +this article has content _and_ only one enclosure! diff -Nru ikiwiki-3.20130212ubuntu1/t/tinypodcast/fancy.mdwn ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/fancy.mdwn --- ikiwiki-3.20130212ubuntu1/t/tinypodcast/fancy.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/fancy.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +[[!inline pages="pianopost or attempted_multiple_enclosures"]] Binary files /tmp/iq7CVOrGD7/ikiwiki-3.20130212ubuntu1/t/tinypodcast/piano.mp3 and /tmp/R6s6YCoTXx/ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/piano.mp3 differ diff -Nru ikiwiki-3.20130212ubuntu1/t/tinypodcast/pianopost.mdwn ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/pianopost.mdwn --- ikiwiki-3.20130212ubuntu1/t/tinypodcast/pianopost.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/pianopost.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1,3 @@ +[[!meta enclosure="piano.mp3"]] + +this article has content _and_ an enclosure! Binary files /tmp/iq7CVOrGD7/ikiwiki-3.20130212ubuntu1/t/tinypodcast/scroll.3gp and /tmp/R6s6YCoTXx/ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/scroll.3gp differ diff -Nru ikiwiki-3.20130212ubuntu1/t/tinypodcast/simple.mdwn ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/simple.mdwn --- ikiwiki-3.20130212ubuntu1/t/tinypodcast/simple.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/simple.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +[[!inline pages="simplepost or *.3gp or *.mov or *.mp3 or *.ogg"]] diff -Nru ikiwiki-3.20130212ubuntu1/t/tinypodcast/simplepost.mdwn ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/simplepost.mdwn --- ikiwiki-3.20130212ubuntu1/t/tinypodcast/simplepost.mdwn 1970-01-01 00:00:00.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/simplepost.mdwn 2013-09-03 18:53:37.000000000 +0000 @@ -0,0 +1 @@ +this article has content but no enclosure Binary files /tmp/iq7CVOrGD7/ikiwiki-3.20130212ubuntu1/t/tinypodcast/walter.ogg and /tmp/R6s6YCoTXx/ikiwiki-3.20130904.1ubuntu1/t/tinypodcast/walter.ogg differ diff -Nru ikiwiki-3.20130212ubuntu1/templates/aggregatepost.tmpl ikiwiki-3.20130904.1ubuntu1/templates/aggregatepost.tmpl --- ikiwiki-3.20130212ubuntu1/templates/aggregatepost.tmpl 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/templates/aggregatepost.tmpl 2013-09-04 22:11:09.000000000 +0000 @@ -11,5 +11,9 @@ [[!meta copyright=""]] + +[[!meta author=": "]] + [[!meta author=""]] + [[!meta authorurl=""]] diff -Nru ikiwiki-3.20130212ubuntu1/templates/atomitem.tmpl ikiwiki-3.20130904.1ubuntu1/templates/atomitem.tmpl --- ikiwiki-3.20130212ubuntu1/templates/atomitem.tmpl 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/templates/atomitem.tmpl 2013-09-04 22:11:09.000000000 +0000 @@ -34,11 +34,12 @@ - + + - + diff -Nru ikiwiki-3.20130212ubuntu1/templates/inlinepage.tmpl ikiwiki-3.20130904.1ubuntu1/templates/inlinepage.tmpl --- ikiwiki-3.20130212ubuntu1/templates/inlinepage.tmpl 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/templates/inlinepage.tmpl 2013-09-04 22:11:09.000000000 +0000 @@ -23,6 +23,12 @@

diff -Nru ikiwiki-3.20130212ubuntu1/templates/rssitem.tmpl ikiwiki-3.20130904.1ubuntu1/templates/rssitem.tmpl --- ikiwiki-3.20130212ubuntu1/templates/rssitem.tmpl 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/templates/rssitem.tmpl 2013-09-04 22:11:09.000000000 +0000 @@ -1,16 +1,14 @@ - - <TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE> - - <TMPL_VAR TITLE> - + + + @@ -20,9 +18,10 @@ - - + + + diff -Nru ikiwiki-3.20130212ubuntu1/templates/rsspage.tmpl ikiwiki-3.20130904.1ubuntu1/templates/rsspage.tmpl --- ikiwiki-3.20130212ubuntu1/templates/rsspage.tmpl 2013-02-13 09:08:47.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/templates/rsspage.tmpl 2013-09-04 22:11:09.000000000 +0000 @@ -5,7 +5,12 @@ <TMPL_VAR TITLE> + + + +ikiwiki + diff -Nru ikiwiki-3.20130212ubuntu1/themes/actiontabs/style.css ikiwiki-3.20130904.1ubuntu1/themes/actiontabs/style.css --- ikiwiki-3.20130212ubuntu1/themes/actiontabs/style.css 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/themes/actiontabs/style.css 2013-09-04 22:11:09.000000000 +0000 @@ -76,7 +76,7 @@ padding: 2px; } -#content, #comments, #footer { +#content, #enclosure, #comments, #footer { margin: 1em 2em; } diff -Nru ikiwiki-3.20130212ubuntu1/themes/blueview/style.css ikiwiki-3.20130904.1ubuntu1/themes/blueview/style.css --- ikiwiki-3.20130212ubuntu1/themes/blueview/style.css 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/themes/blueview/style.css 2013-09-04 22:11:09.000000000 +0000 @@ -143,7 +143,7 @@ * Copyright (C) 2010 Bernd Zeimetz * Licensed under same license as ikiwiki: GPL v2 or later */ -.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { +.page, .pageheader, .sidebar, #content, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { border: none; } @@ -223,7 +223,7 @@ clear: none; } -#content a, #comments a, .sidebar a { +#content a, #enclosure a, #comments a, .sidebar a { color: #315485; text-decoration: none; font-weight: bold; @@ -271,7 +271,7 @@ .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { color #315485; } - #content, #comments, #pagebody { + #content, #enclosure, #comments, #pagebody { margin-right: 0; *margin-right: 0; border-right: none; diff -Nru ikiwiki-3.20130212ubuntu1/themes/goldtype/base.css ikiwiki-3.20130904.1ubuntu1/themes/goldtype/base.css --- ikiwiki-3.20130212ubuntu1/themes/goldtype/base.css 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/themes/goldtype/base.css 2013-09-04 22:11:09.000000000 +0000 @@ -143,7 +143,7 @@ * Copyright (C) 2010 Bernd Zeimetz * Licensed under same license as ikiwiki: GPL v2 or later */ -.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { +.page, .pageheader, .sidebar, #content, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { border: none; } @@ -223,7 +223,7 @@ clear: none; } -#content a, #comments a, .sidebar a { +#content a, #enclosure a, #comments a, .sidebar a { color: #315485; text-decoration: none; font-weight: bold; @@ -271,7 +271,7 @@ .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { color #315485; } - #content, #comments, #pagebody { + #content, #enclosure, #comments, #pagebody { margin-right: 0; *margin-right: 0; border-right: none; diff -Nru ikiwiki-3.20130212ubuntu1/themes/goldtype/style.css ikiwiki-3.20130904.1ubuntu1/themes/goldtype/style.css --- ikiwiki-3.20130212ubuntu1/themes/goldtype/style.css 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/themes/goldtype/style.css 2013-09-04 22:11:08.000000000 +0000 @@ -14,10 +14,12 @@ background-color: #f2d98d; } -#content a:hover, #comments a:hover, .sidebar a:hover, -#content a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover { +#content a:hover, #enclosure a:hover, #comments a:hover, .sidebar a:hover, +#content a:visited:hover, #enclosure a:visited:hover, #comments a:visited:hover, +.sidebar a:visited:hover { color: red; } -#content a:visited, #comments a:visited, .sidebar a:visited { +#content a:visited, #enclosure a:visited, #comments a:visited, +.sidebar a:visited { color: #37485e; } diff -Nru ikiwiki-3.20130212ubuntu1/themes/monochrome/style.css ikiwiki-3.20130904.1ubuntu1/themes/monochrome/style.css --- ikiwiki-3.20130212ubuntu1/themes/monochrome/style.css 2013-02-13 09:08:46.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/themes/monochrome/style.css 2013-09-04 22:11:08.000000000 +0000 @@ -36,12 +36,16 @@ * thanks to */ #content a[href^="http:"]:after, -#content a[href^="https:"]:after { +#content a[href^="https:"]:after, +#enclosure a[href^="http:"]:after, +#enclosure a[href^="https:"]:after { content: "↗"; } /* you will want to replicate this for your own domain in local.css */ #content a[href^="http://localhost"]:after, -#content a[href^="http://ikiwiki.info"]:after { +#content a[href^="http://ikiwiki.info"]:after, +#enclosure a[href^="http://localhost"]:after, +#enclosure a[href^="http://ikiwiki.info"]:after { content: none; } diff -Nru ikiwiki-3.20130212ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn ikiwiki-3.20130904.1ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn --- ikiwiki-3.20130212ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn 2013-02-13 09:08:39.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/underlays/basewiki/ikiwiki/pagespec.mdwn 2013-09-04 22:11:01.000000000 +0000 @@ -51,7 +51,8 @@ * "`admin()`" - tests whether a modification is being made by one of the wiki admins. * "`ip(address)`" - tests whether a modification is being made from the - specified IP address. + specified IP address. Glob patterns can be used in the address. For + example, `ip(127.0.0.*)` * "`comment(glob)`" - matches comments to a page matching the glob. * "`comment_pending(glob)`" - matches unmoderated, pending comments. * "`postcomment(glob)`" - matches only when comments are being diff -Nru ikiwiki-3.20130212ubuntu1/underlays/basewiki/sandbox.mdwn ikiwiki-3.20130904.1ubuntu1/underlays/basewiki/sandbox.mdwn --- ikiwiki-3.20130212ubuntu1/underlays/basewiki/sandbox.mdwn 2013-02-13 09:08:39.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/underlays/basewiki/sandbox.mdwn 2013-09-04 22:11:01.000000000 +0000 @@ -30,5 +30,3 @@ * item [[ikiwiki/WikiLink]] - -[[!calendar type="month" pages="blog/*"]] diff -Nru ikiwiki-3.20130212ubuntu1/underlays/basewiki/style.css ikiwiki-3.20130904.1ubuntu1/underlays/basewiki/style.css --- ikiwiki-3.20130212ubuntu1/underlays/basewiki/style.css 2013-02-13 09:08:24.000000000 +0000 +++ ikiwiki-3.20130904.1ubuntu1/underlays/basewiki/style.css 2013-09-04 22:10:45.000000000 +0000 @@ -58,7 +58,8 @@ border-bottom: 1px solid #000; } -.inlinecontent { +.inlinecontent, +.inlineenclosure { margin-top: .4em; } @@ -323,6 +324,7 @@ .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon {