diff -Nru ikiwiki-3.20130212ubuntu1/.gitattributes ikiwiki-3.20130904.1ubuntu1/.gitattributes
--- ikiwiki-3.20130212ubuntu1/.gitattributes 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/.gitattributes 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1 @@
+debian/changelog merge=dpkg-mergechangelogs
diff -Nru ikiwiki-3.20130212ubuntu1/.gitignore ikiwiki-3.20130904.1ubuntu1/.gitignore
--- ikiwiki-3.20130212ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/.gitignore 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,22 @@
+ikiwiki.setup
+Makefile
+Makefile.old
+blib/*
+/cover_db
+doc/.ikiwiki/*
+html/*
+ikiwiki.out
+ikiwiki-transition.out
+ikiwiki-calendar.out
+pm_to_blib
+/MYMETA.yml
+*.man
+/po/cover_db
+po/po2wiki_stamp
+po/underlays/*/*.mdwn
+po/underlays/basewiki/*/*.mdwn
+po/underlays/basewiki/*/*/*.mdwn
+po/underlays/directives/ikiwiki/directive/*.mdwn
+po/underlays_copy_stamp
+underlays/locale
+/t/tmp/
diff -Nru ikiwiki-3.20130212ubuntu1/CHANGELOG ikiwiki-3.20130904.1ubuntu1/CHANGELOG
--- ikiwiki-3.20130212ubuntu1/CHANGELOG 2013-02-19 13:51:31.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/CHANGELOG 2013-11-03 16:12:00.000000000 +0000
@@ -1,3 +1,96 @@
+ikiwiki (3.20130904.1ubuntu1) trusty; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Drop wdg-html-validator from Build-Depends field. The xmlns set in the
+ generated elements causes /usr/bin/validate to attempt to download
+ a file from w3.org. This doesn't work without Internet access.
+
+ -- Bhavani Shankar };
- $calendar.=htmllink($params{page}, $params{destpage},
- $linkcache{$key},
- noimageinline => 1,
- linktext => $day,
- title => pagetitle(IkiWiki::basename($linkcache{$key})));
+ $calendar.=qq{ \n};
}
else {
diff -Nru ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/comments.pm ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/comments.pm
--- ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/comments.pm 2013-02-13 09:08:50.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/comments.pm 2013-09-04 22:11:12.000000000 +0000
@@ -90,6 +90,15 @@
safe => 0,
rebuild => 0,
},
+ comments_allowformats => {
+ type => 'string',
+ default => '',
+ example => 'mdwn txt',
+ description => 'Restrict formats for comments to (no restriction if empty)',
+ safe => 1,
+ rebuild => 0,
+ },
+
}
sub checkconfig () {
@@ -101,6 +110,8 @@
unless defined $config{comments_closed_pagespec};
$config{comments_pagename} = 'comment_'
unless defined $config{comments_pagename};
+ $config{comments_allowformats} = ''
+ unless defined $config{comments_allowformats};
}
sub htmlize {
@@ -128,12 +139,18 @@
}
}
+sub isallowed ($) {
+ my $format = shift;
+ return ! $config{comments_allowformats} || $config{comments_allowformats} =~ /\b$format\b/;
+}
+
sub preprocess {
my %params = @_;
my $page = $params{page};
my $format = $params{format};
- if (defined $format && ! exists $IkiWiki::hooks{htmlize}{$format}) {
+ if (defined $format && (! exists $IkiWiki::hooks{htmlize}{$format} ||
+ ! isallowed($format))) {
error(sprintf(gettext("unsupported page format %s"), $format));
}
@@ -332,7 +349,7 @@
my @page_types;
if (exists $IkiWiki::hooks{htmlize}) {
- foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
+ foreach my $key (grep { !/^_/ && isallowed($_) } keys %{$IkiWiki::hooks{htmlize}}) {
push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
}
}
diff -Nru ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/git.pm ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/git.pm
--- ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/git.pm 2013-02-13 09:08:50.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/git.pm 2013-09-04 22:11:13.000000000 +0000
@@ -550,7 +550,13 @@
# Force git to allow empty commit messages.
# (If this version of git supports it.)
my ($version)=`git --version` =~ /git version (.*)/;
- if ($version ge "1.5.4") {
+ if ($version ge "1.7.8") {
+ push @opts, "--allow-empty-message", "--no-edit";
+ }
+ if ($version ge "1.7.2") {
+ push @opts, "--allow-empty-message";
+ }
+ elsif ($version ge "1.5.4") {
push @opts, '--cleanup=verbatim';
}
else {
diff -Nru ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/inline.pm ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/inline.pm
--- ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/inline.pm 2013-02-13 09:08:50.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/inline.pm 2013-09-04 22:11:12.000000000 +0000
@@ -611,6 +611,26 @@
return $ret;
}
+sub genenclosure {
+ my $itemtemplate=shift;
+ my $url=shift;
+ my $file=shift;
+
+ return unless $itemtemplate->query(name => "enclosure");
+
+ my $size=(srcfile_stat($file))[8];
+ my $mime="unknown";
+ eval q{use File::MimeInfo};
+ if (! $@) {
+ $mime = mimetype($file);
+ }
+ $itemtemplate->param(
+ enclosure => $url,
+ type => $mime,
+ length => $size,
+ );
+}
+
sub genfeed ($$$$$@) {
my $feedtype=shift;
my $feedurl=shift;
@@ -627,6 +647,7 @@
foreach my $p (@pages) {
my $u=URI->new(encode_utf8(urlto($p, "", 1)));
my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
+ my $fancy_enclosure_seen = 0;
$itemtemplate->param(
title => pagetitle(basename($p)),
@@ -648,32 +669,23 @@
$itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
$itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
}
- }
- if ($itemtemplate->query(name => "enclosure")) {
- my $file=$pagesources{$p};
- my $type=pagetype($file);
- if (defined $type) {
- $itemtemplate->param(content => $pcontent);
- }
- else {
- my $size=(srcfile_stat($file))[8];
- my $mime="unknown";
- eval q{use File::MimeInfo};
- if (! $@) {
- $mime = mimetype($file);
- }
- $itemtemplate->param(
- enclosure => $u,
- type => $mime,
- length => $size,
- );
+ if (exists $pagestate{$p}{meta}{enclosure}) {
+ my $absurl = $pagestate{$p}{meta}{enclosure};
+ my $file = $pagestate{$p}{meta}{enclosurefile};
+ genenclosure($itemtemplate, $absurl, $file);
+ $fancy_enclosure_seen = 1;
}
}
- else {
- $itemtemplate->param(content => $pcontent);
+
+ my $file=$pagesources{$p};
+ unless ($fancy_enclosure_seen || defined(pagetype($file))) {
+ genenclosure($itemtemplate, $u, $file);
+ $itemtemplate->param(simplepodcast => 1);
}
+ $itemtemplate->param(content => $pcontent);
+
run_hooks(pagetemplate => sub {
shift->(page => $p, destpage => $page,
template => $itemtemplate);
@@ -694,6 +706,7 @@
feeddesc => $feeddesc,
guid => $guid,
feeddate => date_3339($lasttime),
+ feeddate_822 => date_822($lasttime),
feedurl => $feedurl,
);
run_hooks(pagetemplate => sub {
diff -Nru ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/map.pm ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/map.pm
--- ikiwiki-3.20130212ubuntu1/IkiWiki/Plugin/map.pm 2013-02-13 09:08:50.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/IkiWiki/Plugin/map.pm 2013-09-04 22:11:12.000000000 +0000
@@ -72,6 +72,9 @@
$common_prefix=IkiWiki::dirname($common_prefix);
}
+ # Set this to 1 or more spaces to pretty-print maps for debugging
+ my $spaces = "";
+
# Create the map.
my $parent="";
my $indent=0;
@@ -94,33 +97,37 @@
if defined $common_prefix && length $common_prefix;
my $depth = ($item =~ tr/\//\//) + 1;
my $baseitem=IkiWiki::dirname($item);
- my $parentbase=IkiWiki::dirname($parent);
- while (length $parentbase && length $baseitem && $baseitem !~ /^\Q$parentbase\E(\/|$)/) {
- $parentbase=IkiWiki::dirname($parentbase);
+ while (length $parent && length $baseitem && $baseitem !~ /^\Q$parent\E(\/|$)/) {
+ $parent=IkiWiki::dirname($parent);
last if length $addparent && $baseitem =~ /^\Q$addparent\E(\/|$)/;
$addparent="";
- $indent--;
- $map .= "\n";
- if ($indent > 0) {
- $map .= "\n";
+ $map .= ($spaces x $indent) . "\n";
+ if ($indent > 1) {
+ $map .= ($spaces x $indent) . "};
+ foreach my $page (@{$linkcache{$key}}) {
+ $calendar.= qq{\n\t\t\t
};
+ $calendar.=qq{
\n";
+ $map .= ($spaces x $indent) . "\n";
}
+ $map =~ s{\n *\n";
- }
}
- $map .= "
- if ($data_dir){
- # new style, requires a real theme, but has no effect
- $gen->initTheme($data_dir->getThemePath("seashell.theme"));
- } else {
- # old style, anything works.
- $gen->initTheme("/dev/null");
- }
- $gen->loadLanguage($langfile); # must come after initTheme
- $gen->setEncoding("utf-8");
- $highlighters{$langfile}=$gen;
- }
- else {
- $gen=$highlighters{$langfile};
- }
-
- return "
+From 5ad35b2805ca50478f07d810e57e7c9b8f4eddea Mon Sep 17 00:00:00 2001
+From: Changaco <changaco@changaco.net>
+Date: Tue, 4 Jun 2013 02:54:35 +0200
+Subject: [PATCH] fix encoding issue in blogspam plugin
+
+RPC::XML uses ascii as default encoding, we have to tell it to use utf8.
+
+Without this, ikiwiki returns "failed to get response from blogspam server"
+every time a non-ascii character is used in a content that needs checking.
+
+---
+ IkiWiki/Plugin/blogspam.pm | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/IkiWiki/Plugin/blogspam.pm b/IkiWiki/Plugin/blogspam.pm
+index d32c2f1..e48ed72 100644
+--- a/IkiWiki/Plugin/blogspam.pm
++++ b/IkiWiki/Plugin/blogspam.pm
+@@ -53,6 +53,7 @@ sub checkconfig () {
+ eval q{
+ use RPC::XML;
+ use RPC::XML::Client;
++ $RPC::XML::ENCODING = 'utf-8';
+ };
+ error $@ if $@;
+ }
+--
+1.8.3
+
+
+[[done]] --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/feedpages_does_not_prevent_tags_from_being_aggregated.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,32 @@
+I added a feedpages directive to `blog/index.mdwn` to not pick up anything tagged `tags/random/hidden` yet that still happenend.
+
+ ~git/richardhartmann.de/blog % grep hidden index.mdwn
+ \[[!inline pages="./posts/*/*/* and !*/Discussion" feedpages="./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden)" show="10" actions=yes rootpage="blog"]]
+ ~git/richardhartmann.de/blog % grep hidden posts/2013/05/17-Debian_Release_Critical_Bug_report_for_Week_20.mdwn
+ \[[!tag tags/tech/floss/debian tags/tech/floss/debian/rc-stats/8.0-jessie tags/random/hidden]]
+ ~git/richardhartmann.de/blog %
+
+If you need more information, please let me know.
+
+Richard
+
+> I don't think this is a bug. You have a syntax error in your pagespec:
+> "not" is not a recognised keyword in [[pagespecs|ikiwiki/pagespec]],
+> so `and not tagged(...)` should be `and !tagged(...)`. Presumably inline
+> falls back to `pages` when `feedpages` doesn't work.
+>
+> By posting the pagespec here with insufficient escaping (which I've fixed)
+> you caused *this* ikiwiki instance's HTML to contain an error message
+> illustrating that syntax error :-)
+>
+> Error: syntax error in pagespec "(./posts/*/*/* and !*/Discussion) and (./posts/*/*/* and !*/Discussion and not tagged(tags/random/hidden))"
+>
+> [[done]]. --[[smcv]]
+
+> > As per IRC: Thanks. As an aside, shouldn't this ikiwiki instance ignore directives in normal text? The problem may be non-trivial, but still... -- Richard
+
+>>> "Normal text" is exactly where directives go, so, not really.
+>>> If you mean verbatim text (e.g. indentation in Markdown): the fact that
+>>> directives still expand to HTML, which is then treated as verbatim, is an
+>>> unfortunate result of how ikiwiki interacts with pages' markup languages
+>>> (directives and wikilinks happen before markup is converted to HTML). --[[smcv]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/http_proxy_for_openid.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/http_proxy_for_openid.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/http_proxy_for_openid.mdwn 2013-02-13 09:08:43.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/http_proxy_for_openid.mdwn 2013-09-04 22:11:05.000000000 +0000
@@ -79,8 +79,7 @@
>>>>> installed, even with the above commit, `openid` won't be able to
>>>>> traverse a proxy. --[[schmonz]]
-[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/proxy author="[[schmonz]]"]]
->>>>> I bollixed up my git, recloned, and reapplied the diffs, so
->>>>> that commit won't exist anymore. My proxy-related changes are
->>>>> now on a branch. --[[schmonz]]
+>>>>>> I've redone this from scratch, much more simply, on a new
+>>>>>> branch. --[[schmonz]].
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn 2013-02-13 09:08:44.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn 2013-09-04 22:11:06.000000000 +0000
@@ -12,4 +12,11 @@
> However, there is a simple way to avoid both problems: Use WikiLinks
> and/or the [[img_directive|ikiwiki/directive/img]]. --[[Joey]]
+> > For some inline HTML (e.g. SVG embedded with `` pairs, but appears not to
+have the ideal logic for this, leading to malformed HTML.
+
+In particular, on a site with these pages:
+
+* alpha
+ * 1
+ * i
+ * ii
+ * iii
+ * iv
+ * 2
+ * a
+ * b
+ * 3
+* beta
+
+the maps "`alpha/1 or beta`", "`alpha/1/i* or alpha/2/a or beta`" and
+"`alpha/1/i* or alpha/2/a`" have malformed HTML.
+
+My `ready/map` branch adds a regression test and makes it pass.
+
+The fix is not particularly elegant - it generates the previous
+HTML with redundant `
` pairs, marks the redundant
+pairs, and edits them out afterwards - but it works. If anyone can come
+up with a cleaner algorithm that avoids generating the redundant tags
+in the first place, that would be even better. --[[smcv]]
+
+> [[merged|done]] (not thrilled at this solution, but it works) --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn 2013-02-13 09:08:41.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/osm_KML_maps_icon_path_have_a_trailing_slash.mdwn 2013-09-04 22:11:03.000000000 +0000
@@ -30,3 +30,5 @@
"""]]
I'm not writing this to a branch out of sheer shame of my misunderstanding. ;) There also may be a workaround that could be done in Nginx too. --[[anarcat]]
+
+> [[applied|done]], but I'm not happy with this either --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/osm_plugin_error_TypeError:_mapProjection_is_null.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/osm_plugin_error_TypeError:_mapProjection_is_null.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/osm_plugin_error_TypeError:_mapProjection_is_null.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/osm_plugin_error_TypeError:_mapProjection_is_null.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,5 @@
+Using the osm plugin with a simple \[[!osm]] directive does not seem to work, a "TypeError: mapProjection is null" is given. I believe this is because the client side Javascript uses the options.layers, which is always Null.
+
+[[!tag patch]]
+I have produced a patch for this issue, but beware, while it appears to fix the problem for me, I have little understanding of perl and the existing code base.
+
-
diff -Nru ikiwiki-3.20130212ubuntu1/doc/theme_market.mdwn ikiwiki-3.20130904.1ubuntu1/doc/theme_market.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/theme_market.mdwn 2013-02-13 09:08:25.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/theme_market.mdwn 2013-09-04 22:10:46.000000000 +0000
@@ -9,3 +9,5 @@
* **[[AntPortal theme|https://github.com/AntPortal/ikiwiked]]**, contributed by Danny, see an example [[on the Antportal wiki|https://antportal.com/wiki/]]
* **[[Night city theme|http://anarcat.ath.cx/night_city/README/]]**, contributed by [[anarcat]], see an example [[on his homepage|http://anarcat.ath.cx/]]
+
+ * **[[Bootstrap theme|http://anonscm.debian.org/gitweb/?p=users/jak/website.git;a=summary]]**, contributed by [[JAK LINUX|http://jak-linux.org/about/]], based on [[Twitter Bootstrap|http://twitter.github.com/bootstrap/]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/themes/discussion.mdwn ikiwiki-3.20130904.1ubuntu1/doc/themes/discussion.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/themes/discussion.mdwn 2013-02-13 09:08:30.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/themes/discussion.mdwn 2013-09-04 22:10:52.000000000 +0000
@@ -7,3 +7,14 @@
> Shouldn't we just make people post their themes in the [[themes]] page? Or maybe we should make a [[theme market]]? --[[anarcat]]
> I did just that. -- [[anarcat]]
+
+What is the process for merging a theme in Ikiwiki? It seems to me the
+[[Bootstrap theme|http://www2.tblein.eu/posts/How_to_have_a_nice_design_for_ikiwiki/]]
+could improve the options a lot... See the [[theme market]] for the
+links to the actual theme. -- [[anarcat]]
+
+> Step 1 is to not need two versions of page.tmpl to be maintained.
+> This is, unfortunately, the reason why I have not pulled in the bootstrap
+> theme yet. I recently made `
+
+[[!tag patch]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/proxy.py_utf8_troubles.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/proxy.py_utf8_troubles.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/proxy.py_utf8_troubles.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/proxy.py_utf8_troubles.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,35 @@
+when writing an external plugin using `proxy.py`, the getstate and setstate
+functions don't accept unicode data:
+
+ uncaught exception: 'ascii' codec can't encode character u'\xe4' in position 25: ordinal not in range(128)
+ Traceback (most recent call last):
+ File "proxy.py", line 309, in run
+ self._in_fd, self._out_fd)
+ File "proxy.py", line 192, in handle_rpc
+ ret = self._dispatcher.dispatch(method, params)
+ File "proxy.py", line 84, in dispatch
+ return self._dispatch(method, params)
+ File "/usr/lib/python2.7/SimpleXMLRPCServer.py", line 420, in _dispatch
+ return func(*params)
+ File "proxy.py", line 251, in hook_proxy
+ ret = function(self, *args)
+ File "/home/chrysn/git/ikiwiki-plugins//plugins/my_plugin", line 49, in data2html
+ proxy.setstate(kwargs['page'], 'meta', 'title', unicode_containing_umlauts)
+ File "proxy.py", line 291, in setstate
+ return self.rpc('setstate', page, id, key, value)
+ File "proxy.py", line 233, in rpc
+ *args, **kwargs)
+ File "proxy.py", line 178, in send_rpc
+ cmd, data))
+ UnicodeEncodeError: 'ascii' codec can't encode character u'\xe4' in position 25: ordinal not in range(128)
+
+the culprit is the last `_debug_fn` invocation in `send_rpc` (line 178), where
+unicode data is format-fed into a string. while this could be circumvented by
+making the formatting string a unicode string, that would cause trouble with
+python3 and we'd just move the problem to the stderr writing later on; instead,
+"`cmd, data))`" should become "`cmd, repr(data)))`" and everything is fine.
+debug output doesn't look that pretty any more, but is safe.
+
+--[[chrysn]]
+
+> ok, [[done]] --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/removal_of_transient_pages.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/removal_of_transient_pages.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/removal_of_transient_pages.mdwn 2013-02-13 09:08:44.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/removal_of_transient_pages.mdwn 2013-09-04 22:11:06.000000000 +0000
@@ -65,7 +65,12 @@
>> Try this, then? I had to make some changes to `attachment`
>> to make the split versions available. I suggest reviewing
>> patch-by-patch.
->>
+
+>>> Branch updated; I'd missed a use of prune in ikiwiki.in itself.
+>>> Unfortunately, this means it does still need to support the
+>>> "undefined top directory" case: there isn't an obvious top
+>>> directory for wrappers. --[[smcv]]
+
>> I also tried to fix a related bug which I found while testing it:
>> the special case for renaming held attachments didn't seem to work.
>> (`smcv/wip/rename-held`.) Unfortunately, it seems that with that
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/search_plugin_finds_no_results_with_xapian_1.2.7.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/search_plugin_finds_no_results_with_xapian_1.2.7.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/search_plugin_finds_no_results_with_xapian_1.2.7.mdwn 2013-02-13 09:08:44.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/search_plugin_finds_no_results_with_xapian_1.2.7.mdwn 2013-09-04 22:11:06.000000000 +0000
@@ -8,3 +8,7 @@
> Debian has 1.2.7 now, and I have it installed and searching is working
> fine with it. --[[Joey]]
+
+> I have this same issue. I tried xapian version 1.2.5. 1.2.8, 1.2.13. I will try and see if installing 1.2.3 fixes this issue. --[[Ramsey]]
+
+> 1.2.3 didn't fix the issue either --[[Ramsey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/sidebar_not_updated_in_unedited_subpages.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/sidebar_not_updated_in_unedited_subpages.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/sidebar_not_updated_in_unedited_subpages.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/sidebar_not_updated_in_unedited_subpages.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,9 @@
+I turned on the sidebar plugin, with global_sidebars on (in the web setup page), created a sidebar page in the root, and edited the sidebar a few times.
+
+I then noticed that all pages on the root had been updated with a sidebar, but no subpages (i.e. a/b). Only after editing a subpage did it get a sidebar. Editing sidebar itself only updated subpages with sidebars, the other subpages had not been refreshed (proven by their unchanged filesystem date)
+
+After calling ikiwiki --setup on the command line all pages were updated. So this seems to be a difference between web-started --setup and command-line --setup. Or it just doesn't work the first time --setup is called after sidebars are enabled.
+
+
+
+
diff -Nru ikiwiki-3.20130212ubuntu1/doc/bugs/template_creation_error.mdwn ikiwiki-3.20130904.1ubuntu1/doc/bugs/template_creation_error.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/bugs/template_creation_error.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/bugs/template_creation_error.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,111 @@
+Hi,
+I am trying to build a template. The compilation of this template results in a weird exception. I have isolated the cause of the exception to the following point:
+
+If i have this in the template code:
+
+\[[!inline
+diff --git a/IkiWiki.pm b/IkiWiki.pm
+index 75c9579..ad0f8b0 100644
+--- a/IkiWiki.pm
++++ b/IkiWiki.pm
+@@ -1487 +1487 @@ sub preprocess ($$$;$$) {
+- if ($preprocessing{$page}++ > 3) {
++ if ($preprocessing{$page}++ > 8) {
+
+pages="\
+template=extract-entry
+\]]
+
+There is no problem at all. I can use the template with the desired result. But if I try to use this (just adding the "show" parameter):
+
+\[[!inline
+pages="\
+template=extract-entry
+show=\
+\]]
+
+I get this exception on the Git bash console:
+
+
+$ git push
+Counting objects: 7, done.
+Delta compression using up to 8 threads.
+Compressing objects: 100% (4/4), done.
+Writing objects: 100% (4/4), 410 bytes, done.
+Total 4 (delta 3), reused 0 (delta 0)
+remote: From /home/b-odelama-com/source
+remote: eb1421e..5e1bac5 master -> origin/master
+remote: Argument "\x{3c}\x{54}..." isn't numeric in numeric lt (<) at /usr/share/perl5/IkiWiki/Plugin/inline.pm line 231.
+remote: Argument "\x{3c}\x{54}..." isn't numeric in numeric lt (<) at /usr/share/perl5/IkiWiki/Plugin/inline.pm line 231.
+To ssh://b-odelama-com@odelama-com.branchable.com/
+ eb1421e..5e1bac5 master -> master
+
+
+Please, let me know what to do to avoid this kind of error.
+
+> When you add a template page `templates/foo.mdwn` for use
+> the [[ikiwiki/directive/template]] directive, two things happen:
+>
+> 1. `\[[!template id=foo ...]]` becomes available;
+> 2. a wiki page `templates/foo` is built, resulting in a HTML file,
+> typically `templates/foo/index.html`
+>
+> The warnings you're seeing are the second of these: when ikiwiki
+> tries to process `templates/foo.mdwn` as an ordinary page, without
+> interpreting the `
+perl -le 'use warnings; use strict; use Data::Dumper; use IkiWiki; %config=IkiWiki::defaultconfig(); use IkiWiki::Setup; my @s=IkiWiki::Setup::getsetup(); foreach my $pair (@s) { print "plugin ".$pair->[0]; my $setup=$pair->[1]; if ($pair->[0] eq "rst") { print Dumper($setup)} my %s=@{$setup} }'
+
+
+> I was able to replicate this by making a plugin's getsetup hook return a list reference, rather than a list,
+> and have put in a guard against that sort of thing.
+> --[[Joey]]
+
+>> Thanks. Your command didn't helped me, but with trial and error approach I found that the victim an old version asciidoc plugin. For some reason, asciidoc was never listed in the output of the command. --[[wentasah]]
+
+>>> Ok. My fix should prevent the problem, so [[done]] --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/features.mdwn ikiwiki-3.20130904.1ubuntu1/doc/features.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/features.mdwn 2013-02-13 09:08:24.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/features.mdwn 2013-09-04 22:10:46.000000000 +0000
@@ -64,9 +64,11 @@
the wiki. This can be used to create a Planet type site that aggregates
interesting feeds.
-You can also mix blogging with podcasting by dropping audio files where
-they will be picked up like blog posts. This will work for any files that
-you would care to syndicate.
+You can also mix blogging with [[podcasting|podcast]]. Simply drop
+media files where they will be picked up like blog posts. For
+fuller-featured podcast feeds, enclose media files in blog posts
+using [[plugins/meta]]. Either way, this will work for any files
+that you would care to syndicate.
## Valid html and [[css]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn 2013-02-13 09:08:33.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn 2013-09-04 22:10:54.000000000 +0000
@@ -17,3 +17,5 @@
Any pointers appreciated.
A [[!taglink patch]] has been proposed in [comment](#comment-d6f94e2b779d1c038b6359aad79ed14b)
+
+> This has been applied. --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_1_8e34b10699bed1b53b6c929ed1e9f19c._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_1_8e34b10699bed1b53b6c929ed1e9f19c._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_1_8e34b10699bed1b53b6c929ed1e9f19c._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_1_8e34b10699bed1b53b6c929ed1e9f19c._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,32 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="It's a wiki: any editor can have as many blogs as they want"
+ date="2013-07-17T08:17:05Z"
+ content="""
+Ikiwiki is a wiki, so you can certainly have multiple users. Any user
+with appropriate access can create any number of blogs: they just need
+to put an [[ikiwiki/directive/inline]] directive on any page they can
+edit, with a [[ikiwiki/PageSpec]] pointing to pages (blog posts) in a
+directory where they can create pages.
+
+If you want a limited set of users to be able to edit the wiki without
+making them full wiki admins, you can use [[plugins/lockedit]]:
+
+ locked_pages: * and !(user(bob) or user(chris))
+
+or if you want \"most\" users to only be able to write on their own blog, and
+not on other users' blogs (for instance: Alice the wiki admin can edit
+anything, but Bob can only edit `users/bob/...` and Chris can only edit
+`users/chris/...`) then you can use [[plugins/lockedit]], something like:
+
+ locked_pages: * and !(user(bob) and (users/bob or users/bob/*)) and !(user(chris) and (users/chris or users/chris/*))
+
+(Wiki admins can always edit locked pages.)
+
+If you have lots of users and you know a bit of Perl, you might want
+to [[write a plugin|plugins/write]] that adds a function-like
+[[ikiwiki/PageSpec]] like `owndirectory(users)`, which would match if
+there is a logged-in user and the page being edited is equal to or
+a subpage of their directory in users.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_2_6083e16f72e12c03bdf739b84bd2f352._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_2_6083e16f72e12c03bdf739b84bd2f352._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_2_6083e16f72e12c03bdf739b84bd2f352._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__/comment_2_6083e16f72e12c03bdf739b84bd2f352._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 2"
+ date="2013-07-17T08:23:32Z"
+ content="""
+IkiWiki's own [[bugs]], [[news]] and [[to-do list|todo]] are functionally
+equivalent to blogs, in fact. ([[news]] is the most obviously blog-like,
+[[bugs]] is like a blog except that solved bugs disappear from the
+page/feed, and [[todo]] only shows titles, not content, but is otherwise
+like [[bugs]].)
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Can_ikiwiki_be_configured_as_multi_user_blog__63__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,7 @@
+All the ikiwiki blogs I have seen have a single user blog. Is it possible to give every user a blog, where they can create their own pages in their own directory = based on their user name?
+
+I feel that a wiki might give more options in the way users share and collaborate when compared to a blog engine (like Word Press in multi user format)
+
+Is this the best place to post a question like this? There doesn't seem to be much traffic in this forum
+Thanks for your help
+Richard
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Email_notifications_for_comment_moderation/comment_1_668bf6a21310dcc8b882bc60a130ba06._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Email_notifications_for_comment_moderation/comment_1_668bf6a21310dcc8b882bc60a130ba06._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Email_notifications_for_comment_moderation/comment_1_668bf6a21310dcc8b882bc60a130ba06._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Email_notifications_for_comment_moderation/comment_1_668bf6a21310dcc8b882bc60a130ba06._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm6VdLM7IKcNgkDiJ2YKHpcWli9bRLsZDk"
+ nickname="Oscar"
+ subject="How to get a comment moderation feed"
+ date="2013-02-25T18:04:21Z"
+ content="""
+I was looking for the same subject and I have found the following:
+
+http://ikiwiki.info/tips/comments_feed/
+
+
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Email_notifications_for_comment_moderation.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Email_notifications_for_comment_moderation.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Email_notifications_for_comment_moderation.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Email_notifications_for_comment_moderation.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,3 @@
+I use both [[plugins/moderatedcomments/]] and [[plugins/anonok]] on my [blog](http://feeding.cloud.geek.nz) but having to remember to visit the comment moderation page manually is not ideal.
+
+Is there a way to get an email notification (or maybe even just an RSS feed) whenever a new comment enters the moderation queue?
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Forward_slashes_being_escaped_as_252F/comment_1_7702cf6d354ab600d6643b075b9f09da._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm6gCEo_Z36OJ7x5kyZn52lEVvyjn3zSUc"
+ nickname="Ángel"
+ subject="comment 1"
+ date="2013-05-31T16:03:03Z"
+ content="""
+Simply add the NE (No escape) flag:
+
+RewriteEngine on
+RewriteCond %{HTTP_HOST} ^www\.ciffer\.net$
+RewriteRule /(.*) http://ciffer.net/$1 [L,R,NE]
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_1_fd26fb7f1569e8c44ba8262794f938db._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,19 @@
+[[!comment format=mdwn
+ username="http://joeyh.name/"
+ nickname="joey"
+ subject="comment 1"
+ date="2013-05-17T17:55:46Z"
+ content="""
+Normally ikiwiki requires a valid session cookie of a logged in user to edit pages. It sounds like you may have the opendiscussion or anonok plugins enabled, which allows anyone to edit without logging in. Recommend disabling them.
+
+Since you know the spammer's IP, put it into ikiwiki.setup:
+
+
+banned_users:
+ - ip(85.25.146.11)
+
+
+If the user was logging in, you could also put their username in the ban list.
+
+You can also try enabling the blogspam plugin.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_2_d098124f005976ee815d25c883bc9106._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="http://claimid.com/richard-lyons"
+ nickname="richard-lyons"
+ subject="comment 2"
+ date="2013-05-17T20:56:23Z"
+ content="""
+I did indeed have opendiscussion active. I shall wait to see what happens after disabling it.
+
+The bots seem to make 5 consecutive edits at short intervals (around 2 minutes) using an IP
+address as a username. I do not know if the IP is the one from which they work. There are
+usually two or three sets of five edits using different IP addresses as username in each hour.
+
+I did try blocking specific IPs but they constantly change.
+
+It would be good if blocking could match a regexp, but as far as I can see this is not an option,
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__/comment_3_deb434d01aaefa18d2791e48d6c824ae._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://claimid.com/richard-lyons"
+ nickname="richard-lyons"
+ subject="SOLVED -- How can I prevent spam?"
+ date="2013-05-18T08:13:19Z"
+ content="""
+I can now confirm that this particular attack has stopped after removing the opendiscussion plugin.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_can_I_prevent_spam__63__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_can_I_prevent_spam__63__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,17 @@
+I am getting continuous spam like this:
+
+ discussion 85.25.146.11 web 11:02:19 05/17/13 2rand[0,1,1]
+ discussion 85.25.146.11 web 11:02:13 05/17/13 2rand[0,1,1]
+
+The bot uses an IP address as the username and puts '2rand[0,1,1]' as comment text.
+
+I do not have a page 'discussion' in use, so I have redirected this page with an apache2
+Alias to a static page, just in case anyone stumbles on it. This means it cannot really
+be edited via the web. However the bots that post
+this spam are evidently not opening the page to edit it, but merely sending a cgi request
+as if they had edited the page. The result is that no damage is done on the site and no
+benefit is achieved for the spammer since google cannot see the result. However, the
+logs are stuffed with spurious entries and a page is constantly recompiled, which wastes
+resources.
+
+Is there some way to reject edits that do not arise from an established session?
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_do_I_enable_OpenID__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/How_do_I_enable_OpenID__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_do_I_enable_OpenID__63__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_do_I_enable_OpenID__63__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1 @@
+I'm trying to set up a new ikiwiki based blog and I want commentors to be able to log in with OpenID. To enable OpenID I installed Net::OpenID::Consumer, and enabled the openid plugin in my blog.setup file and ran the ikiwiki --setup command. Despite doing that I still only see the username and password in the login screen. What am I missing?
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_to_remove_the_linebreak_in_license.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/How_to_remove_the_linebreak_in_license.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_to_remove_the_linebreak_in_license.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_to_remove_the_linebreak_in_license.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,11 @@
+I entered
+
+ this is my license
+
+into `license.mdwn`, and it shows up as
+
+ License:
+ this is my license
+
+
+I'd like to remove the line break, ideally also the redundant `License:`. How to do that?
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/How_to_set_up_a_page_as_internal__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/How_to_set_up_a_page_as_internal__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/How_to_set_up_a_page_as_internal__63__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/How_to_set_up_a_page_as_internal__63__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,5 @@
+I have a folder with few administrative tasks, like a page showing the comments waiting for moderation.
+
+There is no link from "normal/public" pages in my site to this administrative pages, but it doesn't prevent the possibility of any person writing down that address in the browser address-bar or finding that address in the browser navigation history.
+
+Please, is there any way or best-practice restricting the access to this kind of pages? I know that these pages will eventually ask the user to log-in as admin, but I don't want them to see this stuff.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Howto_add_tag_from_plugin_code/comment_1_c61454825874a6fe1905cb549386deb0._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Howto_add_tag_from_plugin_code/comment_1_c61454825874a6fe1905cb549386deb0._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Howto_add_tag_from_plugin_code/comment_1_c61454825874a6fe1905cb549386deb0._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Howto_add_tag_from_plugin_code/comment_1_c61454825874a6fe1905cb549386deb0._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,77 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2013-07-01T09:13:51Z"
+ content="""
+(If you want to branch from my version of album, please add my git repo
+as a remote and merge or cherry-pick the album4 branch: pasting from my
+gitweb seems to have given you some incorrect UTF-8.)
+
+The problem you have here is that for this plugin, the correct order
+for IkiWiki to do things is quite subtle. Am I right in thinking that
+the feature you want goes something like this?
+
+> To add a set of tags to every \"viewer\" page in the album, you can add
+> the tags parameter to the album:
+>
+> \[[!album tags=\"holiday hawaii\"]]
+>
+> The individual viewers will all be tagged \"holiday\" and \"hawaii\",
+> for instance. These tags cannot be removed by editing the viewers.
+
+`preprocess_albumimage` runs twice: once in the scan stage, and once in
+the render stage. In the render stage, it's too late to add tags, because
+tags are a special form of [[ikiwiki/wikilinks]], and wikilinks have to
+be added during the scan stage to work correctly.
+
+The part of `preprocess_albumimage` after the line
+`return unless defined wantarray;` only runs in the render stage, which
+is too late. You'd need to set up the tags further up: just after the
+calls to `IkiWiki::Plugin::meta::preprocess` would be a good place.
+
+I would also suggest checking for
+`IkiWiki::Plugin::tag->can('preprocess_tag')`,
+like I do for meta - if you do that, you won't need to force the tag plugin
+to be loaded.
+
+Unfortunately, I'm still not sure that this is fully correct. Pages
+are scanned in a random order. If the `\[[!album]]` is scanned before
+a \"viewer\" page, then everything is fine: the tags are present when
+the \"viewer\" is scanned. However, if the \"viewer\" is scanned first,
+then it will get the tags that the `\[[!album]]` had in the *previous*
+IkiWiki run (if any), which are still in the index, because the
+`\[[!album]]` hasn't been re-scanned yet...
+
+Are you sure this form of the feature is what you want? You'll end up with
+a *lot* of pages with those tags. If it's what you want, it might be
+clearer how it works if you changed the syntax to something like this,
+perhaps?
+
+>
+> \[[!album tag_all=\"holiday hawaii\"]]
+
+Another possible syntax would be to have the feature be more like this:
+
+> If you use the `tag_default` parameter to the `\[[!album]]` directive,
+> each \"viewer\" page created for images will have those tags by
+> default. Changing the `\[[!album]]` will not affect any \"viewer\"
+> pages that have already been created, and editing the \"viewer\"
+> can add or remove those default tags.
+>
+> \[[!album tag_default=\"holiday hawaii\"]]
+
+which I think removes the ordering problems? If you go this route,
+you'd want to either add e.g. `[[!tag holiday hawaii]]`
+to the generated viewer page in `create_viewer`, or add a `tag`
+parameter to `\[[!albumimage]]` that's a shortcut for the
+tag directive, in the same way that author is a shortcut for
+`[[!meta author]]`).
+
+The purpose of the \"shortcut\" parameters in `\[[!albumimage]]`,
+like title, author and date, is that I eventually want to add
+a specialized CGI interface to this plugin so you can edit
+all the images of an album in one go; when I add that,
+it'll probably only be able to process something as
+machine-readable as `\[[!albumimage]]`.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Howto_add_tag_from_plugin_code.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Howto_add_tag_from_plugin_code.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Howto_add_tag_from_plugin_code.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Howto_add_tag_from_plugin_code.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,12 @@
+Hi, I want to add tags to some pages automatically (generating album images
+and want to tag all generated pages). I managed to do so in following way:
+
+ IkiWiki::Plugin::tag::preprocess_tag(
+ page => $viewer,
+ destpage => $params{destpage},
+ map { ($_ => 1) } @tags,
+ );
+
+This works, however if some tag does not exist, it is not created. I tracked it so far that I found that the Render.pm's method gen_autofile() is not called , so it is most likely that I need to somehow trigger Render.pm's refresh()...but how can I do it?
+
+BTW: The code is modified album plugin that is in [my git](https://github.com/llipavsky/ikiwiki)
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Ikiwiki_themes_for_mobile_devices__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Ikiwiki_themes_for_mobile_devices__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Ikiwiki_themes_for_mobile_devices__63__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Ikiwiki_themes_for_mobile_devices__63__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,7 @@
+Has anyone else created ikiwiki themes for mobile devices like phones and tablets?
+
+I've been using Blueview theme for a few years and finally tried to adapt the theme for my phone.
+My local.css is [here](http://mcfrisk.kapsi.fi/local.css), and my hobby web page full of images and videos [here](http://mcfrisk.kapsi.fi/skiing/).
+
+Previously I also had problems like wasted screen space, big minimum width and images not scaled down to the CSS element. Those got fixed as well.
+Would be nice if others could test that and maybe share their setups.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__/comment_1_3274be931d0b543c7f7cf641810817aa._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__/comment_1_3274be931d0b543c7f7cf641810817aa._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__/comment_1_3274be931d0b543c7f7cf641810817aa._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__/comment_1_3274be931d0b543c7f7cf641810817aa._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://mcfrisk.myopenid.com/"
+ nickname="mikko.rapeli"
+ subject="bug/feature in Makefile.PL"
+ date="2013-03-30T11:53:41Z"
+ content="""
+Theme style.css files were appended when installing in Makefile.PL. IMO overwriting the destination files is more correct. Sent a patch to Joey.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Refresh_or_recreate_style.css__63__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,40 @@
+I was trying to use plain blueview theme but that's not what I see in the installed style.css:
+
+ ~/src/ikiwiki/themes/blueview$ grep bzed style.css
+ /* bzed theme for ikiwiki
+ ~/src/ikiwiki/themes/blueview$ wc -l style.css
+ 281 style.css
+ $ grep bzed ~/www/style.css
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ $ wc -l ~/www/style.css
+ 7913
+
+I have installed ikiwiki to my home directory on the shared server and it seems the big css file is there too:
+
+ $ grep bzed ~/bin/share/ikiwiki/themes/blueview/style.css
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ /* bzed theme for ikiwiki
+ $ wc -l ~/bin/share/ikiwiki/themes/blueview/style.css
+ 7913
+
+Is the style.css really supposed to be that big?
+If not, how to create it from scratch?
+
+Reason why I'm debugging the css is that I'd like to make it better on small handset screens, like drop all margins, inline or hide sidebar etc. Chromium shows that the processed css is quite a mess.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Translating_ikiwiki_interface.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/Translating_ikiwiki_interface.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/Translating_ikiwiki_interface.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Translating_ikiwiki_interface.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,8 @@
+I am using ikiwiki for a spanish language wiki. I've read the [[translation]] page and [[plugins/po]] plugin page but it is not completely clear to me. As I understand it the po plugin is the recommended way to create translated versions of existing pages in your wiki based on a master language. But I actually don't need that as myself and other users already edit the wiki in spanish. What I would actually like is to have the ikiwiki interface itself translated into spanish.
+Is it possible to have my wiki always appear in spanish? I can see that the debian package already includes po files for spanish. How do i activate the spanish translation permanently? Did I miss something obvious?
+
+> Ikiwiki has a Spanish translation of much of the program's output.
+> However, there is currently no translation of the page.tmpl and other
+> templates that are used to build your wiki. You can of course modify
+> these and translate them yourself, but we have no way to maintaining
+> those translations in po files. --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_4_40479ac2cfbca609f5f423e539a20ee0._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_4_40479ac2cfbca609f5f423e539a20ee0._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_4_40479ac2cfbca609f5f423e539a20ee0._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_4_40479ac2cfbca609f5f423e539a20ee0._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlXywgEUJjKArnORJR-5hmNFv8bTraXO1Y"
+ nickname="Ramsey"
+ subject="The same issue is happening with me"
+ date="2013-03-06T13:10:15Z"
+ content="""
+I use ikiwiki version 3.20130212 and tried xapian versions 1.2.5, 1.2.8, 1.2.13. All to no avail. The postlist.DB file is empty for me. I think that is the crux of the problem. Does anybody know why this could be?
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_5_397443138da276e11c2e9b9fa7b51406._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_5_397443138da276e11c2e9b9fa7b51406._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_5_397443138da276e11c2e9b9fa7b51406._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_5_397443138da276e11c2e9b9fa7b51406._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawljJoWAYhI55qm4hRLdzIOQBNMVB6fgrs8"
+ nickname="Ramsey"
+ subject="comment 5"
+ date="2013-03-06T22:42:54Z"
+ content="""
+Tried version xapian 1.2.3 and it did not work either. Can someone please help me debug this?
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_6_3cd94b9a141ebbf96fcba4ebe99e1453._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_6_3cd94b9a141ebbf96fcba4ebe99e1453._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_6_3cd94b9a141ebbf96fcba4ebe99e1453._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/Xapian_search:_empty_postlist_table/comment_6_3cd94b9a141ebbf96fcba4ebe99e1453._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~ojwb"
+ nickname="ojwb"
+ subject="comment 6"
+ date="2013-08-26T03:20:05Z"
+ content="""
+As a Xapian database is updated, changes are written out straight away to most of the tables, but the postlist changes are batched up in memory and only written to disk just before they are committed (or to free up memory during a large transaction). So the empty postlist table you're seeing means that some documents were indexed, but the indexer stopped running before anything was committed. By default, there's an auto-commit every 10000 documents added, removed, or changed, so it presumably managed to process less than 10000 documents.
+
+The issue with 1.2.5 RPMs may be down to there being two versions of the Xapian perl bindings, both of which claim to be Search::Xapian and both of which have been packaged up as RPMs. For Xapian 1.2.x, you probably want to use the XS bindings (perl-Search-Xapian) not those generated with SWIG (xapian-bindings-perl). The SWIG-generated ones are aimed to replace the XS ones, but in 1.2.x they're not really ready for prime time. If your perl bindings are described with a 4 coponent version (e.g. 1.2.15.0) then you should be good; if it's 3 components (e.g. 1.2.15) then you probably want the other ones.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_6_ba76f7f8ef46fb58d36fb2cda4b242ff._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_6_ba76f7f8ef46fb58d36fb2cda4b242ff._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_6_ba76f7f8ef46fb58d36fb2cda4b242ff._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_6_ba76f7f8ef46fb58d36fb2cda4b242ff._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmKyeW2G4jjSdnL1m6kPPtAiGFUBsnYCfY"
+ nickname="FName"
+ subject="Am i the only one using MacPorts and Ikiwiki together?"
+ date="2013-08-10T23:45:40Z"
+ content="""
+This exact same problem has been stopping me from using Ikiwiki locally. I'm still able to push to remote Ikiwiki instance. But I'd like to push it to local repo and have the website built locally first so I can confirm everything runs fine. Everytime I try to build it locally, i have this exact same problem.
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_7_e4f7c1da09571085070275e12c09b12f._comment ikiwiki-3.20130904.1ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_7_e4f7c1da09571085070275e12c09b12f._comment
--- ikiwiki-3.20130212ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_7_e4f7c1da09571085070275e12c09b12f._comment 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/build_error:_Cannot_decode_string_with_wide_characters/comment_7_e4f7c1da09571085070275e12c09b12f._comment 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="schmonz"
+ ip="198.228.228.165"
+ subject="MacPorts still hasn't updated past 2011 ikiwiki with a seriously old Perl"
+ date="2013-08-11T01:40:23Z"
+ content="""
+According to [this page](http://www.macports.org/ports.php?by=name&substr=Ikiwiki) nothing has changed in MacPorts' ikiwiki build. Have you tried contacting the package maintainer or, failing that, submitting an update request to the relevant mailing list?
+
+If MacPorts is this behind the times, it doesn't make sense to me to recommend it to anyone. But I'm biased in favor of pkgsrc, so I don't feel comfortable editing the [[tips/ikiwiki on Mac OS X]] page to promote the thing I happen to prefer... but pkgsrc has Perl 5.18, and I keep pkgsrc's ikiwiki package updated at every release. --[[schmonz]]
+"""]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/copyright_and_license_template_variables___40__where_are_they_set__63____41__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/copyright_and_license_template_variables___40__where_are_they_set__63____41__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/copyright_and_license_template_variables___40__where_are_they_set__63____41__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/copyright_and_license_template_variables___40__where_are_they_set__63____41__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,13 @@
+The default template includes TMPL_IF LICENSE and TMPL_IF COPYRIGHT, but I can't figure out where these are set.
+
+This page seems to indicate they are created by the [[plugins/meta]] plugin:
+
+[[Default Content for Copyright and License|plugins/contrib/default_content_for___42__copyright__42___and___42__license__42__/]]
+
+Is this true? It just seems a little odd that the default template contains variables that are set by a non-default plugin, so I just wanted to confirm that.
+
+Thanks!
+
+--[[users/acodispo]]
+
+> It is true. --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/debconf13_ikiwiki_bof.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/debconf13_ikiwiki_bof.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/debconf13_ikiwiki_bof.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/debconf13_ikiwiki_bof.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,108 @@
+There has been a meeting of people interested in ikiwiki
+[[during debconf13|http://penta.debconf.org/dc13_schedule/events/1060.en.html]]
+on 2013-08-11. Videos of the event are linked there for download, or
+[[can be viewed online|http://www.irill.org/videos/debconf13/ikiwiki_BoF.webm]].
+
+Summary
+=======
+
+Ikiwiki's state and development
+-------------------------------
+
+Ikiwiki has reached a stable state with a working ecosystem, with the majority
+of changes being minor adaptions and bugfixes these days.
+
+It is unlikely that there will be a major overhaul any time soon.
+
+If incompatible changes are to be made, that might warrant a 4.$DATE
+transition, especially given that the [[ikiwiki-transition]] mechanism has not
+been used for some time. Potential changes for such a transition will be
+discussed (see below).
+
+Names of pages and links
+------------------------
+
+Several of [[the issues chrysn deals with|users/chrysn]] revolve about the
+differences betwen a page's name, its title, the name of source and destination
+page, how they are converted, and which is used when.
+
+chrysn has starting to draft a page on [[plugins/write/names]], and
+would appreciate review and comments.
+
+Themability
+-----------
+
+The default theme of ikiwiki is more appealing to the people who are expected
+to run an ikiwiki setup; end users with Web 2.$current_minor_version
+expectations often don't have there tastes served well.
+
+[[Recently|version 3.20130518]], templates have become more theming friendly,
+but for the general case still require the theme to be known to mainline
+ikiwiki, lest generic templates diverge. A planned feature is generalized
+sidebars, where more places inside the template can be filled using the same
+mechanism as currently used in the [[pluginssidebar]] pluin, but changes there
+require a complete rebuild. (Not worse than the rebuilds required when changing
+the main templates, but it would be more tempting to frequently change them.)
+
+Examples of fancy ikiwiki themes have been brought up:
+
+ * https://www.gresille.org/
+ * https://nos-oignons.net/
+ * http://www.rezine.org/accueil/association/
+ * https://cas-libres.poivron.org/
+
+A generalized version of the [[bootstrap|http://twitter.github.com/bootstrap/]]
+[[theme|theme market]] would be appreciated, as the current one is targeted
+towards a particular installation.
+
+Performance
+-----------
+
+Rebuilding many pages takes considerable time, especially when sidebars are
+changed.
+
+A faster way to use the page index (eg. sqlite) would help speeding up the
+usual rebuilds, but would not help speeding up massive rebuilds.
+
+RDF backend
+-----------
+
+On the priority level "crazy ideas", it was discussed to augment or finally
+change the index to an RDF triple collection. Statements would be extracted
+from the source pages in the scan hook, and form a triple store. Pagespecs
+would be resolved to SPARQL queries against that database; also the
+[[todo/structured page data]] fields could be addressed with this.
+
+Optimizations are still possible, even more generally, for example with
+dependencies on other pages' title:
+
+* page A sets its own title with `\[[!meta title="the A page"]]`, which results
+ in the statement '`<./page_A> dc:title "the A page" .`'.
+
+* page B uses some kind of auto-titling link to page A: `\[[~|page A]]`, which
+ queries for '`<./page_A> dc:title ?a`'.
+
+* When page B is built, it is stored that it depends on statements involving
+ the term `<./page_A>`, and the current hash value of all statements about
+ that term. (Those will be computed for all observed statements at scan time.
+ Pages that use more complex queries might not be able to list all their
+ dependencies.)
+
+ Also, the queries and query results executing during building page B are
+ stored in a separate cache.
+
+* When some other page starts linking to page A, the first cache is
+ invalidated, as now there are more statements on the subject of
+ '`<./page_A>`', so page B might need to be rebuilt. Before that is done, its
+ cached queries are executed. If their results did not change, page B does not
+ need any further action.
+
+vCard support
+-------------
+
+The topic of combining ikiwiki with
+[[calypso|http://keithp.com/blogs/calypso/]] was brought up
+[[in another event|http://penta.debconf.org/dc13_schedule/events/1087.en.html]]
+during the same DebConf.
+
+For further details, see [[todo/vCard rendering]].
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/google_openid_broken__63__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/google_openid_broken__63__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/google_openid_broken__63__.mdwn 2013-02-13 09:08:31.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/google_openid_broken__63__.mdwn 2013-09-04 22:10:53.000000000 +0000
@@ -4,6 +4,9 @@
> This seems to work fine if you use the profile directly as an OpenID. It doesn't seem to work with delegation. From that I can see, this is a deliberate decision by Google for security reasons. See the response [here](http://groups.google.com/group/google-federated-login-api/browse_thread/thread/825067789537568c/23451a68c8b8b057?show_docid=23451a68c8b8b057). -- [[Will]]
+### adding the GMail OpenID as an admin is unhandy
+Adding the non-human-friendly OpenID from Gmail as an admin for ikiwiki (if you haven't set up a profile with a readabe URL) is unhandy; first, you need to discover the URL, for example, by making a web edit with it (like me [here](http://source.ikiwiki.branchable.com/?p=source.git;a=search;s=https://www.google.com/accounts/o8/id%3Fid%3DAItOawl3JW_Ow4xMqj98Ig1vwGx_AnjUSsgwE8E;st=author)), and then copy the URL to ikiwiki.setup. --Ivan Z.
+
## historical discussion
when I login via to this wiki (or ours) via Google's OpenID, I get this error:
diff -Nru ikiwiki-3.20130212ubuntu1/doc/forum/web_service_API__44___fastcgi_support.mdwn ikiwiki-3.20130904.1ubuntu1/doc/forum/web_service_API__44___fastcgi_support.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/forum/web_service_API__44___fastcgi_support.mdwn 2013-02-13 09:08:31.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/forum/web_service_API__44___fastcgi_support.mdwn 2013-09-04 22:10:52.000000000 +0000
@@ -11,3 +11,8 @@
Second, and in a way related, I've been mooting hacking fastcgi support into ikiwiki. Essentially one ikiwiki.cgi process would persist and serve CGI-ish requests on stdin/stdout. The initial content-scanning and dependency generation would happen once and not need to be repeated for future requests. Although, all state-changing operations would need to be careful to ensure the in-memory models were accurate. Also, I don't know how suited the data structures would be for persistence, since the current model is build em up, throw em away, they might not be space-efficient enough for persistence.
If I did attempt this, I would want to avoid restructuring things in a way which would impair ikiwiki's core philosophy of being a static compiler. -- [[Jon]]
+
+> This is quite interesting! There is a related discussion about FastCGI
+> support (and therefore better support for Nginx, for example) in
+> [[todo/fastcgi_or_modperl_installation_instructions/]]... --
+> [[anarcat]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/git.mdwn ikiwiki-3.20130904.1ubuntu1/doc/git.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/git.mdwn 2013-02-13 09:08:24.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/git.mdwn 2013-09-04 22:10:46.000000000 +0000
@@ -13,7 +13,7 @@
The gitweb is [here](http://source.ikiwiki.branchable.com/?p=source.git;a=summary).
Commits to this git repository are fed into [KGB](http://kgb.alioth.debian.org/)
-for transmission to the #ikiwiki irc channel.
+for transmission to the #ikiwiki irc channel. See also: [[spam_fighting]]
## personal git repositories
@@ -43,7 +43,7 @@
* [[ikiplugins|DavidBremner]] `git://pivot.cs.unb.ca/git/ikiplugins.git`
* [[jonas|JonasSmedegaard]] `git://source.jones.dk/ikiwiki-upstream`
* [[arpitjain]] `git://github.com/arpitjain11/ikiwiki.git`
-* [[chrysn]] `git://github.com/github076986099/ikiwiki.git`
+* [[chrysn]] `git://prometheus.amsuess.com/ikiwiki`
* [[simonraven]] `git://github.com/kjikaqawej/ikiwiki-simon.git`
* [[schmonz]] `git://github.com/schmonz/ikiwiki.git`
* [[will]] `http://www.cse.unsw.edu.au/~willu/ikiwiki.git`
@@ -76,6 +76,8 @@
* [[ttw]] `git://github.com/ttw/ikiwiki.git`
* [[anarcat]] `git://src.anarcat.ath.cx/ikiwiki`
* anderbubble `git://civilfritz.net/ikiwiki.git`
+* frioux `git://github.com/frioux/ikiwiki`
+* llipavsky `git://github.com/llipavsky/ikiwiki`
## branches
diff -Nru ikiwiki-3.20130212ubuntu1/doc/ikiwiki/directive/inline.mdwn ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/directive/inline.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/ikiwiki/directive/inline.mdwn 2013-02-13 09:08:39.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/directive/inline.mdwn 2013-09-04 22:11:01.000000000 +0000
@@ -11,7 +11,9 @@
[[SubPage]] of "blog") will be part of the blog, and the newest 10
of them will appear in the page. Note that if files that are not pages
match the [[PageSpec]], they will be included in the feed using RSS
-enclosures, which is useful for podcasting.
+enclosures, which is useful for simple [[!iki podcast desc=podcasting]];
+for fuller-featured podcast feeds, enclose media files in blog posts
+using [[meta]].
The optional `rootpage` parameter tells the wiki that new posts to this
blog should default to being [[SubPages|SubPage]] of "blog", and enables a
diff -Nru ikiwiki-3.20130212ubuntu1/doc/ikiwiki/directive/meta.mdwn ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/directive/meta.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/ikiwiki/directive/meta.mdwn 2013-02-13 09:08:40.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/directive/meta.mdwn 2013-09-04 22:11:01.000000000 +0000
@@ -136,6 +136,12 @@
[[!iki plugins/htmlscrubber desc=htmlscrubber]] plugin is enabled, since it can be used to
insert unsafe content.
+* enclosure
+
+ Specifies a link to a file to be rendered as an "enclosure" in
+ RSS/Atom feeds (and a plain old link in HTML). Useful for
+ [[!iki podcast desc=podcasting]].
+
* redir
Causes the page to redirect to another page in the wiki.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/ikiwiki/directive/tag/discussion.mdwn ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/directive/tag/discussion.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/ikiwiki/directive/tag/discussion.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/directive/tag/discussion.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,13 @@
+# Tags in HTML pages
+
+http://rhombus-tech.net is an ikiwiki site where the hardware development is expanding: there are now four hardware projects each of which has its own news page. For convenience (putting in images for example), the pages have to use HTML not markdown or any other non-HTML format.
+
+However as there are quite a lot of them it would make sense to have an overview page saying "news reports", and that page to be auto-generated because every individual news page is tagged.
+
+... except the news pages are written in HTML, not any markup language into which a tag can be placed.
+
+question: what is the directive which allows an HTML page to have embedded within it a markup "tag"?
+
+> You can use the tag directive in `.html` pages, just like in `.mdwn` pages. This is if you're using
+> the default html plugin. If you instead use the rawhtml plugin, ikiwiki just copies your html files
+> and directives in them won't work. --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/ikiwiki/pagespec.mdwn ikiwiki-3.20130904.1ubuntu1/doc/ikiwiki/pagespec.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/ikiwiki/pagespec.mdwn 2013-02-13 09:08:39.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/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/doc/ikiwikiusers.mdwn ikiwiki-3.20130904.1ubuntu1/doc/ikiwikiusers.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/ikiwikiusers.mdwn 2013-02-13 09:08:25.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/ikiwikiusers.mdwn 2013-09-04 22:10:46.000000000 +0000
@@ -19,7 +19,7 @@
========================
* [This wiki](http://ikiwiki.info) (of course!)
-
+* [NetBSD wiki](http://wiki.netbsd.org)
* The [GNU Hurd](http://www.gnu.org/software/hurd/)
* [DragonFly BSD](http://www.dragonflybsd.org/)
* [Monotone](http://wiki.monotone.ca/)
@@ -87,6 +87,10 @@
* [The Open TV White Space Project](http://opentvws.org)
* [The RS-232 Club](http://rs232club.org)
* [FusionInventory project](http://www.fusioninventory.org)
+* FabLab Deventer i.o.
+* [Börn og tónlist](http://bornogtonlist.net/) - an Icelandic open-content site, primarily for kindergarten teachers, about music and music-related activites with children. Migrated from MediaWiki to IkiWiki in June 2013. Heavily changed appearance with only minimal changes to page.tmpl. Also its sister site [Leikur að bókum](http://leikuradbokum.net), about children's books in a kindergarten/pre-school context.
+* [Réseaulibre.ca](http://wiki.reseaulibre.ca) - a mesh project in Montréal, most data is stored in the wiki, including IP address allocation and geographic data. Features map ([[plugins/osm]]) integration.
+* [Foufem](http://foufem.orangeseeds.org/) - Foufem, a feminist hackerspace
Personal sites and blogs
========================
@@ -187,3 +191,8 @@
* [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream.
* [[LucaCapello]]'s [homepage](http://luca.pca.it)
* [[Martín Ferrari's homepage|http://tincho.org/]] and [[blog|http://blog.tincho.org/]]
+* [WikiAtoBR](http://wiki.hi.ato.br) Open, free and annoymous wiki. No need for account registering and login. It is Brazilian so it is in Portuguese.
+* [Manifesto](http://manifesto.hi.ato.br) Open, free and annoymous blog. No need for account registering and login. It is Brazilian so it is in Portuguese.
+ * [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri
+* Julien Lefrique's [homepage](http://julien.lefrique.name/), hosted on [GitHub pages](https://github.com/jlefrique/jlefrique.github.com) with CGI disabled
+* [Anarcat's homepage](http://anarcat.ath.cx/) - with a custom [[theme|theme_market]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/index.mdwn ikiwiki-3.20130904.1ubuntu1/doc/index.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/index.mdwn 2013-02-13 09:08:24.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/index.mdwn 2013-09-04 22:10:46.000000000 +0000
@@ -2,7 +2,8 @@
suitable for publishing on a website. Ikiwiki stores pages and history in a
[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
There are many other [[features]], including support for
-[[blogging|blog]], as well as a large array of [[plugins]].
+[[blogging|blog]] and [[podcasting|podcast]], as well as a large
+array of [[plugins]].
[[!template id=links]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/logo.mdwn ikiwiki-3.20130904.1ubuntu1/doc/logo.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/logo.mdwn 2013-02-13 09:08:25.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/logo.mdwn 2013-09-04 22:10:46.000000000 +0000
@@ -57,3 +57,13 @@
A simplified (442 byte) plain SVG version of the ikiwiki favicon.
Contributed by [[JasonBlevins]]
+
+*
-[[!img monochrome_small.png align==left]] The **monochrome** theme,
+[[!img monochrome_small.png align=left]] The **monochrome** theme,
based on [[Jon]]'s homepage design.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/tips/DreamHost.mdwn ikiwiki-3.20130904.1ubuntu1/doc/tips/DreamHost.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/tips/DreamHost.mdwn 2013-02-13 09:08:36.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/tips/DreamHost.mdwn 2013-09-04 22:10:58.000000000 +0000
@@ -176,6 +176,7 @@
export C_INCLUDE_PATH=YOUR_INSTALL_PATH_HERE/include/
export LIBRARY_PATH=YOUR_INSTALL_PATH_HERE/lib/
+ export LD_LIBRARY_PATH=YOUR_INSTALL_PATH_HERE/lib/
Then you should be able to install the module, and it'll be faster.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn ikiwiki-3.20130904.1ubuntu1/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/tips/Hosting_Ikiwiki_and_master_git_repository_on_different_machines.mdwn 2013-07-22 20:38:20.000000000 +0000
@@ -0,0 +1,139 @@
+[[!meta title="Hosting Ikiwiki with a master git repository on a remote machine"]]
+
+This tutorial explains how to set up a wiki such that:
+
+- the machine running Ikiwiki is not the same as the one hosting the git repository;
+- changes can be done using CGI;
+- changes can be done using git (using ssh protocol).
+
+This configuration may be useful when:
+
+- you do not want (or cannot) connect to the machine hosting your wiki using
+ `git` or `ssh`;
+- you do not want (or cannot) publish web content on the machine hosting you
+ remotely accessible git repository.
+
+I assume the [[rcs]] used is [[rcs/git]], but it might be done for other rcs.
+
+# Similar and related tips and problems
+
+- [[http://www.icanttype.org/blog/ikiwiki_git_remote_repo/]] Similar to what I
+ am describing, excepted that you must be able to connect to the machine
+ hosting Ikiwiki using ssh.
+- [[forum/How_to_specify_repository_is_on_a_remote_host__63__]] My solution
+ solves the problem described here, excepted that svn is used there, and in
+ the comments, Joey advice not to do this with svn.
+- [[forum/how_to_setup_ikiwiki_on_a_remote_host]] My solution might answer this
+ problem.
+
+# Overview
+
+By default, when creating a wiki, Ikiwiki creates and uses two repositories: a
+bare repository, and a « slave » repository, used as the source to render the
+wiki. All of these are on the same machine.
+
+Instead of having the bare repository hosted on the same machine, we will host
+it on a remote machine, and tell Ikiwiki to use it instead of its local one. We
+will also ensure that the wiki is rendered whenever a commit is done to the git
+repository.
+
+# Conventions
+
+- We are building a wiki called *SITE*.
+- The machine running Ikiwiki and a web server is called the *Ikiwiki machine*.
+- The machine hosting the git repository is called the *git machine*. Users can
+ make git pull and push to this machine.
+
+# Let's go!
+
+## Creating ssh keys on the Ikiwiki machine
+
+- Create a pair of ssh keys, not password-protected (as they will be used by
+ script). Let's call them `id_SITE` and `id_SITE.pub`. These keys will be used
+ by the ikiwiki machine to connect to the git machine.
+
+## Creating and setting up a repository on the git machine
+
+- Create a repository `SITE.git` on the git machine (using `git init --bare`),
+ and ensure that public key `id_SITE.pub` can pull from and push to this
+ repository (using `~/.ssh/config` or by setting the right permissions on
+ gitolite or gitosis).
+
+## Creating the wiki on the ikiwiki machine
+
+- Create the wiki following [[the regular procedure|setup]]. You should have,
+ among others, a directory `SITE.git`, being the master git repository, and a
+ directory `SITE`, clone of `SITE.git`, used as source directory to render the
+ wiki.
+- Ensure that your web server can serve the rendered wiki, and that changes can
+ be done with CGI.
+
+## Configuring the wiki on the wiki machine so that it uses the repository of the git machine
+
+- Configure ssh so that it uses the ssh key `id_SITE` to connect to the git
+ michine: add the following lines to file `~/.ssh/config` on the ikiwiki
+ machine:
+
+ Host server.name.of.the.git.machine
+ User git-machine-user
+ IdentityFile ~/.ssh/id_SITE
+
+- Configure the local copy `SITE` of the wiki (on the ikiwiki machine) to use
+ the remote git repository instead of the local `SITE.git`. To do so, in the
+ file `SITE/.git/config`, replace the lines:
+
+ [remote "origin"]
+ url = /path/to/SITE.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+
+ by the lines:
+
+ [remote "origin"]
+ url = git-machine-user@server.name.of.the.git.machine:SITE.git
+ fetch = +refs/heads/*:refs/remotes/origin/*
+
+- In this repository (`SITE`), run `git pull` and `git push` to ensure that
+ everything works fine. It *works fine* when you will be able to run `git
+ pull` and `git push` without user interaction.
+
+- Disable the `post-update` hook in ikiwiki: it is used if the git commits are
+ done on this machine, which is no longer the case. To do so, in file
+ `SITE.setup`, comment the line:
+
+ git_wrapper => '/path/to/SITE.git/hooks/post-update',
+
+- Tell Ikiwiki to push to the ikiwiki machine when a commit is done by the web
+ (CGI). To do so, in file `SITE.setup`, add the line:
+
+ git_wrapper_background_command => 'git push',
+
+- Enable plugin [[pingee|http://ikiwiki.info/plugins/pingee/]]. It allows git
+ (on the git machine) to tell ikiwiki to update and rebuild the wiki when
+ commits are done on the git repository, using only an http connection. To do
+ so, add `pingee` to the list of enabled plugins (variable `add_plugins` in
+ file `SITE.setup`).
+
+- Rebuild the wiki (since you chaned the setup file `SITE.setup`).
+
+ ikiwiki --setup SITE.setup --rebuild --verbose
+
+## Configure the git repository (on the git machine) to update the wiki after a push
+
+- Add in the `post-receive` hook (file `SITE.git/hooks/post-receive`):
+
+ wget "http://WIKI-URL/ikiwiki.cgi?do=ping" -O /dev/stdout
+
+ If your wiki is password protected, use:
+
+ wget "http://LOGIN:PASSWORD@WIKI-URL/ikiwiki.cgi?do=ping" -O /dev/stdout
+
+
+## Going further
+
+- *Web server on a third machine* It should be possible to use a third machine
+ to host the web server. A hook might be used to export the rendered wiki on
+ this server, or use a nfs repository as the destination repository of
+ ikiwiki. However, allowing web modifications (using CGI) might be tricky…
+- *Using [[gitolite|https://github.com/sitaramc/gitolite]] to manage
+ repositories on the git machine* Simply replace the manipulations of git on
+ the git machine by the corresponding manipulations using gitolite.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/tips/dot_cgi.mdwn ikiwiki-3.20130904.1ubuntu1/doc/tips/dot_cgi.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/tips/dot_cgi.mdwn 2013-02-13 09:08:36.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/tips/dot_cgi.mdwn 2013-09-04 22:10:58.000000000 +0000
@@ -15,7 +15,10 @@
## apache 2
-* Edit /etc/apache2/apache2.conf and add a line like this:
+* Make sure the cgi module is loaded. (Ie, `a2enmod cgi`)
+
+* Edit /etc/apache2/apache2.conf (or /etc/apache2/mods-available/mime.conf)
+ and add a line like this:
AddHandler cgi-script .cgi
@@ -26,8 +29,6 @@
Or, if you've put it in a `~/public_html`, edit
`/etc/apache2/mods-available/userdir.conf`.
- You may also want to install some dependencies to enable CGI in apache2 setup as: `libcgi-formbuilder-perl` and `libcgi-session-perl`.
-
* If your wiki is in `~/public_html` and does not appear when you enter the URL given by the installer, check that you have
the userdir mod enabled (there should be simlinks to userdir.load and userdir.conf in /etc/apache2/modes-enabled). If not,
run `a2enmod userdir` and reload apache2.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn ikiwiki-3.20130904.1ubuntu1/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn 2013-02-13 09:08:36.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/tips/importing_posts_from_wordpress/ikiwiki-wordpress-import.mdwn 2013-09-04 22:10:58.000000000 +0000
@@ -1,9 +1,244 @@
[[!meta title="ikiwiki-wordpress-import"]]
+I converted the script to Perl. The new version gets your name and email automatically from your git config, converts the body of your posts to markdown, and also imports comments. More importantly it works with the latest wordpress, which the python version does not. Note that it's still not 100% perfect and I intend to make a few modifications still, but they will require access to the mysql database and that may render the script useless to some users.
+
+-----
+[[!format perl '''
+#!/usr/bin/env perl
+
+use 5.16.1;
+use warnings;
+
+use XML::Simple;
+use DateTime::Format::Strptime;
+use HTML::WikiConverter;
+use LWP::UserAgent;
+use Try::Tiny;
+use Digest::MD5 'md5_hex';
+
+die "usage: $0 import_file subdir [branch] | git-fast-import"
+ unless @ARGV == 2 or @ARGV == 3;
+
+chomp(my $name = qx(git config --get user.name));
+chomp(my $email = qx(git config --get user.email));
+
+my ($file, $subdir, $branch) = @ARGV;
+
+my %events;
+
+POST:
+for my $x (grep $_->{'wp:status'} eq 'publish', @{XMLin($file)->{channel}{item}}) {
+ state $date_parser = DateTime::Format::Strptime->new(
+ pattern => '%F %T',
+ time_zone => 'UTC',
+ );
+
+ my $stub = $x =~ m<([^/]+)\/$>
+ ? $1
+ : lc($x->{title} =~ s/\W/-/gr =~ s/-$//r)
+ ;
+
+ my $guid = $x->{guid}{content} || $x->{link};
+ utf8::encode($x->{title});
+ my $msg = qq($x->{title}\n\nfrom WordPress [$guid]);
+ my $timestamp = $date_parser
+ ->parse_datetime($x->{'wp:post_date_gmt'})
+ ->epoch;
+
+ my $c = $x->{category};
+ $c = [$c] if ref $c && ref $c ne 'ARRAY';
+
+ my $content =
+ sprintf(qq([[!meta title="%s"]]\n), $x->{title} =~ s/"/\\"/gr) .
+ convert_content($x->{'content:encoded'}) . "\n\n" .
+ join("\n",
+ map '[[!tag ' . s/ /-/r . ']]',
+ keys %{
+ +{
+ map { $_ => 1 }
+ grep $_ ne 'uncategorized',
+ map $_->{nicename},
+ @$c
+ }
+ }
+ );
+
+ $events{$timestamp} = join "\n",
+ "commit refs/heads/$branch",
+ "committer $name <$email> $timestamp +0000",
+ 'data <<8675309',
+ $msg,
+ '8675309',
+ "M 644 inline $subdir/$stub.mdwn",
+ 'data <<8675309',
+ $content,
+ '8675309'
+ ;
+
+ get_comments($x->{link}, "$subdir/$stub")
+ if $x->{'wp:post_type'} eq 'post'
+}
+
+sub get_comments {
+ my ($url, $dir) = @_;
+
+ state $ua = LWP::UserAgent->new;
+
+ my $content = $ua->get("$url/feed")->decoded_content;
+ my $first;
+ my $bail;
+ my $decoded =
+ try { XMLin($content, ForceArray => ['item']) }
+ catch { $bail = 1 };
+
+ return if $bail;
+
+ COMMENT:
+ for my $x (@{$decoded->{channel}{item}}) {
+ my $date = $x->{pubDate};
+ $date =~ s/^\S+\s//;
+ $date =~ s/\s\S+$//;
+
+ #ghetto
+ $date =~ s/Jan/01/;
+ $date =~ s/Feb/02/;
+ $date =~ s/Mar/03/;
+ $date =~ s/Apr/04/;
+ $date =~ s/May/05/;
+ $date =~ s/Jun/06/;
+ $date =~ s/Jul/07/;
+ $date =~ s/Aug/08/;
+ $date =~ s/Sep/09/;
+ $date =~ s/Oct/10/;
+ $date =~ s/Nov/11/;
+ $date =~ s/Dec/12/;
+
+ state $date_parser = DateTime::Format::Strptime->new(
+ pattern => '%d %m %Y %T',
+ time_zone => 'UTC',
+ );
+
+ my $datetime = $date_parser
+ ->parse_datetime($date);
+
+ my $timestamp = $datetime->epoch;
+ my $formatted_date = "$timestamp";
+
+ my $msg = 'Added a comment';
+ my $content = convert_content($x->{'content:encoded'});
+ utf8::encode($x->{'dc:creator'});
+
+ $events{$timestamp} = join "\n",
+ "commit refs/heads/$branch",
+ # still need to get email address
+ "committer $x->{'dc:creator'} <$x->{'dc:creator'}> $timestamp +0000",
+ 'data <<8675309',
+ $msg,
+ '8675309',
+ "M 644 inline " . unique_comment_location($dir, $content),
+ 'data <<8675309',
+
+ <<"COMMENT",
+[[!comment format=mdwn
+ username="$x->{'dc:creator'}"
+ date="$formatted_date"
+ content="""
+$content
+"""]]
+COMMENT
+ '8675309'
+ ;
+ }
+}
+
+say $events{$_} for sort keys %events;
+
+sub convert_content {
+ my $body = shift;
+
+ utf8::encode($body);
+
+ state $converter = HTML::WikiConverter->new(
+ dialect => 'Markdown',
+ link_style => 'inline',
+ unordered_list_style => 'dash',
+ image_style => 'inline',
+ image_tag_fallback => 0,
+ );
+
+ # I know I know you can't parse XML with regular expressions. Go find a real
+ # parser and send me a patch
+ my $in_code = 0;
+
+ my $start_code = qr(]*>);
+ # (?:) is a no op but keeps ikiwiki from breaking my script
+ my $end_code = qr(
]*>)()g;
+ $body =~ s()(
)g;
+
+ my @tokens =
+ map {; split qr[(?=)] }
+ map {; split qr[
\K] }
+ split /\n\n/,
+ $body;
+
+ my @new_tokens;
+ for my $t (@tokens) {
+ if (
+ ($in_code && $t !~ $end_code) ||
+ ($t =~ $start_code && $t =~ $end_code)
+ ) {
+ # do nothing
+ } elsif ($t =~ $start_code) {
+ $in_code = 1;
+ } elsif ($t =~ $end_code) {
+ $in_code = 0;
+ } else {
+ die "$t !!! '$1'" if $t =~ m/&([^;\s]+);/ && $1 !~ /[lg]t/;
+
+ $t = "$t
"
+ }
+ push @new_tokens, $t
+ }
+
+ $converter->html2wiki(join "\n\n", @new_tokens)
+}
+
+sub unique_comment_location {
+ my ($dir, $content) = @_;
+
+ utf8::encode($content);
+ my $md5 = md5_hex($content);
+
+ my $location;
+ my $i = 0;
+ do {
+ $i++;
+ $location = "$dir/comment_${i}_$md5._comment";
+ } while -e $location;
+
+ return $location
+}
+
+''']]
+-----
+
I modified the script a bit so categories and tags would actually show up in the output file.
-----
-
+[[!format '''
#!/usr/bin/env python
"""
@@ -110,7 +345,7 @@
else:
main(*sys.argv[1:])
-
+''']]
-----
I have another version of the script, which uses the `timestamp` from the script, and inserts that as a \[[!meta date="foodate"]]. I'm posting it here just in case I happen to be doing something to the httpd.
@@ -118,7 +353,7 @@
(Hopefully I've escaped everything properly; if I missed something, check the source.)
-----
-
+[[!format '''
#!/usr/bin/env python
"""
@@ -223,7 +458,7 @@
else:
main(*sys.argv[1:])
-
+''']]
-----
diff -Nru ikiwiki-3.20130212ubuntu1/doc/tips/mailman_subscription_form.mdwn ikiwiki-3.20130904.1ubuntu1/doc/tips/mailman_subscription_form.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/tips/mailman_subscription_form.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/tips/mailman_subscription_form.mdwn 2013-07-11 02:04:36.000000000 +0000
@@ -0,0 +1,10 @@
+One can think about implementing "[[Mailman integration]]" or something, but I find that rather overdoing it. Mailman is simple enough that you can add a clean subscription form to your ikiwiki site in seconds, just add:
+
+~~~~
+
+~~~~
+
+To your site and voilà, you are done! No more scary mailman subscription form! (Thanks to [[bgm]] for that trick!) --[[anarcat]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/tips/migrating_podcast_to_ikiwiki.mdwn ikiwiki-3.20130904.1ubuntu1/doc/tips/migrating_podcast_to_ikiwiki.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/tips/migrating_podcast_to_ikiwiki.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/tips/migrating_podcast_to_ikiwiki.mdwn 2013-07-22 00:11:22.000000000 +0000
@@ -0,0 +1,19 @@
+First, get familiar with [[howto avoid flooding aggregators]].
+
+## Into ikiwiki, from another CMS
+
+7. Copy content into ikiwiki, taking care to:
+ 7. Match article paths to preserve old permalinks.
+ 7. Match enclosure paths (or use redirects) to preserve old URLs.
+ 7. Match titles, post dates, and guids with `\[[!meta]]`.
+ 7. Match feed paths with permanent redirects from old Atom
+ location to `index.atom` (likewise for RSS).
+ 7. `\[[!inline]]` the articles.
+7. Rerun `ikiwiki --setup`.
+
+## Within ikiwiki, from basic to fancy
+
+7. Exclude media files from `\[[!inline]]`.
+7. Replace direct `\[[WikiLinks]]` to media files with
+ `\[[!meta enclosure="WikiLink/to/media.mp3"]]`.
+7. Rerun `ikiwiki --setup`.
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/BTS_integration.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/BTS_integration.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/BTS_integration.mdwn 2013-02-13 09:08:29.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/BTS_integration.mdwn 2013-09-04 22:10:50.000000000 +0000
@@ -4,7 +4,7 @@
--[[JoshTriplett]]
-[scmbug](http://www.mkgnu.net/?q=scmbug) might help here. --[[JoshTriplett]]
+[scmbug](http://www.mkgnu.net/scmbug) might help here. --[[JoshTriplett]]
[[!tag soc]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn 2013-01-23 23:53:02.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/Calendar:_listing_multiple_entries_per_day_.mdwn 2013-09-04 22:10:48.000000000 +0000
@@ -90,3 +90,5 @@
}
.popup:hover .balloon,
.popup:focus .balloon {
+
+> [[applied|done]] --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/Fenced_code_blocks___40__from_GitHub_Flavored_Markdown__41__.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,44 @@
+GitHub's flavor of markdown adds fenced code blocks, delimited by triple-backquotes, like this:
+
+ ```
+ code
+ more code
+ ```
+
+That syntax proves quite a bit more convenient in many cases, because it doesn't require modifying every line of the code block to add indentation. Please consider adding optional support for this in ikiwiki. Please also consider turning it on by default for new wikis, though not for existing wikis since it could *potentially* break backward compatibility with existing content.
+
+> I don't think that's an official markdown feature, although it might be available
+> as an extension in some markdown library or other -- possibly one of the ones
+> supported by ikiwiki.
+>
+> However, aside from compatability, ikiwiki already provides a way to do it that does not
+> require indenting the code: The [[ikiwiki/directive/format]] directive. Which has the benefit of
+> also telling it what kind of code it is, so it can syntax highlight it. Example:
+
+[[!format haskell """
+main :: IO ()
+main = forever $
+ putStrLn "hello, world!"
+"""]]
+
+> --[[Joey]]
+
+> > It is not a standard feature (as much as Markdown is [[standardized|Track_Markdown_Standardisation_Efforts]]...) But it does allow for [syntax hilightning](https://help.github.com/articles/github-flavored-markdown) too, just tag the language name after the backticks. It *seems* that Discount supports github-style backtick format (as well as Pandoc `~~~~` format) but doesn't allow the keyword argument.
+> >
+> > I strongly support this feature. --[[anarcat]]
+> >
+> > In fact, it turns out that it already works here!
+> >
+> > ~~~~
+> > this is a pandoc-style fenced in code block
+> > this is another line
+> > ~~~~
+> >
+> > github-style backticks, however, do not add a wrapping `` block for some reason:
+> >
+> > ```
+> > this is a github-style fenced in code block
+> > this is another line
+> > ```
+> >
+> > ... maybe a bug in Discount... --[[anarcat]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/Restrict_formats_allowed_for_comments.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/Restrict_formats_allowed_for_comments.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/Restrict_formats_allowed_for_comments.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/Restrict_formats_allowed_for_comments.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,99 @@
+I want to write my blog posts in a convenient format (Emacs org mode)
+but do not want commenters to be able to use this format for security
+reasons. This patch allows to configure which formats are allowed for
+writing comments.
+
+Effectively, it restricts the formats enabled with add_plugin to those
+mentioned in comments_allowformats. If this is empty, all formats are
+allowed, which is the behavior without this patch.
+
+The patch can be pulled from my repo ([gitweb](https://rtime.felk.cvut.cz/gitweb/sojka/ikiwiki.git/commitdiff/c42fd7d7580d081f3e3f624fd74219b0435230f6?hp=bfc9dc93c9f64a9acfff4683b69995d5a0edb0ea))
+
+ git pull git://rtime.felk.cvut.cz/sojka/ikiwiki.git restrict-comment-formats
+---
+
+
+From c42fd7d7580d081f3e3f624fd74219b0435230f6 Mon Sep 17 00:00:00 2001
+From: Michal Sojka
+Date: Tue, 5 Mar 2013 10:54:51 +0100
+Subject: [PATCH] Add configuration to restrict the formats allowed for
+ comments
+
+I want to write my blog posts in a convenient format (Emacs org mode)
+but do not want commenters to be able to use this format for security
+reasons. This patch allows to configure which formats are allowed for
+writing comments.
+
+Effectively, it restricts the formats enabled with add_plugin to those
+mentioned in comments_allowformats. If this is empty, all formats are
+allowed, which is the behavior without this patch.
+---
+ IkiWiki/Plugin/comments.pm | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
+index 285013e..151e839 100644
+--- a/IkiWiki/Plugin/comments.pm
++++ b/IkiWiki/Plugin/comments.pm
+@@ -90,6 +90,15 @@ sub getsetup () {
+ safe => 0,
+ rebuild => 0,
+ },
++ comments_allowformats => {
++ type => 'string',
++ default => '',
++ example => 'mdwn txt',
++ description => 'Restrict formats for comments to (no restriction if empty)',
++ safe => 1,
++ rebuild => 0,
++ },
++
+ }
+
+ sub checkconfig () {
+@@ -101,6 +110,8 @@ sub checkconfig () {
+ unless defined $config{comments_closed_pagespec};
+ $config{comments_pagename} = 'comment_'
+ unless defined $config{comments_pagename};
++ $config{comments_allowformats} = ''
++ unless defined $config{comments_allowformats};
+ }
+
+ sub htmlize {
+@@ -128,12 +139,18 @@ sub safeurl ($) {
+ }
+ }
+
++sub isallowed ($) {
++ my $format = shift;
++ return ! $config{comments_allowformats} || $config{comments_allowformats} =~ /\b$format\b/;
++}
++
+ sub preprocess {
+ my %params = @_;
+ my $page = $params{page};
+
+ my $format = $params{format};
+- if (defined $format && ! exists $IkiWiki::hooks{htmlize}{$format}) {
++ if (defined $format && (! exists $IkiWiki::hooks{htmlize}{$format} ||
++ ! isallowed($format))) {
+ error(sprintf(gettext("unsupported page format %s"), $format));
+ }
+
+@@ -332,7 +349,7 @@ sub editcomment ($$) {
+
+ my @page_types;
+ if (exists $IkiWiki::hooks{htmlize}) {
+- foreach my $key (grep { !/^_/ } keys %{$IkiWiki::hooks{htmlize}}) {
++ foreach my $key (grep { !/^_/ && isallowed($_) } keys %{$IkiWiki::hooks{htmlize}}) {
+ push @page_types, [$key, $IkiWiki::hooks{htmlize}{$key}{longname} || $key];
+ }
+ }
+--
+1.7.10.4
+
+
+
+[[!tag patch]]
+
+> [[done]] --[[Joey]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/Separate_OpenIDs_and_usernames.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/Separate_OpenIDs_and_usernames.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/Separate_OpenIDs_and_usernames.mdwn 2013-02-13 09:08:26.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/Separate_OpenIDs_and_usernames.mdwn 2013-09-04 22:10:48.000000000 +0000
@@ -13,6 +13,8 @@
> implemented as a badly-done wart on the side of their regular login
> system.
>
+> > If there are user profiles on the site with non-empty information associated with them (including permissions, reputation), then it would make more sense to be able to access your user profile with alternative OpenIDs (in case one of the provider goes down), as on . In ikiwiki, there might be no such special information associated with users (or you can think of something like this?), except for the admin rights. But fortunately, several OpenIDs can be set up for admins in ikwiki. (Only if it comes to [the OpenIDs provided by Gmail][forum/google openid broken?], then it turns out to be unhandy to write the ID into the configuration file as a second admin ID.)--Ivan Z.
+>
> The openid plugin now attempts to get an email and a username, and stores
> them in the session database for later use (ie, when the user edits a
> page).
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/assumes_system_perl.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/assumes_system_perl.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/assumes_system_perl.mdwn 2013-02-13 09:08:29.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/assumes_system_perl.mdwn 2013-09-04 22:10:50.000000000 +0000
@@ -13,4 +13,8 @@
> yours, but do not plan to work on it myself, since I do not use systems
> where /usr/bin/perl is not a sane default. --[[Joey]]
+> > I've implemented a change that should fix this. For what it's worth this is a
+> > life saver on shared hosting where building your own perl is super effective.
+> > --frioux ([code here](https://github.com/frioux/ikiwiki/tree/use-env-perl))
+
[[wishlist]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/calendar_with___34__create__34___links/incomplete_patch.pl ikiwiki-3.20130904.1ubuntu1/doc/todo/calendar_with___34__create__34___links/incomplete_patch.pl
--- ikiwiki-3.20130212ubuntu1/doc/todo/calendar_with___34__create__34___links/incomplete_patch.pl 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/calendar_with___34__create__34___links/incomplete_patch.pl 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,36 @@
+diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+index d443198..0436eda 100644
+--- a/IkiWiki/Plugin/calendar.pm
++++ b/IkiWiki/Plugin/calendar.pm
+@@ -238,7 +238,16 @@ EOF
+ else {
+ $tag='month-calendar-day-nolink';
+ }
+- $calendar.=qq{\t\t$day \n};
++ if ($params{newpageformat}) {
++ $calendar.=qq{\t\t};
++ $calendar.=htmllink($params{page}, $params{destpage},
++ strftime_utf8($params{newpageformat}, 0, 0, 0, $day, $params{month} - 1, $params{year} - 1900),
++ noimageinline => 1,
++ linktext => $day);
++ $calendar.=qq{ \n};
++ } else {
++ $calendar.=qq{\t\t$day \n};
++ }
+ }
+ }
+
+diff --git a/doc/ikiwiki/directive/calendar.mdwn b/doc/ikiwiki/directive/calendar.mdwn
+index cb40f88..7b7fa85 100644
+--- a/doc/ikiwiki/directive/calendar.mdwn
++++ b/doc/ikiwiki/directive/calendar.mdwn
+@@ -56,5 +56,9 @@ An example crontab:
+ and so on. Defaults to 0, which is Sunday.
+ * `months_per_row` - In the year calendar, number of months to place in
+ each row. Defaults to 3.
++* `newpageformat` - In month mode, if no articles match the query, the value of
++ `newpageformat` will be used to strformat the date in question. A good value
++ is `newpageformat="meetings/%Y-%m-%d"`. It might be a good idea to have
++ `\[[!meta date=""]]` in the edittemplate of `meetings/*`.
+
+ [[!meta robots="noindex, follow"]]
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/calendar_with___34__create__34___links.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/calendar_with___34__create__34___links.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/calendar_with___34__create__34___links.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/calendar_with___34__create__34___links.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,10 @@
+the [[ikiwiki/directive/calendar]] directive is well usable without ikiwiki-calendar (eg for articles about meetings), but in such situations, it might be useful to have page creating links at the days.
+
+a [[!taglink patch]] to address this [[!taglink wishlist]] item is [[attached|incomplete_patch.pl]].
+
+from the new documentation (also in the patch):
+
+> * `newpageformat` - In month mode, if no articles match the query, the value of
+> `newpageformat` will be used to strformat the date in question. A good value
+> is `newpageformat="meetings/%Y-%m-%d"`. It might be a good idea to have
+> `\[[!meta date=""]]` in the edittemplate of `meetings/*`
diff -Nru ikiwiki-3.20130212ubuntu1/doc/todo/fancypodcast/discussion.mdwn ikiwiki-3.20130904.1ubuntu1/doc/todo/fancypodcast/discussion.mdwn
--- ikiwiki-3.20130212ubuntu1/doc/todo/fancypodcast/discussion.mdwn 1970-01-01 00:00:00.000000000 +0000
+++ ikiwiki-3.20130904.1ubuntu1/doc/todo/fancypodcast/discussion.mdwn 2013-09-03 18:53:37.000000000 +0000
@@ -0,0 +1,167 @@
+# Round 1
+
+ikiwiki's simple podcasting, while elegant and minimal, doesn't (as
+mentioned in [[todo/blogging]]) produce full-featured feeds. In
+fancy podcasts, episodes are accompanied by text content. The feeds
+also have lots more metadata.
+
+## Design
+
+7. For each fancy podcast episode, write a blog post containing
+ `\[[!meta enclosure="WikiLink/to/media.mp3"]]`. (Don't specify
+ more than one enclosure -- but if you do, last one wins.)
+7. When rendering to HTML (single-page or inlined), append a link
+ to the media file.
+7. When rendering to RSS/Atom, the text is the entry's content and
+ the media file is its enclosure.
+7. Don't break simple podcasts in pursuit of fancy podcasts.
+
+## Implementation
+
+### Completed
+
+* Cover the existing simple podcast behavior with tests.
+* Add an `enclosure` field to [[plugins/meta]] that expands the
+ given [[ikiwiki/WikiLink]] to an absolute URL (feed enclosures
+ pretty much need to be, and the reference feeds I've looked at
+ all do this).
+* Write failing tests for the desired single-page and inlined
+ HTML behavior, then make them pass by adding enclosure stanzas
+ to `{,inline}page.tmpl`.
+* Write failing tests for the desired RSS/Atom behavior, then make
+ them pass via changes to `{atom,rss}item.tmpl` and [[plugins/inline]].
+* Match feature-for-feature with
+ [tru_podcast](http://www.rainskit.com/blog/542/tru_podcast-a-podcasting-plugin-for-textpattern)
+ (what [[schmonz]] will be migrating from).
+* Enrich [feed metadata](http://cyber.law.harvard.edu/rss/rss.html)
+ by catching up `rsspage.tmpl` to `atompage.tmpl`.
+* Verify that [[plugins/more]] plays well with fancy podcasts.
+* Verify that the feeds validate.
+* Subscribe to a fancy feed in some common podcatchers and verify
+ display details against a reference podcast.
+* Verify smooth transitions for two common use cases (see testing
+ details below).
+* Code review: don't add enclosure divs unless we have enclosures.
+* Code review: genericize download link for more use cases.
+* Code review: don't confuse old readers with Atom names in RSS.
+* Code review: instead of hacking back to `$link`, just provide it.
+* Code review: show author in addition to feedname, if different.
+
+### Code review
+
+ + # XXX better way to compute relative to srcdir?
+ + my $file = $absurl;
+ + $file =~ s|^$config{url}/||;
+
+I don't think ikiwiki offers a better way to do that, because there is
+normally no reason to do that. Why does it need an url of this form here?
+--[[Joey]]
+
+> In all the popular, production-quality podcast feeds I've looked
+> at, enclosure URLs are always absolute (even when they could be
+> expressed concisely as relative). [Apple's
+> example](http://www.apple.com/itunes/podcasts/specs.html#example)
+> does too. So I told \[[!meta]] to call `urlto()` with the third
+> parameter true, which means the \[[!inline]] code here gets an
+> absolute URL in `$pagestate{$p}{meta}{enclosure}`. To compute the
+> enclosure's metadata, though, we of course need it as a local path.
+> I didn't see a less
+> [ongepotchket](http://www.jewish-languages.org/jewish-english-lexicon/words/1402)
+> way at the time. If you have a better idea, I'm happy to hear it;
+> if not, I'll add an explanatory comment. --[[schmonz]]
+
+>> I would be more comfortable with this if two two different forms of url
+>> you need were both generated by calling urlto. It'd be fine to call
+>> it more than once. --[[Joey]]
+
+>>> Heh, it was even easier than that! (Hooray for tests.) Done.
+>>> --[[schmonz]]
+
+ +
+ +
+
+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]]
+
+ -
+ - :
+ -
+
+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 @@
+
+
+Download
+
+
+
@@ -112,15 +118,19 @@
+
+
+
+
@@ -128,6 +138,12 @@
+
+
+Download
+
+
+
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 @@
-
-
- :
-
-
-
+
+
+
@@ -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 @@
+
+
+
+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 {